From 3beb6e4669f47f78f6356a2ba52ebe013262bda6 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Mon, 28 Mar 2022 18:40:22 +0200 Subject: [PATCH 3/7] fixup: minor code cleanup --- src/backend/optimizer/plan/planner.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index bb957d50d23..b2569c5d0c7 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -6220,7 +6220,6 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel, { ListCell *lc2; Path *path = (Path *) lfirst(lc); - Path *path_save = path; Path *path_original = path; List *pathkey_orderings = NIL; @@ -6245,7 +6244,7 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel, PathKeyInfo *info = (PathKeyInfo *) lfirst(lc2); /* restore the path (we replace it in the loop) */ - path = path_save; + path = path_original; is_sorted = pathkeys_count_contained_in(info->pathkeys, path->pathkeys, @@ -6255,13 +6254,11 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel, { /* Sort the cheapest-total path if it isn't already sorted */ if (!is_sorted) - { path = (Path *) create_sort_path(root, grouped_rel, path, info->pathkeys, -1.0); - } /* Now decide what to stick atop it */ if (parse->groupingSets) @@ -6432,7 +6429,6 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel, { if (path != partially_grouped_rel->cheapest_total_path) continue; - path = (Path *) create_sort_path(root, grouped_rel, path, -- 2.34.1