Commit0ee92e1

committed

Fix a couple of planner bugs in Gather Merge.

Neha Sharma reported these to Rushabh Lathia just after I commit355d399 went in. The patch isRushabh's, with input from me.

1 parentcd603a4 commit0ee92e1Copy full SHA for 0ee92e1

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1474,13 +1474,14 @@ create_gather_merge_plan(PlannerInfo root, GatherMergePath best_path)`
`1474`	`1474`	`Oid*sortOperators;`
`1475`	`1475`	`Oid*collations;`
`1476`	`1476`	`bool*nullsFirst;`
	`1477`	`+List*tlist=build_path_tlist(root,&best_path->path);`
`1477`	`1478`
`1478`	`1479`	`/* As with Gather, it's best to project away columns in the workers. */`
`1479`	`1480`	`subplan=create_plan_recurse(root,best_path->subpath,CP_EXACT_TLIST);`
`1480`	`1481`
`1481`	`1482`	`/* See create_merge_append_plan for why there's no make_xxx function */`
`1482`	`1483`	`gm_plan=makeNode(GatherMerge);`
`1483`		`-gm_plan->plan.targetlist=subplan->targetlist;`
	`1484`	`+gm_plan->plan.targetlist=tlist;`
`1484`	`1485`	`gm_plan->num_workers=best_path->num_workers;`
`1485`	`1486`	`copy_generic_path_info(&gm_plan->plan,&best_path->path);`
`1486`	`1487`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3746,7 +3746,7 @@ create_grouping_paths(PlannerInfo *root,`
`3746`	`3746`	`create_gather_merge_path(root,`
`3747`	`3747`	`grouped_rel,`
`3748`	`3748`	`subpath,`
`3749`		`-NULL,`
	`3749`	`+partial_grouping_target,`
`3750`	`3750`	`root->group_pathkeys,`
`3751`	`3751`	`NULL,`
`3752`	`3752`	`&total_groups);`

Comments

(0)