Fix execution

ildus · ildus · commit fd8474f253cb · 2017-03-27T15:18:28.000+03:00
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -1804,21 +1804,22 @@ get_part_expression_info(Oid relid, const char *expr_string,
 	}
 
 	if (!make_plan)
-		return expr_info;
+		goto end;
 
 	/* Plan this query. We reuse 'expr_node' here */
 	plan = pg_plan_query(query, 0, NULL);
 	target_entry = lfirst(list_head(plan->planTree->targetlist));
 	expr_node = (Node *) target_entry->expr;
 	expr_node = eval_const_expressions(NULL, expr_node);
 
-	/* Enable pathman */
-	hooks_enabled = true;
-
 	/* Convert expression to string and return it as datum */
 	out_string = nodeToString(expr_node);
 	expr_info->expr_datum = CStringGetTextDatum(out_string);
 	pfree(out_string);
 
+end:
+	/* Enable pathman hooks */
+	hooks_enabled = true;
+
 	return expr_info;
 }
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -634,6 +634,12 @@ partition_filter_exec(CustomScanState *node)
 
 		old_cxt = MemoryContextSwitchTo(estate->es_query_cxt);
 
+		/* Prepare walker context */
+		expr_walker_context.prel = prel;
+		expr_walker_context.slot = slot;
+		expr_walker_context.tup = ExecCopySlotTuple(slot);
+		expr_walker_context.clear = false;
+
 		/* Fetch values from slot for expression */
 		adapt_values(prel->expr, (void *) &expr_walker_context);
 
@@ -645,12 +651,6 @@ partition_filter_exec(CustomScanState *node)
 		/* Switch to per-tuple context */
 		old_cxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
 
-		/* Prepare walker context */
-		expr_walker_context.prel = prel;
-		expr_walker_context.slot = slot;
-		expr_walker_context.tup = ExecCopySlotTuple(slot);
-		expr_walker_context.clear = false;
-
 		/* Execute expression */
 		value = ExecEvalExpr(expr_state, econtext, &isnull, &itemIsDone);
 
