Remove no-longer-used parameter for create_groupingsets_path().

numGroups is unused since commit b5635948a; let's get rid of it.

XueJing Zhao, reviewed by Richard Guo

Discussion: https://postgr.es/m/DM6PR05MB64923CC8B63A2CAF3B2E5D47B7AD9@DM6PR05MB6492.namprd05.prod.outlook.com

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index a0f2390334eb0aeb062232416f2b8991a82acda0..06ad856eac1031693234cd0d2ae8585321acd483 100644 (file)
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -3900,8 +3900,7 @@ consider_groupingsets_paths(PlannerInfo *root,
                                                                                  (List *) parse->havingQual,
                                                                                  strat,
                                                                                  new_rollups,
-                                                                                 agg_costs,
-                                                                                 dNumGroups));
+                                                                                 agg_costs));
                return;
        }
 
@@ -4059,8 +4058,7 @@ consider_groupingsets_paths(PlannerInfo *root,
                                                                                          (List *) parse->havingQual,
                                                                                          AGG_MIXED,
                                                                                          rollups,
-                                                                                         agg_costs,
-                                                                                         dNumGroups));
+                                                                                         agg_costs));
                }
        }
 
@@ -4075,8 +4073,7 @@ consider_groupingsets_paths(PlannerInfo *root,
                                                                                  (List *) parse->havingQual,
                                                                                  AGG_SORTED,
                                                                                  gd->rollups,
-                                                                                 agg_costs,
-                                                                                 dNumGroups));
+                                                                                 agg_costs));
 }
 
 /*

diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index e2a3c110ce7ecd75e98906b6bbc358cfb8876bd2..483c4f41373d832fa8b028c6b11f6189a8364ae8 100644 (file)
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -3158,7 +3158,6 @@ create_agg_path(PlannerInfo *root,
  * 'having_qual' is the HAVING quals if any
  * 'rollups' is a list of RollupData nodes
  * 'agg_costs' contains cost info about the aggregate functions to be computed
- * 'numGroups' is the estimated total number of groups
  */
 GroupingSetsPath *
 create_groupingsets_path(PlannerInfo *root,
@@ -3167,8 +3166,7 @@ create_groupingsets_path(PlannerInfo *root,
                                                 List *having_qual,
                                                 AggStrategy aggstrategy,
                                                 List *rollups,
-                                                const AggClauseCosts *agg_costs,
-                                                double numGroups)
+                                                const AggClauseCosts *agg_costs)
 {
        GroupingSetsPath *pathnode = makeNode(GroupingSetsPath);
        PathTarget *target = rel->reltarget;

diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index d2d46b15df591b4035658cbe2d3d391060b751e2..635cc0a0a66b5759a059bcacf54523ef04ced24d 100644 (file)
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -233,8 +233,7 @@ extern GroupingSetsPath *create_groupingsets_path(PlannerInfo *root,
                                                                                                  List *having_qual,
                                                                                                  AggStrategy aggstrategy,
                                                                                                  List *rollups,
-                                                                                                 const AggClauseCosts *agg_costs,
-                                                                                                 double numGroups);
+                                                                                                 const AggClauseCosts *agg_costs);
 extern MinMaxAggPath *create_minmaxagg_path(PlannerInfo *root,
                                                                                        RelOptInfo *rel,
                                                                                        PathTarget *target,