generate correct ppi, fixes

funbringer · funbringer · commit 99052a61a3e8 · 2016-05-13T16:25:59.000+03:00
diff --git a/hooks.c b/hooks.c
@@ -94,7 +94,8 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 
 	foreach (lc, innerrel->pathlist)
 	{
-		AppendPath *cur_inner_path = (AppendPath *) lfirst(lc);
+		AppendPath	   *cur_inner_path = (AppendPath *) lfirst(lc);
+		ParamPathInfo  *ppi;
 
 		if (!IsA(cur_inner_path, AppendPath))
 			continue;
@@ -104,9 +105,10 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		inner_required = bms_union(PATH_REQ_OUTER((Path *) cur_inner_path),
 								   bms_make_singleton(outerrel->relid));
 
+		ppi = get_baserel_parampathinfo(root, innerrel, inner_required);
+
 		inner = create_runtimeappend_path(root, cur_inner_path,
-										  get_appendrel_parampathinfo(innerrel,
-																	  inner_required),
+										  ppi,
 										  paramsel);
 
 		initial_cost_nestloop(root, &workspace, jointype,
diff --git a/nodes_common.c b/nodes_common.c
@@ -340,7 +340,8 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 					tlist = cscan->custom_scan_tlist;
 				}
 			}
-			else
+			/* Don't generate useless physical tlists that will be replaced */
+			else if (!cscan->custom_scan_tlist)
 				child_plan->targetlist = build_physical_tlist(root, child_rel);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,8 @@ create_append_plan_common(PlannerInfo root, RelOptInfo rel,`
`340`	`340`	`tlist = cscan->custom_scan_tlist;`
`341`	`341`	`}`
`342`	`342`	`}`
`343`		`- else`
	`343`	`+ /* Don't generate useless physical tlists that will be replaced */`
	`344`	`+ else if (!cscan->custom_scan_tlist)`
`344`	`345`	`child_plan->targetlist = build_physical_tlist(root, child_rel);`
`345`	`346`	`}`
`346`	`347`