Commit1145931

committed

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

1 parentd807338 commit1145931Copy full SHA for 1145931

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,8 @@ unpack_runtimeappend_private(RuntimeAppendState scan_state, CustomScan cscan)`
`240`	`240`
`241`	`241`	`/* Transform partition ranges into plain array of partition Oids */`
`242`	`242`	`Oid*`
`243`		`-get_partition_oids(Listranges,intn,constPartRelationInfo*prel)`
	`243`	`+get_partition_oids(Listranges,intn,constPartRelationInfo*prel,`
	`244`	`+boolinclude_parent)`
`244`	`245`	`{`
`245`	`246`	`ListCell*range_cell;`
`246`	`247`	`uint32allocated=INITIAL_ALLOC_NUM;`
`@@ -250,7 +251,7 @@ get_partition_oids(List ranges, int n, const PartRelationInfo *prel)`
`250`	`251`
`251`	`252`	`/* If required, add parent to result */`
`252`	`253`	`Assert(INITIAL_ALLOC_NUM >=1);`
`253`		`-if (prel->enable_parent)`
	`254`	`+if (include_parent)`
`254`	`255`	`result[used++]=PrelParentRelid(prel);`
`255`	`256`
`256`	`257`	`/* Deal with selected partitions */`
`@@ -521,7 +522,7 @@ rescan_append_common(CustomScanState *node)`
`521`	`522`	`}`
`522`	`523`
`523`	`524`	`/* Get Oids of the required partitions */`
`524`		`-parts=get_partition_oids(ranges,&nparts,prel);`
	`525`	`+parts=get_partition_oids(ranges,&nparts,prel,prel->enable_parent);`
`525`	`526`
`526`	`527`	`/* Select new plans for this run using 'parts' */`
`527`	`528`	`if (scan_state->cur_plans)`

Lines changed: 2 additions & 1 deletion

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`		`-Oidget_partition_oids(Listranges,intn,constPartRelationInfoprel);`
	`63`	`+Oidget_partition_oids(Listranges,intn,constPartRelationInfoprel,`
	`64`	`+boolinclude_parent);`
`64`	`65`
`65`	`66`	`Pathcreate_append_path_common(PlannerInforoot,`
`66`	`67`	`AppendPath*inner_append,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ partition_filter_exec(CustomScanState *node)`
`199`	`199`	`old_cxt=MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);`
`200`	`200`
`201`	`201`	`ranges=walk_expr_tree((Expr*)&state->temp_const,&wcxt)->rangeset;`
`202`		`-parts=get_partition_oids(ranges,&nparts,prel);`
	`202`	`+parts=get_partition_oids(ranges,&nparts,prel, false);`
`203`	`203`
`204`	`204`	`if (nparts>1)`
`205`	`205`	`elog(ERROR,"PartitionFilter selected more than one partition");`
`@@ -222,7 +222,7 @@ partition_filter_exec(CustomScanState *node)`
`222`	`222`	`elog(ERROR,`
`223`	`223`	`"There is no suitable partition for key '%s'",`
`224`	`224`	`datum_to_cstring(state->temp_const.constvalue,`
`225`		`-state->temp_const.consttype));`
	`225`	`+state->temp_const.consttype));`
`226`	`226`	`}`
`227`	`227`	`else`
`228`	`228`	`selected_partid=parts[0];`

Comments

(0)