Make last changes

ildus · ildus · commit 405c5098b83b · 2017-03-23T12:01:51.000+03:00
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -1783,6 +1783,8 @@ get_expression_node(Oid relid, const char *expr, bool analyze)
 	hooks_enabled = true;
 
 	result = (Node *)target_entry->expr;
+
+	/* We keep expression in top context */
 	oldcontext = MemoryContextSwitchTo(TopMemoryContext);
 
 	/* We need relid and range table list for mutator */
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -632,6 +632,16 @@ partition_filter_exec(CustomScanState *node)
 			return slot;
 		}
 
+		old_cxt = MemoryContextSwitchTo(estate->es_query_cxt);
+
+		/* Fetch values from slot for expression */
+		adapt_values((Node *)prel->expr, (void *) &expr_walker_context);
+
+		MemoryContextSwitchTo(old_cxt);
+
+		/* Prepare state for execution */
+		expr_state = ExecPrepareExpr(prel->expr, estate);
+
 		/* Switch to per-tuple context */
 		old_cxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
 
@@ -641,12 +651,6 @@ partition_filter_exec(CustomScanState *node)
 		expr_walker_context.tup = ExecCopySlotTuple(slot);
 		expr_walker_context.clear = false;
 
-		/* Fetch values from slot for expression */
-		adapt_values((Node *)prel->expr, (void *) &expr_walker_context);
-
-		/* Prepare state before execution */
-		expr_state = ExecPrepareExpr(prel->expr, estate);
-
 		/* Execute expression */
 		value = ExecEvalExpr(expr_state, econtext, &isnull, &itemIsDone);
 
