NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4e1ff2a

committed

Trim ORDER BY/DISTINCT aggregate pathkeys in gather_grouping_paths

Similar tod8a2953, trim off any PathKeys which are for ORDER BY /DISTINCT aggregate functions from the PathKey List for the Gather Mergepaths created by gather_grouping_paths(). These additional PathKeys arenot valid to use after grouping has taken place as these PathKeys belongto columns which are inputs to an aggregate function and, therefore areunavailable after aggregation.Reported-by: Alexander LakhinDiscussion:https://postgr.es/m/cf63174c-8c89-3953-cb49-48f41f74941a@gmail.comBackpatch-through: 16, where1349d27 was added

1 parent52898c6 commit4e1ff2aCopy full SHA for 4e1ff2a

File tree

1 file changed

+19

-8

lines changed

src/backend/optimizer/plan
- planner.c

1 file changed

+19

-8

lines changed

`‎src/backend/optimizer/plan/planner.c‎`

Lines changed: 19 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -7349,13 +7349,24 @@ gather_grouping_paths(PlannerInfo root, RelOptInfo rel)`
`7349`	`7349`	`{`
`7350`	`7350`	`ListCell*lc;`
`7351`	`7351`	`Path*cheapest_partial_path;`
	`7352`	`+List*groupby_pathkeys;`
	`7353`	`+`
	`7354`	`+/*`
	`7355`	`+ * This occurs after any partial aggregation has taken place, so trim off`
	`7356`	`+ * any pathkeys added for ORDER BY / DISTINCT aggregates.`
	`7357`	`+ */`
	`7358`	`+if (list_length(root->group_pathkeys)>root->num_groupby_pathkeys)`
	`7359`	`+groupby_pathkeys=list_copy_head(root->group_pathkeys,`
	`7360`	`+root->num_groupby_pathkeys);`
	`7361`	`+else`
	`7362`	`+groupby_pathkeys=root->group_pathkeys;`
`7352`	`7363`
`7353`	`7364`	`/* Try Gather for unordered paths and Gather Merge for ordered ones. */`
`7354`	`7365`	`generate_useful_gather_paths(root,rel, true);`
`7355`	`7366`
`7356`	`7367`	`/* Try cheapest partial path + explicit Sort + Gather Merge. */`
`7357`	`7368`	`cheapest_partial_path=linitial(rel->partial_pathlist);`
`7358`		`-if (!pathkeys_contained_in(root->group_pathkeys,`
	`7369`	`+if (!pathkeys_contained_in(groupby_pathkeys,`
`7359`	`7370`	`cheapest_partial_path->pathkeys))`
`7360`	`7371`	`{`
`7361`	`7372`	`Path*path;`
`@@ -7364,14 +7375,14 @@ gather_grouping_paths(PlannerInfo root, RelOptInfo rel)`
`7364`	`7375`	`total_groups=`
`7365`	`7376`	`cheapest_partial_path->rows*cheapest_partial_path->parallel_workers;`
`7366`	`7377`	`path= (Path*)create_sort_path(root,rel,cheapest_partial_path,`
`7367`		`-root->group_pathkeys,`
	`7378`	`+groupby_pathkeys,`
`7368`	`7379`	`-1.0);`
`7369`	`7380`	`path= (Path*)`
`7370`	`7381`	`create_gather_merge_path(root,`
`7371`	`7382`	`rel,`
`7372`	`7383`	`path,`
`7373`	`7384`	`rel->reltarget,`
`7374`		`-root->group_pathkeys,`
	`7385`	`+groupby_pathkeys,`
`7375`	`7386`	`NULL,`
`7376`	`7387`	`&total_groups);`
`7377`	`7388`
`@@ -7382,10 +7393,10 @@ gather_grouping_paths(PlannerInfo root, RelOptInfo rel)`
`7382`	`7393`	`* Consider incremental sort on all partial paths, if enabled.`
`7383`	`7394`	`*`
`7384`	`7395`	`* We can also skip the entire loop when we only have a single-item`
`7385`		`- *group_pathkeys because then we can't possibly have a presorted prefix`
	`7396`	`+ *groupby_pathkeys because then we can't possibly have a presorted prefix`
`7386`	`7397`	`* of the list without having the list be fully sorted.`
`7387`	`7398`	`*/`
`7388`		`-if (!enable_incremental_sort\|\|list_length(root->group_pathkeys)==1)`
	`7399`	`+if (!enable_incremental_sort\|\|list_length(groupby_pathkeys)==1)`
`7389`	`7400`	`return;`
`7390`	`7401`
`7391`	`7402`	`/* also consider incremental sort on partial paths, if enabled */`
`@@ -7396,7 +7407,7 @@ gather_grouping_paths(PlannerInfo root, RelOptInfo rel)`
`7396`	`7407`	`intpresorted_keys;`
`7397`	`7408`	`doubletotal_groups;`
`7398`	`7409`
`7399`		`-is_sorted=pathkeys_count_contained_in(root->group_pathkeys,`
	`7410`	`+is_sorted=pathkeys_count_contained_in(groupby_pathkeys,`
`7400`	`7411`	`path->pathkeys,`
`7401`	`7412`	`&presorted_keys);`
`7402`	`7413`
`@@ -7409,7 +7420,7 @@ gather_grouping_paths(PlannerInfo root, RelOptInfo rel)`
`7409`	`7420`	`path= (Path*)create_incremental_sort_path(root,`
`7410`	`7421`	`rel,`
`7411`	`7422`	`path,`
`7412`		`-root->group_pathkeys,`
	`7423`	`+groupby_pathkeys,`
`7413`	`7424`	`presorted_keys,`
`7414`	`7425`	`-1.0);`
`7415`	`7426`
`@@ -7418,7 +7429,7 @@ gather_grouping_paths(PlannerInfo root, RelOptInfo rel)`
`7418`	`7429`	`rel,`
`7419`	`7430`	`path,`
`7420`	`7431`	`rel->reltarget,`
`7421`		`-root->group_pathkeys,`
	`7432`	`+groupby_pathkeys,`
`7422`	`7433`	`NULL,`
`7423`	`7434`	`&total_groups);`
`7424`	`7435`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4e1ff2a

File tree

1 file changed

1 file changed

`‎src/backend/optimizer/plan/planner.c‎`

0 commit comments