From 41f9ea8d4a06f895872daf088603834550ce6dcc Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Sun, 23 Feb 2020 23:13:07 -0600 Subject: [PATCH v6 2/7] refactor show_grouping_set_keys --- src/backend/commands/explain.c | 55 ++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index ff22181510..f416f60676 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -95,6 +95,8 @@ static void show_grouping_set_info(AggState *aggstate, List *ancestors, HashTableInstrumentation *inst, ExplainState *es); +static void show_grouping_set_keys(AggState *aggstate, Agg *aggnode, List + *context, bool useprefix, ExplainState *es); static void show_group_keys(GroupState *gstate, List *ancestors, ExplainState *es); static void show_sort_group_keys(PlanState *planstate, const char *qlabel, @@ -2348,6 +2350,37 @@ show_grouping_set_info(AggState *aggstate, List *context, bool useprefix, List *ancestors, HashTableInstrumentation *inst, ExplainState *es) +{ + PlanState *planstate = outerPlanState(aggstate); + + ExplainOpenGroup("Grouping Set", NULL, true, es); + + if (sortnode) + { + show_sort_group_keys(planstate, "Sort Key", + sortnode->numCols, sortnode->sortColIdx, + sortnode->sortOperators, sortnode->collations, + sortnode->nullsFirst, + ancestors, es); + if (es->format == EXPLAIN_FORMAT_TEXT) + es->indent++; + } + + show_grouping_set_keys(aggstate, aggnode, context, useprefix, es); + + if (aggnode->aggstrategy == AGG_HASHED || + aggnode->aggstrategy == AGG_MIXED) + show_tuplehash_info(inst, es); + + if (sortnode && es->format == EXPLAIN_FORMAT_TEXT) + es->indent--; + + ExplainCloseGroup("Grouping Set", NULL, true, es); +} + +/* Show keys of a grouping set */ +static void +show_grouping_set_keys(AggState *aggstate, Agg *aggnode, List *context, bool useprefix, ExplainState *es) { PlanState *planstate = outerPlanState(aggstate); Plan *plan = planstate->plan; @@ -2369,19 +2402,6 @@ show_grouping_set_info(AggState *aggstate, keysetname = "Group Keys"; } - ExplainOpenGroup("Grouping Set", NULL, true, es); - - if (sortnode) - { - show_sort_group_keys(planstate, "Sort Key", - sortnode->numCols, sortnode->sortColIdx, - sortnode->sortOperators, sortnode->collations, - sortnode->nullsFirst, - ancestors, es); - if (es->format == EXPLAIN_FORMAT_TEXT) - es->indent++; - } - ExplainOpenGroup(keysetname, keysetname, false, es); foreach(lc, gsets) @@ -2412,15 +2432,6 @@ show_grouping_set_info(AggState *aggstate, } ExplainCloseGroup(keysetname, keysetname, false, es); - - if (aggnode->aggstrategy == AGG_HASHED || - aggnode->aggstrategy == AGG_MIXED) - show_tuplehash_info(inst, es); - - if (sortnode && es->format == EXPLAIN_FORMAT_TEXT) - es->indent--; - - ExplainCloseGroup("Grouping Set", NULL, true, es); } /* -- 2.17.0