Commit1a97b11

committed

fix tlist rebuild logic in function create_append_plan_common()

1 parentc8851e7 commit1a97b11Copy full SHA for 1a97b11

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -396,24 +396,31 @@ create_append_plan_common(PlannerInfo root, RelOptInfo rel,`
`396`	`396`
`397`	`397`	`cscan=makeNode(CustomScan);`
`398`	`398`	`cscan->custom_scan_tlist=NIL;/* initial value (empty list) */`
`399`		`-cscan->scan.plan.targetlist=NIL;`
`400`	`399`
`401`	`400`	`if (custom_plans)`
`402`	`401`	`{`
`403`	`402`	`ListCell*lc1,`
`404`	`403`	`*lc2;`
	`404`	`+boolprocessed_rel_tlist= false;`
	`405`	`+`
	`406`	`+Assert(list_length(rpath->cpath.custom_paths)==list_length(custom_plans));`
`405`	`407`
`406`	`408`	`forboth (lc1,rpath->cpath.custom_paths,lc2,custom_plans)`
`407`	`409`	`{`
`408`	`410`	`Planchild_plan= (Plan)lfirst(lc2);`
`409`	`411`	`RelOptInfochild_rel= ((Path)lfirst(lc1))->parent;`
`410`	`412`
`411`		`-/* Replace rel's tlist with a matching one */`
`412`		`-if (!cscan->scan.plan.targetlist)`
	`413`	`+/* Replace rel's tlist with a matching one (for ExecQual()) */`
	`414`	`+if (!processed_rel_tlist)`
	`415`	`+{`
`413`	`416`	`tlist=replace_tlist_varnos(child_plan->targetlist,`
`414`	`417`	`child_rel->relid,`
`415`	`418`	`rel->relid);`
`416`	`419`
	`420`	`+/* Done, new target list has been built */`
	`421`	`+processed_rel_tlist= true;`
	`422`	`+}`
	`423`	`+`
`417`	`424`	`/* Add partition attribute if necessary (for ExecQual()) */`
`418`	`425`	`child_plan->targetlist=append_part_attr_to_tlist(child_plan->targetlist,`
`419`	`426`	`child_rel->relid,`

Comments

(0)