Commitc78ee4e

committed

include parent into Runtime[Merge]Append's plan if asked to, introduce macro PrelParentRelid

1 parent7423e87 commitc78ee4eCopy full SHA for c78ee4e

File tree

+24

-8

lines changed

+24

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ fill_prel_with_partitions(const Oid *partitions,`
`373`	`373`	`DisablePathman();/* disable pg_pathman since config is broken */`
`374`	`374`	`ereport(ERROR,`
`375`	`375`	`(errmsg("Unknown partitioning type for relation \"%s\"",`
`376`		`-get_rel_name_or_relid(prel->key)),`
	`376`	`+get_rel_name_or_relid(PrelParentRelid(prel))),`
`377`	`377`	`errhint(INIT_ERROR_HINT)));`
`378`	`378`	`}`
`379`	`379`	`}`
`@@ -419,7 +419,7 @@ fill_prel_with_partitions(const Oid *partitions,`
`419`	`419`	`DisablePathman();/* disable pg_pathman since config is broken */`
`420`	`420`	`elog(ERROR,"pg_pathman's cache for relation \"%s\" "`
`421`	`421`	`"has not been properly initialized",`
`422`		`-get_rel_name_or_relid(prel->key));`
	`422`	`+get_rel_name_or_relid(PrelParentRelid(prel)));`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`	`#endif`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,12 @@ get_partition_oids(List ranges, int n, const PartRelationInfo *prel)`
`248`	`248`	`Oidresult= (Oid)palloc(allocated*sizeof(Oid));`
`249`	`249`	`Oid*children=PrelGetChildrenArray(prel);`
`250`	`250`
	`251`	`+/* If required, add parent to result */`
	`252`	`+Assert(INITIAL_ALLOC_NUM >=1);`
	`253`	`+if (prel->enable_parent)`
	`254`	`+result[used++]=PrelParentRelid(prel);`
	`255`	`+`
	`256`	`+/* Deal with selected partitions */`
`251`	`257`	`foreach (range_cell,ranges)`
`252`	`258`	`{`
`253`	`259`	`uint32i;`
`@@ -366,6 +372,10 @@ create_append_plan_common(PlannerInfo root, RelOptInfo rel,`
`366`	`372`	`{`
`367`	`373`	`Planchild_plan= (Plan)lfirst(lc2);`
`368`	`374`	`RelOptInfochild_rel= ((Path)lfirst(lc1))->parent;`
	`375`	`+Oidchild_relid;`
	`376`	`+`
	`377`	`+/* Fetch relid of the 'child_rel' */`
	`378`	`+child_relid=root->simple_rte_array[child_rel->relid]->relid;`
`369`	`379`
`370`	`380`	`/* Replace rel's tlist with a matching one */`
`371`	`381`	`if (!cscan->scan.plan.targetlist)`
`@@ -380,6 +390,10 @@ create_append_plan_common(PlannerInfo root, RelOptInfo rel,`
`380`	`390`	`if (!cscan->custom_scan_tlist)`
`381`	`391`	`cscan->custom_scan_tlist=replace_tlist_varnos(child_plan->targetlist,`
`382`	`392`	`rel);`
	`393`	`+`
	`394`	`+/* If this is a plan for parent table, fill it with quals */`
	`395`	`+if (PrelParentRelid(prel)==child_relid)`
	`396`	`+child_plan->qual=get_actual_clauses(clauses);`
`383`	`397`	`}`
`384`	`398`	`}`
`385`	`399`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -900,13 +900,13 @@ create_partitions_internal(Oid relid, Datum value, Oid value_type)`
`900`	`900`	`elog(ERROR,"Could not connect using SPI");`
`901`	`901`
`902`	`902`	`/* while (value >= MAX) ... */`
`903`		`-spawn_partitions(prel->key,value,max_rvalue,prel->atttype,`
`904`		`-&interval_type_cmp,interval_binary,`
	`903`	`+spawn_partitions(PrelParentRelid(prel),value,max_rvalue,`
	`904`	`+prel->atttype,&interval_type_cmp,interval_binary,`
`905`	`905`	`interval_type, true,&partid);`
`906`	`906`
`907`	`907`	`/* while (value < MIN) ... */`
`908`		`-spawn_partitions(prel->key,value,min_rvalue,prel->atttype,`
`909`		`-&interval_type_cmp,interval_binary,`
	`908`	`+spawn_partitions(PrelParentRelid(prel),value,min_rvalue,`
	`909`	`+prel->atttype,&interval_type_cmp,interval_binary,`
`910`	`910`	`interval_type, false,&partid);`
`911`	`911`
`912`	`912`	`SPI_finish();/* close SPI connection */`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ typedef enum`
`96`	`96`	`* PartRelationInfo field access macros.`
`97`	`97`	`*/`
`98`	`98`
	`99`	`+#definePrelParentRelid(prel)( (prel)->key )`
	`100`	`+`
`99`	`101`	`#definePrelGetChildrenArray(prel)( (prel)->children )`
`100`	`102`
`101`	`103`	`#definePrelGetRangesArray(prel)( (prel)->ranges )`
`@@ -111,7 +113,7 @@ PrelLastChild(const PartRelationInfo *prel)`
`111`	`113`
`112`	`114`	`if (PrelChildrenCount(prel)==0)`
`113`	`115`	`elog(ERROR,"pg_pathman's cache entry for relation %u has 0 children",`
`114`		`-prel->key);`
	`116`	`+PrelParentRelid(prel));`
`115`	`117`
`116`	`118`	`returnPrelChildrenCount(prel)-1;/* last partition */`
`117`	`119`	`}`
`@@ -161,7 +163,7 @@ FreeChildrenArray(PartRelationInfo *prel)`
`161`	`163`	`Oidchild= (prel)->children[i];`
`162`	`164`
`163`	`165`	`/* If it's always been relid's partition, free cache */`
`164`		`-if (prel->key==get_parent_of_partition(child,NULL))`
	`166`	`+if (PrelParentRelid(prel)==get_parent_of_partition(child,NULL))`
`165`	`167`	`forget_parent_of_partition(child,NULL);`
`166`	`168`	`}`
`167`	`169`

Comments

(0)