diff options
| author | David Rowley <drowley@postgresql.org> | 2022-10-05 21:01:41 +1300 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2022-10-05 21:01:41 +1300 |
| commit | 2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7 (patch) | |
| tree | 5ded2ec68835504c3f10fcec732b80b7a2bc3f08 /src/backend/optimizer/plan/planner.c | |
| parent | 839c2520a7937b8895ff84fc8fc718dbfab5e72e (diff) | |
| download | postgresql-2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7.tar.gz postgresql-2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7.zip | |
Rename shadowed local variables
In a similar effort to f01592f91, here we mostly rename shadowed local
variables to remove the warnings produced when compiling with
-Wshadow=compatible-local.
This fixes 63 warnings and leaves just 5.
Author: Justin Pryzby, David Rowley
Reviewed-by: Justin Pryzby
Discussion https://postgr.es/m/20220817145434.GC26426%40telsasoft.com
Diffstat (limited to 'src/backend/optimizer/plan/planner.c')
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 9c5836683c6..5d0fd6e072f 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -3449,7 +3449,6 @@ get_number_of_groups(PlannerInfo *root, { /* Add up the estimates for each grouping set */ ListCell *lc; - ListCell *lc2; Assert(gd); /* keep Coverity happy */ @@ -3458,17 +3457,18 @@ get_number_of_groups(PlannerInfo *root, foreach(lc, gd->rollups) { RollupData *rollup = lfirst_node(RollupData, lc); - ListCell *lc; + ListCell *lc2; + ListCell *lc3; groupExprs = get_sortgrouplist_exprs(rollup->groupClause, target_list); rollup->numGroups = 0.0; - forboth(lc, rollup->gsets, lc2, rollup->gsets_data) + forboth(lc2, rollup->gsets, lc3, rollup->gsets_data) { - List *gset = (List *) lfirst(lc); - GroupingSetData *gs = lfirst_node(GroupingSetData, lc2); + List *gset = (List *) lfirst(lc2); + GroupingSetData *gs = lfirst_node(GroupingSetData, lc3); double numGroups = estimate_num_groups(root, groupExprs, path_rows, @@ -3484,6 +3484,8 @@ get_number_of_groups(PlannerInfo *root, if (gd->hash_sets_idx) { + ListCell *lc2; + gd->dNumHashGroups = 0; groupExprs = get_sortgrouplist_exprs(parse->groupClause, |