Fix data relocation after partitions created

ildus · ildus · commit 39295b66bde7 · 2017-03-29T16:21:47.000+03:00
diff --git a/hash.sql b/hash.sql
@@ -47,13 +47,13 @@ BEGIN
 	/* Notify backend about changes */
 	PERFORM @extschema@.on_create_partitions(parent_relid);
 
-	/* Copy data
+	/* Copy data */
 	IF partition_data = true THEN
 		PERFORM @extschema@.set_enable_parent(parent_relid, false);
 		PERFORM @extschema@.partition_data(parent_relid);
 	ELSE
 		PERFORM @extschema@.set_enable_parent(parent_relid, true);
-	END IF; */
+	END IF;
 
 	RETURN partitions_count;
 END
diff --git a/range.sql b/range.sql
@@ -164,13 +164,13 @@ BEGIN
 	/* Notify backend about changes */
 	PERFORM @extschema@.on_create_partitions(parent_relid);
 
-	/* Relocate data if asked to
+	/* Relocate data if asked to */
 	IF partition_data = true THEN
 		PERFORM @extschema@.set_enable_parent(parent_relid, false);
 		PERFORM @extschema@.partition_data(parent_relid);
 	ELSE
 		PERFORM @extschema@.set_enable_parent(parent_relid, true);
-	END IF; */
+	END IF;
 
 	RETURN p_count;
 END
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -1735,9 +1735,14 @@ get_part_expression_info(Oid relid, const char *expr_string,
 	List				*querytree_list;
 	PlannedStmt			*plan;
 	TargetEntry			*target_entry;
+	MemoryContext		 pathman_parse_context, oldcontext;
 
 	expr_info = palloc(sizeof(PartExpressionInfo));
 
+	pathman_parse_context = AllocSetContextCreate(TopMemoryContext,
+											"pathman parse context",
+											ALLOCSET_DEFAULT_SIZES);
+
 	/* Keep raw expression */
 	expr_info->raw_expr = get_raw_expression(relid, expr_string,
 			&query_string, &parsetree);
@@ -1746,6 +1751,12 @@ get_part_expression_info(Oid relid, const char *expr_string,
 	/* We don't need pathman activity initialization for this relation yet */
 	pathman_hooks_enabled = false;
 
+	/* We use separate memory context here, just to make sure we don't leave
+	 * anything behind after analyze and planning.
+	 * Parsed raw expression will stay in context of caller
+	 */
+	oldcontext = MemoryContextSwitchTo(pathman_parse_context);
+
 	/* This will fail with elog in case of wrong expression
 	 *	with more or less understable text */
 	querytree_list = pg_analyze_and_rewrite(parsetree,
@@ -1776,11 +1787,13 @@ get_part_expression_info(Oid relid, const char *expr_string,
 	target_entry = lfirst(list_head(plan->planTree->targetlist));
 	expr_node = (Node *) target_entry->expr;
 	expr_node = eval_const_expressions(NULL, expr_node);
+	out_string = nodeToString(expr_node);
+
+	MemoryContextSwitchTo(oldcontext);
 
 	/* Convert expression to string and return it as datum */
-	out_string = nodeToString(expr_node);
 	expr_info->expr_datum = CStringGetTextDatum(out_string);
-	pfree(out_string);
+	MemoryContextReset(pathman_parse_context);
 
 end:
 	/* Enable pathman hooks */
