bugfix: don't take parent's plan into account in PartitionFilter

funbringer · funbringer · commit 11459316e7dd · 2016-08-31T19:35:59.000+03:00
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -240,7 +240,8 @@ unpack_runtimeappend_private(RuntimeAppendState *scan_state, CustomScan *cscan)
 
 /* Transform partition ranges into plain array of partition Oids */
 Oid *
-get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel)
+get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel,
+				   bool include_parent)
 {
 	ListCell   *range_cell;
 	uint32		allocated = INITIAL_ALLOC_NUM;
@@ -250,7 +251,7 @@ get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel)
 
 	/* If required, add parent to result */
 	Assert(INITIAL_ALLOC_NUM >= 1);
-	if (prel->enable_parent)
+	if (include_parent)
 		result[used++] = PrelParentRelid(prel);
 
 	/* Deal with selected partitions */
@@ -521,7 +522,7 @@ rescan_append_common(CustomScanState *node)
 	}
 
 	/* Get Oids of the required partitions */
-	parts = get_partition_oids(ranges, &nparts, prel);
+	parts = get_partition_oids(ranges, &nparts, prel, prel->enable_parent);
 
 	/* Select new plans for this run using 'parts' */
 	if (scan_state->cur_plans)
diff --git a/src/nodes_common.h b/src/nodes_common.h
@@ -60,7 +60,8 @@ clear_plan_states(CustomScanState *scan_state)
 	}
 }
 
-Oid * get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel);
+Oid * get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel,
+						 bool include_parent);
 
 Path * create_append_path_common(PlannerInfo *root,
 								 AppendPath *inner_append,
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -199,7 +199,7 @@ partition_filter_exec(CustomScanState *node)
 		old_cxt = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
 
 		ranges = walk_expr_tree((Expr *) &state->temp_const, &wcxt)->rangeset;
-		parts = get_partition_oids(ranges, &nparts, prel);
+		parts = get_partition_oids(ranges, &nparts, prel, false);
 
 		if (nparts > 1)
 			elog(ERROR, "PartitionFilter selected more than one partition");
@@ -222,7 +222,7 @@ partition_filter_exec(CustomScanState *node)
 				elog(ERROR,
 					 "There is no suitable partition for key '%s'",
 					 datum_to_cstring(state->temp_const.constvalue,
-					 				  state->temp_const.consttype));
+									  state->temp_const.consttype));
 		}
 		else
 			selected_partid = parts[0];

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ clear_plan_states(CustomScanState *scan_state)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`-Oid * get_partition_oids(List ranges, int n, const PartRelationInfo *prel);`
	`63`	`+Oid * get_partition_oids(List ranges, int n, const PartRelationInfo *prel,`
	`64`	`+ bool include_parent);`
`64`	`65`
`65`	`66`	`Path * create_append_path_common(PlannerInfo *root,`
`66`	`67`	`AppendPath *inner_append,`