From 4edb6652f8e8923e0ae7f044817a30b9024b3f49 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Tue, 31 Dec 2019 18:49:41 -0600 Subject: [PATCH v5 1/7] explain to show tuplehash bucket and memory stats.. Note that hashed SubPlan and recursiveUnion aren't affected in explain output, probably since hashtables aren't allocated at that point. Discussion: https://www.postgresql.org/message-id/flat/20200103161925.GM12066@telsasoft.com --- src/backend/commands/explain.c | 137 ++++++++++++++++++-- src/backend/executor/execGrouping.c | 27 ++++ src/backend/executor/nodeAgg.c | 11 ++ src/backend/executor/nodeRecursiveunion.c | 3 + src/backend/executor/nodeSetOp.c | 1 + src/backend/executor/nodeSubplan.c | 3 + src/include/executor/executor.h | 1 + src/include/nodes/execnodes.h | 9 ++ src/test/regress/expected/aggregates.out | 36 ++++-- src/test/regress/expected/groupingsets.out | 64 +++++++--- src/test/regress/expected/join.out | 3 +- src/test/regress/expected/matview.out | 9 +- src/test/regress/expected/partition_aggregate.out | 145 +++++++++++++++++----- src/test/regress/expected/partition_join.out | 13 +- src/test/regress/expected/pg_lsn.out | 3 +- src/test/regress/expected/select_distinct.out | 3 +- src/test/regress/expected/select_parallel.out | 11 +- src/test/regress/expected/subselect.out | 3 +- src/test/regress/expected/tablesample.out | 3 +- src/test/regress/expected/union.out | 15 ++- src/test/regress/expected/window.out | 3 +- src/test/regress/expected/write_parallel.out | 16 ++- 22 files changed, 429 insertions(+), 90 deletions(-) diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index d901dc4..ff22181 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -18,6 +18,7 @@ #include "commands/createas.h" #include "commands/defrem.h" #include "commands/prepare.h" +#include "executor/nodeAgg.h" #include "executor/nodeHash.h" #include "foreign/fdwapi.h" #include "jit/jit.h" @@ -86,12 +87,14 @@ static void show_merge_append_keys(MergeAppendState *mstate, List *ancestors, ExplainState *es); static void show_agg_keys(AggState *astate, List *ancestors, ExplainState *es); -static void show_grouping_sets(PlanState *planstate, Agg *agg, +static void show_grouping_sets(AggState *aggstate, Agg *agg, List *ancestors, ExplainState *es); -static void show_grouping_set_keys(PlanState *planstate, +static void show_grouping_set_info(AggState *aggstate, Agg *aggnode, Sort *sortnode, List *context, bool useprefix, - List *ancestors, ExplainState *es); + List *ancestors, + HashTableInstrumentation *inst, + ExplainState *es); static void show_group_keys(GroupState *gstate, List *ancestors, ExplainState *es); static void show_sort_group_keys(PlanState *planstate, const char *qlabel, @@ -104,6 +107,7 @@ static void show_tablesample(TableSampleClause *tsc, PlanState *planstate, List *ancestors, ExplainState *es); static void show_sort_info(SortState *sortstate, ExplainState *es); static void show_hash_info(HashState *hashstate, ExplainState *es); +static void show_tuplehash_info(HashTableInstrumentation *inst, ExplainState *es); static void show_tidbitmap_info(BitmapHeapScanState *planstate, ExplainState *es); static void show_instrumentation_count(const char *qlabel, int which, @@ -1489,6 +1493,7 @@ ExplainNode(PlanState *planstate, List *ancestors, appendStringInfo(es->str, " %s", setopcmd); else ExplainPropertyText("Command", setopcmd, es); + // show strategy in text mode ? } break; default: @@ -1886,6 +1891,20 @@ ExplainNode(PlanState *planstate, List *ancestors, show_instrumentation_count("Rows Removed by Filter", 1, planstate, es); break; + case T_SetOp: + { + SetOpState *sos = castNode(SetOpState, planstate); + if (sos->hashtable) + show_tuplehash_info(&sos->hashtable->instrument, es); + } + break; + case T_RecursiveUnion: + { + RecursiveUnionState *rus = (RecursiveUnionState *)planstate; + if (rus->hashtable) + show_tuplehash_info(&rus->hashtable->instrument, es); + break; + } case T_Group: show_group_keys(castNode(GroupState, planstate), ancestors, es); show_upper_qual(plan->qual, "Filter", planstate, ancestors, es); @@ -2262,24 +2281,31 @@ show_agg_keys(AggState *astate, List *ancestors, ancestors = lcons(plan, ancestors); if (plan->groupingSets) - show_grouping_sets(outerPlanState(astate), plan, ancestors, es); + show_grouping_sets(astate, plan, ancestors, es); else + { show_sort_group_keys(outerPlanState(astate), "Group Key", plan->numCols, plan->grpColIdx, NULL, NULL, NULL, ancestors, es); + Assert(astate->num_hashes <= 1); + if (astate->num_hashes) + show_tuplehash_info(&astate->perhash[0].hashtable->instrument, es); + } ancestors = list_delete_first(ancestors); } } static void -show_grouping_sets(PlanState *planstate, Agg *agg, +show_grouping_sets(AggState *aggstate, Agg *agg, List *ancestors, ExplainState *es) { + PlanState *planstate = outerPlanState(aggstate); List *context; bool useprefix; ListCell *lc; + int setno = 0; /* Set up deparsing context */ context = set_deparse_context_plan(es->deparse_cxt, @@ -2289,27 +2315,41 @@ show_grouping_sets(PlanState *planstate, Agg *agg, ExplainOpenGroup("Grouping Sets", "Grouping Sets", false, es); - show_grouping_set_keys(planstate, agg, NULL, - context, useprefix, ancestors, es); + show_grouping_set_info(aggstate, agg, NULL, context, useprefix, ancestors, + aggstate->num_hashes ? + &aggstate->perhash[setno++].hashtable->instrument : NULL, + es); foreach(lc, agg->chain) { Agg *aggnode = lfirst(lc); Sort *sortnode = (Sort *) aggnode->plan.lefttree; + HashTableInstrumentation *inst = NULL; + + if (aggnode->aggstrategy == AGG_HASHED || + aggnode->aggstrategy == AGG_MIXED) + { + Assert(setno < aggstate->num_hashes); + inst = &aggstate->perhash[setno++].hashtable->instrument; + } - show_grouping_set_keys(planstate, aggnode, sortnode, - context, useprefix, ancestors, es); + show_grouping_set_info(aggstate, aggnode, sortnode, + context, useprefix, ancestors, + inst, es); } ExplainCloseGroup("Grouping Sets", "Grouping Sets", false, es); } +/* Show keys and any hash instrumentation for a grouping set */ static void -show_grouping_set_keys(PlanState *planstate, +show_grouping_set_info(AggState *aggstate, Agg *aggnode, Sort *sortnode, List *context, bool useprefix, - List *ancestors, ExplainState *es) + List *ancestors, HashTableInstrumentation *inst, + ExplainState *es) { + PlanState *planstate = outerPlanState(aggstate); Plan *plan = planstate->plan; char *exprstr; ListCell *lc; @@ -2373,6 +2413,10 @@ show_grouping_set_keys(PlanState *planstate, 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--; @@ -2770,6 +2814,54 @@ show_hash_info(HashState *hashstate, ExplainState *es) } /* + * Show hash bucket stats and (optionally) memory. + */ +static void +show_tuplehash_info(HashTableInstrumentation *inst, ExplainState *es) +{ + long spacePeakKb_tuples = (inst->space_peak_tuples + 1023) / 1024, + spacePeakKb_hash = (inst->space_peak_hash + 1023) / 1024; + + if (es->format != EXPLAIN_FORMAT_TEXT) + { + ExplainPropertyInteger("Hash Buckets", NULL, + inst->nbuckets, es); + ExplainPropertyInteger("Original Hash Buckets", NULL, + inst->nbuckets_original, es); + ExplainPropertyInteger("Peak Memory Usage (hashtable)", "kB", + spacePeakKb_hash, es); + ExplainPropertyInteger("Peak Memory Usage (tuples)", "kB", + spacePeakKb_tuples, es); + } + else if (!inst->nbuckets) + ; /* Do nothing */ + else + { + if (inst->nbuckets_original != inst->nbuckets) + { + ExplainIndentText(es); + appendStringInfo(es->str, + "Buckets: %ld (originally %ld)", + inst->nbuckets, + inst->nbuckets_original); + } + else + { + ExplainIndentText(es); + appendStringInfo(es->str, + "Buckets: %ld", + inst->nbuckets); + } + + if (es->analyze) + appendStringInfo(es->str, + " Memory Usage: hashtable: %ldkB, tuples: %ldkB", + spacePeakKb_hash, spacePeakKb_tuples); + appendStringInfoChar(es->str, '\n'); + } +} + +/* * If it's EXPLAIN ANALYZE, show exact/lossy pages for a BitmapHeapScan node */ static void @@ -3436,6 +3528,29 @@ ExplainSubPlans(List *plans, List *ancestors, ExplainNode(sps->planstate, ancestors, relationship, sp->plan_name, es); + if (sps->hashtable) + { + ExplainOpenGroup("Hashtable", "Hashtable", true, es); + if (es->format == EXPLAIN_FORMAT_TEXT) + { + ExplainIndentText(es); + appendStringInfoString(es->str, "Hashtable: "); + } + show_tuplehash_info(&sps->hashtable->instrument, es); + ExplainCloseGroup("Hashtable", "Hashtable", true, es); + } + + if (sps->hashnulls) + { + ExplainOpenGroup("Null Hashtable", "Null Hashtable", true, es); + if (es->format == EXPLAIN_FORMAT_TEXT) + { + ExplainIndentText(es); + appendStringInfoString(es->str, "Null Hashtable: "); + } + show_tuplehash_info(&sps->hashnulls->instrument, es); + ExplainCloseGroup("Null Hashtable", "Null Hashtable", true, es); + } ancestors = list_delete_first(ancestors); } diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c index de0205f..52f955a 100644 --- a/src/backend/executor/execGrouping.c +++ b/src/backend/executor/execGrouping.c @@ -191,6 +191,7 @@ BuildTupleHashTableExt(PlanState *parent, hashtable->inputslot = NULL; hashtable->in_hash_funcs = NULL; hashtable->cur_eq_func = NULL; + memset(&hashtable->instrument, 0, sizeof(hashtable->instrument)); /* * If parallelism is in use, even if the master backend is performing the @@ -206,6 +207,7 @@ BuildTupleHashTableExt(PlanState *parent, hashtable->hash_iv = 0; hashtable->hashtab = tuplehash_create(metacxt, nbuckets, hashtable); + UpdateTupleHashTableStats(hashtable, true); /* * We copy the input tuple descriptor just for safety --- we assume all @@ -284,9 +286,34 @@ BuildTupleHashTable(PlanState *parent, void ResetTupleHashTable(TupleHashTable hashtable) { + UpdateTupleHashTableStats(hashtable, false); tuplehash_reset(hashtable->hashtab); } +/* Update instrumentation stats */ +void +UpdateTupleHashTableStats(TupleHashTable hashtable, bool initial) +{ + hashtable->instrument.nbuckets = hashtable->hashtab->size; + if (initial) + { + hashtable->instrument.nbuckets_original = hashtable->hashtab->size; + hashtable->instrument.space_peak_hash = hashtable->hashtab->size * + sizeof(TupleHashEntryData); + hashtable->instrument.space_peak_tuples = 0; + } + else + { +#define maxself(a,b) a=Max(a,b) + /* hashtable->entrysize includes additionalsize */ + maxself(hashtable->instrument.space_peak_hash, + hashtable->hashtab->size * sizeof(TupleHashEntryData)); + maxself(hashtable->instrument.space_peak_tuples, + hashtable->hashtab->members * hashtable->entrysize); +#undef maxself + } +} + /* * Find or create a hashtable entry for the tuple group containing the * given tuple. The tuple must be the same type as the hashtable entries. diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index a99b4a6..94c5bb0 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -1707,6 +1707,7 @@ agg_retrieve_direct(AggState *aggstate) */ initialize_phase(aggstate, 0); aggstate->table_filled = true; + UpdateTupleHashTableStats(aggstate->perhash[0].hashtable, false); ResetTupleHashIterator(aggstate->perhash[0].hashtable, &aggstate->perhash[0].hashiter); select_current_set(aggstate, 0, true); @@ -1904,6 +1905,13 @@ agg_retrieve_direct(AggState *aggstate) } } } + + if (aggstate->aggstrategy == AGG_MIXED && + aggstate->current_phase == 1) + { + for (int i = 0; i < aggstate->num_hashes; i++) + UpdateTupleHashTableStats(aggstate->perhash[i].hashtable, false); + } } /* @@ -1978,6 +1986,9 @@ agg_fill_hash_table(AggState *aggstate) } aggstate->table_filled = true; + for (int i = 0; i < aggstate->num_hashes; i++) + UpdateTupleHashTableStats(aggstate->perhash[i].hashtable, false); + /* Initialize to walk the first hash table */ select_current_set(aggstate, 0, true); ResetTupleHashIterator(aggstate->perhash[0].hashtable, diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c index 620414a..93272c2 100644 --- a/src/backend/executor/nodeRecursiveunion.c +++ b/src/backend/executor/nodeRecursiveunion.c @@ -156,6 +156,9 @@ ExecRecursiveUnion(PlanState *pstate) return slot; } + if (node->hashtable) + UpdateTupleHashTableStats(node->hashtable, false); + return NULL; } diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index bfd148a..9c0e0ab 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -415,6 +415,7 @@ setop_fill_hash_table(SetOpState *setopstate) setopstate->table_filled = true; /* Initialize to walk the hash table */ + UpdateTupleHashTableStats(setopstate->hashtable, false); ResetTupleHashIterator(setopstate->hashtable, &setopstate->hashiter); } diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index ff95317..eec849c 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -621,6 +621,9 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext) ExecClearTuple(node->projRight->pi_state.resultslot); MemoryContextSwitchTo(oldcontext); + UpdateTupleHashTableStats(node->hashtable, false); + if (node->hashnulls) + UpdateTupleHashTableStats(node->hashnulls, false); } /* diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 81fdfa4..34199b5 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -150,6 +150,7 @@ extern TupleHashEntry FindTupleHashEntry(TupleHashTable hashtable, ExprState *eqcomp, FmgrInfo *hashfunctions); extern void ResetTupleHashTable(TupleHashTable hashtable); +extern void UpdateTupleHashTableStats(TupleHashTable hashtable, bool initial); /* * prototypes from functions in execJunk.c diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index cd3ddf7..cfeada5 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -691,6 +691,14 @@ typedef struct TupleHashEntryData #define SH_DECLARE #include "lib/simplehash.h" +typedef struct HashTableInstrumentation +{ + size_t nbuckets; /* number of buckets at end of execution */ + size_t nbuckets_original; /* planned number of buckets */ + size_t space_peak_hash; /* peak memory usage in bytes */ + size_t space_peak_tuples; /* peak memory usage in bytes */ +} HashTableInstrumentation; + typedef struct TupleHashTableData { tuplehash_hash *hashtab; /* underlying hash table */ @@ -709,6 +717,7 @@ typedef struct TupleHashTableData ExprState *cur_eq_func; /* comparator for input vs. table */ uint32 hash_iv; /* hash-function IV */ ExprContext *exprcontext; /* expression context */ + HashTableInstrumentation instrument; } TupleHashTableData; typedef tuplehash_iterator TupleHashIterator; diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out index f457b5b..b173b32 100644 --- a/src/test/regress/expected/aggregates.out +++ b/src/test/regress/expected/aggregates.out @@ -517,10 +517,11 @@ order by 1, 2; -> HashAggregate Output: s2.s2, sum((s1.s1 + s2.s2)) Group Key: s2.s2 + Buckets: 4 -> Function Scan on pg_catalog.generate_series s2 Output: s2.s2 Function Call: generate_series(1, 3) -(14 rows) +(15 rows) select s1, s2, sm from generate_series(1, 3) s1, @@ -556,10 +557,11 @@ select array(select sum(x+y) s -> HashAggregate Output: sum((x.x + y.y)), y.y Group Key: y.y + Buckets: 4 -> Function Scan on pg_catalog.generate_series y Output: y.y Function Call: generate_series(1, 3) -(13 rows) +(14 rows) select array(select sum(x+y) s from generate_series(1,3) y group by y order by s) @@ -872,12 +874,13 @@ explain (costs off) --------------------------------------------------------------------- HashAggregate Group Key: $0 + Buckets: 2 InitPlan 1 (returns $0) -> Limit -> Index Only Scan Backward using tenk1_unique2 on tenk1 Index Cond: (unique2 IS NOT NULL) -> Result -(7 rows) +(8 rows) select distinct max(unique2) from tenk1; max @@ -1096,8 +1099,9 @@ explain (costs off) select * from t1 group by a,b,c,d; ---------------------- HashAggregate Group Key: a, b + Buckets: 256 -> Seq Scan on t1 -(3 rows) +(4 rows) -- No removal can happen if the complete PK is not present in GROUP BY explain (costs off) select a,c from t1 group by a,c,d; @@ -1105,8 +1109,9 @@ explain (costs off) select a,c from t1 group by a,c,d; ---------------------- HashAggregate Group Key: a, c, d + Buckets: 256 -> Seq Scan on t1 -(3 rows) +(4 rows) -- Test removal across multiple relations explain (costs off) select * @@ -1116,12 +1121,13 @@ group by t1.a,t1.b,t1.c,t1.d,t2.x,t2.y,t2.z; ------------------------------------------------------ HashAggregate Group Key: t1.a, t1.b, t2.x, t2.y + Buckets: 128 -> Hash Join Hash Cond: ((t2.x = t1.a) AND (t2.y = t1.b)) -> Seq Scan on t2 -> Hash -> Seq Scan on t1 -(7 rows) +(8 rows) -- Test case where t1 can be optimized but not t2 explain (costs off) select t1.*,t2.x,t2.z @@ -1131,12 +1137,13 @@ group by t1.a,t1.b,t1.c,t1.d,t2.x,t2.z; ------------------------------------------------------ HashAggregate Group Key: t1.a, t1.b, t2.x, t2.z + Buckets: 128 -> Hash Join Hash Cond: ((t2.x = t1.a) AND (t2.y = t1.b)) -> Seq Scan on t2 -> Hash -> Seq Scan on t1 -(7 rows) +(8 rows) -- Cannot optimize when PK is deferrable explain (costs off) select * from t3 group by a,b,c; @@ -1144,8 +1151,9 @@ explain (costs off) select * from t3 group by a,b,c; ---------------------- HashAggregate Group Key: a, b, c + Buckets: 256 -> Seq Scan on t3 -(3 rows) +(4 rows) create temp table t1c () inherits (t1); -- Ensure we don't remove any columns when t1 has a child table @@ -1154,10 +1162,11 @@ explain (costs off) select * from t1 group by a,b,c,d; ------------------------------------- HashAggregate Group Key: t1.a, t1.b, t1.c, t1.d + Buckets: 256 -> Append -> Seq Scan on t1 t1_1 -> Seq Scan on t1c t1_2 -(5 rows) +(6 rows) -- Okay to remove columns if we're only querying the parent. explain (costs off) select * from only t1 group by a,b,c,d; @@ -1165,8 +1174,9 @@ explain (costs off) select * from only t1 group by a,b,c,d; ---------------------- HashAggregate Group Key: a, b + Buckets: 2 -> Seq Scan on t1 -(3 rows) +(4 rows) create temp table p_t1 ( a int, @@ -1183,10 +1193,11 @@ explain (costs off) select * from p_t1 group by a,b,c,d; -------------------------------- HashAggregate Group Key: p_t1.a, p_t1.b + Buckets: 512 -> Append -> Seq Scan on p_t1_1 -> Seq Scan on p_t1_2 -(5 rows) +(6 rows) drop table t1 cascade; NOTICE: drop cascades to table t1c @@ -2354,6 +2365,7 @@ explain (costs off) -> Hash -> HashAggregate Group Key: onek.twothousand, onek.twothousand + Buckets: 256 -> Seq Scan on onek -(8 rows) +(9 rows) diff --git a/src/test/regress/expected/groupingsets.out b/src/test/regress/expected/groupingsets.out index c1f802c..be38673 100644 --- a/src/test/regress/expected/groupingsets.out +++ b/src/test/regress/expected/groupingsets.out @@ -974,9 +974,11 @@ explain (costs off) select a, b, grouping(a,b), sum(v), count(*), max(v) Sort Key: (GROUPING("*VALUES*".column1, "*VALUES*".column2)), "*VALUES*".column1, "*VALUES*".column2 -> HashAggregate Hash Key: "*VALUES*".column1 + Buckets: 16 Hash Key: "*VALUES*".column2 + Buckets: 16 -> Values Scan on "*VALUES*" -(6 rows) +(8 rows) select a, b, grouping(a,b), sum(v), count(*), max(v) from gstest1 group by cube(a,b) order by 3,1,2; @@ -1008,11 +1010,14 @@ explain (costs off) select a, b, grouping(a,b), sum(v), count(*), max(v) Sort Key: (GROUPING("*VALUES*".column1, "*VALUES*".column2)), "*VALUES*".column1, "*VALUES*".column2 -> MixedAggregate Hash Key: "*VALUES*".column1, "*VALUES*".column2 + Buckets: 16 Hash Key: "*VALUES*".column1 + Buckets: 16 Hash Key: "*VALUES*".column2 + Buckets: 16 Group Key: () -> Values Scan on "*VALUES*" -(8 rows) +(11 rows) -- shouldn't try and hash explain (costs off) @@ -1071,11 +1076,12 @@ explain (costs off) Sort Key: (GROUPING(unhashable_col, unsortable_col)), (sum(v)) -> MixedAggregate Hash Key: unsortable_col + Buckets: 256 Group Key: unhashable_col -> Sort Sort Key: unhashable_col -> Seq Scan on gstest4 -(8 rows) +(9 rows) select unhashable_col, unsortable_col, grouping(unhashable_col, unsortable_col), @@ -1114,11 +1120,12 @@ explain (costs off) Sort Key: (GROUPING(unhashable_col, unsortable_col)), (sum(v)) -> MixedAggregate Hash Key: v, unsortable_col + Buckets: 256 Group Key: v, unhashable_col -> Sort Sort Key: v, unhashable_col -> Seq Scan on gstest4 -(8 rows) +(9 rows) -- empty input: first is 0 rows, second 1, third 3 etc. select a, b, sum(v), count(*) from gstest_empty group by grouping sets ((a,b),a); @@ -1132,9 +1139,11 @@ explain (costs off) -------------------------------- HashAggregate Hash Key: a, b + Buckets: 256 Hash Key: a + Buckets: 256 -> Seq Scan on gstest_empty -(4 rows) +(6 rows) select a, b, sum(v), count(*) from gstest_empty group by grouping sets ((a,b),()); a | b | sum | count @@ -1156,11 +1165,12 @@ explain (costs off) -------------------------------- MixedAggregate Hash Key: a, b + Buckets: 256 Group Key: () Group Key: () Group Key: () -> Seq Scan on gstest_empty -(6 rows) +(7 rows) select sum(v), count(*) from gstest_empty group by grouping sets ((),(),()); sum | count @@ -1201,9 +1211,11 @@ explain (costs off) --------------------------- HashAggregate Hash Key: a, b + Buckets: 2 Hash Key: a, c + Buckets: 2 -> Seq Scan on gstest3 -(4 rows) +(6 rows) -- simple rescan tests select a, b, sum(v.x) @@ -1230,11 +1242,13 @@ explain (costs off) Sort Key: (sum("*VALUES*".column1)), gstest_data.a, gstest_data.b -> HashAggregate Hash Key: gstest_data.a + Buckets: 256 Hash Key: gstest_data.b + Buckets: 256 -> Nested Loop -> Values Scan on "*VALUES*" -> Function Scan on gstest_data -(8 rows) +(10 rows) select * from (values (1),(2)) v(x), @@ -1286,10 +1300,13 @@ explain (costs off) Sort Key: (GROUPING("*VALUES*".column1, "*VALUES*".column2)), (max("*VALUES*".column3)) -> HashAggregate Hash Key: "*VALUES*".column1, "*VALUES*".column2 + Buckets: 16 Hash Key: ("*VALUES*".column1 + 1), ("*VALUES*".column2 + 1) + Buckets: 16 Hash Key: ("*VALUES*".column1 + 2), ("*VALUES*".column2 + 2) + Buckets: 16 -> Values Scan on "*VALUES*" -(7 rows) +(10 rows) select a, b, sum(c), sum(sum(c)) over (order by a,b) as rsum from gstest2 group by cube (a,b) order by rsum, a, b; @@ -1317,11 +1334,14 @@ explain (costs off) Sort Key: a, b -> MixedAggregate Hash Key: a, b + Buckets: 256 Hash Key: a + Buckets: 256 Hash Key: b + Buckets: 256 Group Key: () -> Seq Scan on gstest2 -(11 rows) +(14 rows) select a, b, sum(v.x) from (values (1),(2)) v(x), gstest_data(v.x) @@ -1352,13 +1372,16 @@ explain (costs off) Sort Key: gstest_data.a, gstest_data.b -> MixedAggregate Hash Key: gstest_data.a, gstest_data.b + Buckets: 256 Hash Key: gstest_data.a + Buckets: 256 Hash Key: gstest_data.b + Buckets: 256 Group Key: () -> Nested Loop -> Values Scan on "*VALUES*" -> Function Scan on gstest_data -(10 rows) +(13 rows) -- Verify that we correctly handle the child node returning a -- non-minimal slot, which happens if the input is pre-sorted, @@ -1553,9 +1576,13 @@ explain (costs off) ------------------------------- MixedAggregate Hash Key: two + Buckets: 2 Hash Key: four + Buckets: 4 Hash Key: ten + Buckets: 16 Hash Key: hundred + Buckets: 128 Group Key: unique1 Sort Key: twothousand Group Key: twothousand @@ -1564,7 +1591,7 @@ explain (costs off) -> Sort Sort Key: unique1 -> Seq Scan on tenk1 -(13 rows) +(17 rows) explain (costs off) select unique1, @@ -1576,14 +1603,18 @@ explain (costs off) ------------------------------- MixedAggregate Hash Key: two + Buckets: 2 Hash Key: four + Buckets: 4 Hash Key: ten + Buckets: 16 Hash Key: hundred + Buckets: 128 Group Key: unique1 -> Sort Sort Key: unique1 -> Seq Scan on tenk1 -(9 rows) +(13 rows) set work_mem = '384kB'; explain (costs off) @@ -1596,17 +1627,22 @@ explain (costs off) ------------------------------- MixedAggregate Hash Key: two + Buckets: 2 Hash Key: four + Buckets: 4 Hash Key: ten + Buckets: 16 Hash Key: hundred + Buckets: 128 Hash Key: thousand + Buckets: 2048 Group Key: unique1 Sort Key: twothousand Group Key: twothousand -> Sort Sort Key: unique1 -> Seq Scan on tenk1 -(12 rows) +(17 rows) -- check collation-sensitive matching between grouping expressions -- (similar to a check for aggregates, but there are additional code diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index 761376b..9f07501 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -6199,6 +6199,7 @@ where exists (select 1 from tenk1 t3 -> HashAggregate Output: t3.thousand, t3.tenthous Group Key: t3.thousand, t3.tenthous + Buckets: 16384 -> Index Only Scan using tenk1_thous_tenthous on public.tenk1 t3 Output: t3.thousand, t3.tenthous -> Hash @@ -6209,7 +6210,7 @@ where exists (select 1 from tenk1 t3 -> Index Only Scan using tenk1_hundred on public.tenk1 t2 Output: t2.hundred Index Cond: (t2.hundred = t3.tenthous) -(18 rows) +(19 rows) -- ... unless it actually is unique create table j3 as select unique1, tenthous from onek; diff --git a/src/test/regress/expected/matview.out b/src/test/regress/expected/matview.out index d0121a7..ca8573a 100644 --- a/src/test/regress/expected/matview.out +++ b/src/test/regress/expected/matview.out @@ -23,8 +23,9 @@ EXPLAIN (costs off) ---------------------------- HashAggregate Group Key: type + Buckets: 256 -> Seq Scan on mvtest_t -(3 rows) +(4 rows) CREATE MATERIALIZED VIEW mvtest_tm AS SELECT type, sum(amt) AS totamt FROM mvtest_t GROUP BY type WITH NO DATA; SELECT relispopulated FROM pg_class WHERE oid = 'mvtest_tm'::regclass; @@ -61,8 +62,9 @@ EXPLAIN (costs off) Sort Key: mvtest_t.type -> HashAggregate Group Key: mvtest_t.type + Buckets: 256 -> Seq Scan on mvtest_t -(5 rows) +(6 rows) CREATE MATERIALIZED VIEW mvtest_tvm AS SELECT * FROM mvtest_tv ORDER BY type; SELECT * FROM mvtest_tvm; @@ -85,8 +87,9 @@ EXPLAIN (costs off) Aggregate -> HashAggregate Group Key: mvtest_t.type + Buckets: 256 -> Seq Scan on mvtest_t -(4 rows) +(5 rows) CREATE MATERIALIZED VIEW mvtest_tvvm AS SELECT * FROM mvtest_tvv; CREATE VIEW mvtest_tvvmv AS SELECT * FROM mvtest_tvvm; diff --git a/src/test/regress/expected/partition_aggregate.out b/src/test/regress/expected/partition_aggregate.out index fbc8d3a..5939c2a 100644 --- a/src/test/regress/expected/partition_aggregate.out +++ b/src/test/regress/expected/partition_aggregate.out @@ -27,17 +27,20 @@ SELECT c, sum(a), avg(b), count(*), min(a), max(b) FROM pagg_tab GROUP BY c HAVI -> Append -> HashAggregate Group Key: pagg_tab.c + Buckets: 4 Filter: (avg(pagg_tab.d) < '15'::numeric) -> Seq Scan on pagg_tab_p1 pagg_tab -> HashAggregate Group Key: pagg_tab_1.c + Buckets: 4 Filter: (avg(pagg_tab_1.d) < '15'::numeric) -> Seq Scan on pagg_tab_p2 pagg_tab_1 -> HashAggregate Group Key: pagg_tab_2.c + Buckets: 4 Filter: (avg(pagg_tab_2.d) < '15'::numeric) -> Seq Scan on pagg_tab_p3 pagg_tab_2 -(15 rows) +(18 rows) SELECT c, sum(a), avg(b), count(*), min(a), max(b) FROM pagg_tab GROUP BY c HAVING avg(d) < 15 ORDER BY 1, 2, 3; c | sum | avg | count | min | max @@ -59,18 +62,22 @@ SELECT a, sum(b), avg(b), count(*), min(a), max(b) FROM pagg_tab GROUP BY a HAVI Sort Key: pagg_tab.a, (sum(pagg_tab.b)), (avg(pagg_tab.b)) -> Finalize HashAggregate Group Key: pagg_tab.a + Buckets: 32 Filter: (avg(pagg_tab.d) < '15'::numeric) -> Append -> Partial HashAggregate Group Key: pagg_tab.a + Buckets: 32 -> Seq Scan on pagg_tab_p1 pagg_tab -> Partial HashAggregate Group Key: pagg_tab_1.a + Buckets: 32 -> Seq Scan on pagg_tab_p2 pagg_tab_1 -> Partial HashAggregate Group Key: pagg_tab_2.a + Buckets: 32 -> Seq Scan on pagg_tab_p3 pagg_tab_2 -(15 rows) +(19 rows) SELECT a, sum(b), avg(b), count(*), min(a), max(b) FROM pagg_tab GROUP BY a HAVING avg(d) < 15 ORDER BY 1, 2, 3; a | sum | avg | count | min | max @@ -95,14 +102,17 @@ SELECT a, c, count(*) FROM pagg_tab GROUP BY a, c; Append -> HashAggregate Group Key: pagg_tab.a, pagg_tab.c + Buckets: 128 -> Seq Scan on pagg_tab_p1 pagg_tab -> HashAggregate Group Key: pagg_tab_1.a, pagg_tab_1.c + Buckets: 128 -> Seq Scan on pagg_tab_p2 pagg_tab_1 -> HashAggregate Group Key: pagg_tab_2.a, pagg_tab_2.c + Buckets: 128 -> Seq Scan on pagg_tab_p3 pagg_tab_2 -(10 rows) +(13 rows) -- Check with multiple columns in GROUP BY, order in GROUP BY is reversed EXPLAIN (COSTS OFF) @@ -112,14 +122,17 @@ SELECT a, c, count(*) FROM pagg_tab GROUP BY c, a; Append -> HashAggregate Group Key: pagg_tab.c, pagg_tab.a + Buckets: 128 -> Seq Scan on pagg_tab_p1 pagg_tab -> HashAggregate Group Key: pagg_tab_1.c, pagg_tab_1.a + Buckets: 128 -> Seq Scan on pagg_tab_p2 pagg_tab_1 -> HashAggregate Group Key: pagg_tab_2.c, pagg_tab_2.a + Buckets: 128 -> Seq Scan on pagg_tab_p3 pagg_tab_2 -(10 rows) +(13 rows) -- Check with multiple columns in GROUP BY, order in target-list is reversed EXPLAIN (COSTS OFF) @@ -129,14 +142,17 @@ SELECT c, a, count(*) FROM pagg_tab GROUP BY a, c; Append -> HashAggregate Group Key: pagg_tab.a, pagg_tab.c + Buckets: 128 -> Seq Scan on pagg_tab_p1 pagg_tab -> HashAggregate Group Key: pagg_tab_1.a, pagg_tab_1.c + Buckets: 128 -> Seq Scan on pagg_tab_p2 pagg_tab_1 -> HashAggregate Group Key: pagg_tab_2.a, pagg_tab_2.c + Buckets: 128 -> Seq Scan on pagg_tab_p3 pagg_tab_2 -(10 rows) +(13 rows) -- Test when input relation for grouping is dummy EXPLAIN (COSTS OFF) @@ -145,9 +161,10 @@ SELECT c, sum(a) FROM pagg_tab WHERE 1 = 2 GROUP BY c; -------------------------------- HashAggregate Group Key: c + Buckets: 2 -> Result One-Time Filter: false -(4 rows) +(5 rows) SELECT c, sum(a) FROM pagg_tab WHERE 1 = 2 GROUP BY c; c | sum @@ -341,12 +358,13 @@ SELECT c, sum(a) FROM pagg_tab GROUP BY rollup(c) ORDER BY 1, 2; Sort Key: pagg_tab.c, (sum(pagg_tab.a)) -> MixedAggregate Hash Key: pagg_tab.c + Buckets: 16 Group Key: () -> Append -> Seq Scan on pagg_tab_p1 pagg_tab_1 -> Seq Scan on pagg_tab_p2 pagg_tab_2 -> Seq Scan on pagg_tab_p3 pagg_tab_3 -(9 rows) +(10 rows) -- ORDERED SET within the aggregate. -- Full aggregation; since all the rows that belong to the same group come @@ -418,6 +436,7 @@ SELECT t1.x, sum(t1.y), count(*) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t2 -> Append -> HashAggregate Group Key: t1.x + Buckets: 8 -> Hash Join Hash Cond: (t1.x = t2.y) -> Seq Scan on pagg_tab1_p1 t1 @@ -425,6 +444,7 @@ SELECT t1.x, sum(t1.y), count(*) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t2 -> Seq Scan on pagg_tab2_p1 t2 -> HashAggregate Group Key: t1_1.x + Buckets: 8 -> Hash Join Hash Cond: (t1_1.x = t2_1.y) -> Seq Scan on pagg_tab1_p2 t1_1 @@ -432,12 +452,13 @@ SELECT t1.x, sum(t1.y), count(*) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t2 -> Seq Scan on pagg_tab2_p2 t2_1 -> HashAggregate Group Key: t1_2.x + Buckets: 8 -> Hash Join Hash Cond: (t2_2.y = t1_2.x) -> Seq Scan on pagg_tab2_p3 t2_2 -> Hash -> Seq Scan on pagg_tab1_p3 t1_2 -(24 rows) +(27 rows) SELECT t1.x, sum(t1.y), count(*) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t2.y GROUP BY t1.x ORDER BY 1, 2, 3; x | sum | count @@ -458,6 +479,7 @@ SELECT t1.x, sum(t1.y), count(t1) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t Sort Key: t1.x, (sum(t1.y)), (count(((t1.*)::pagg_tab1))) -> HashAggregate Group Key: t1.x + Buckets: 16 -> Hash Join Hash Cond: (t1.x = t2.y) -> Append @@ -469,7 +491,7 @@ SELECT t1.x, sum(t1.y), count(t1) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t -> Seq Scan on pagg_tab2_p1 t2_1 -> Seq Scan on pagg_tab2_p2 t2_2 -> Seq Scan on pagg_tab2_p3 t2_3 -(15 rows) +(16 rows) SELECT t1.x, sum(t1.y), count(t1) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t2.y GROUP BY t1.x ORDER BY 1, 2, 3; x | sum | count @@ -491,6 +513,7 @@ SELECT t2.y, sum(t1.y), count(*) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t2 -> Append -> HashAggregate Group Key: t2.y + Buckets: 4 -> Hash Join Hash Cond: (t1.x = t2.y) -> Seq Scan on pagg_tab1_p1 t1 @@ -498,6 +521,7 @@ SELECT t2.y, sum(t1.y), count(*) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t2 -> Seq Scan on pagg_tab2_p1 t2 -> HashAggregate Group Key: t2_1.y + Buckets: 4 -> Hash Join Hash Cond: (t1_1.x = t2_1.y) -> Seq Scan on pagg_tab1_p2 t1_1 @@ -505,12 +529,13 @@ SELECT t2.y, sum(t1.y), count(*) FROM pagg_tab1 t1, pagg_tab2 t2 WHERE t1.x = t2 -> Seq Scan on pagg_tab2_p2 t2_1 -> HashAggregate Group Key: t2_2.y + Buckets: 4 -> Hash Join Hash Cond: (t2_2.y = t1_2.x) -> Seq Scan on pagg_tab2_p3 t2_2 -> Hash -> Seq Scan on pagg_tab1_p3 t1_2 -(24 rows) +(27 rows) -- When GROUP BY clause does not match; partial aggregation is performed for each partition. -- Also test GroupAggregate paths by disabling hash aggregates. @@ -582,6 +607,7 @@ SELECT b.y, sum(a.y) FROM pagg_tab1 a LEFT JOIN pagg_tab2 b ON a.x = b.y GROUP B -> Append -> Partial HashAggregate Group Key: b.y + Buckets: 4 -> Hash Left Join Hash Cond: (a.x = b.y) -> Seq Scan on pagg_tab1_p1 a @@ -589,6 +615,7 @@ SELECT b.y, sum(a.y) FROM pagg_tab1 a LEFT JOIN pagg_tab2 b ON a.x = b.y GROUP B -> Seq Scan on pagg_tab2_p1 b -> Partial HashAggregate Group Key: b_1.y + Buckets: 4 -> Hash Left Join Hash Cond: (a_1.x = b_1.y) -> Seq Scan on pagg_tab1_p2 a_1 @@ -596,12 +623,13 @@ SELECT b.y, sum(a.y) FROM pagg_tab1 a LEFT JOIN pagg_tab2 b ON a.x = b.y GROUP B -> Seq Scan on pagg_tab2_p2 b_1 -> Partial HashAggregate Group Key: b_2.y + Buckets: 4 -> Hash Right Join Hash Cond: (b_2.y = a_2.x) -> Seq Scan on pagg_tab2_p3 b_2 -> Hash -> Seq Scan on pagg_tab1_p3 a_2 -(26 rows) +(29 rows) SELECT b.y, sum(a.y) FROM pagg_tab1 a LEFT JOIN pagg_tab2 b ON a.x = b.y GROUP BY b.y ORDER BY 1 NULLS LAST; y | sum @@ -625,6 +653,7 @@ SELECT b.y, sum(a.y) FROM pagg_tab1 a RIGHT JOIN pagg_tab2 b ON a.x = b.y GROUP -> Append -> HashAggregate Group Key: b.y + Buckets: 4 -> Hash Right Join Hash Cond: (a.x = b.y) -> Seq Scan on pagg_tab1_p1 a @@ -632,6 +661,7 @@ SELECT b.y, sum(a.y) FROM pagg_tab1 a RIGHT JOIN pagg_tab2 b ON a.x = b.y GROUP -> Seq Scan on pagg_tab2_p1 b -> HashAggregate Group Key: b_1.y + Buckets: 4 -> Hash Right Join Hash Cond: (a_1.x = b_1.y) -> Seq Scan on pagg_tab1_p2 a_1 @@ -639,12 +669,13 @@ SELECT b.y, sum(a.y) FROM pagg_tab1 a RIGHT JOIN pagg_tab2 b ON a.x = b.y GROUP -> Seq Scan on pagg_tab2_p2 b_1 -> HashAggregate Group Key: b_2.y + Buckets: 4 -> Hash Left Join Hash Cond: (b_2.y = a_2.x) -> Seq Scan on pagg_tab2_p3 b_2 -> Hash -> Seq Scan on pagg_tab1_p3 a_2 -(24 rows) +(27 rows) SELECT b.y, sum(a.y) FROM pagg_tab1 a RIGHT JOIN pagg_tab2 b ON a.x = b.y GROUP BY b.y ORDER BY 1 NULLS LAST; y | sum @@ -674,6 +705,7 @@ SELECT a.x, sum(b.x) FROM pagg_tab1 a FULL OUTER JOIN pagg_tab2 b ON a.x = b.y G -> Append -> Partial HashAggregate Group Key: a.x + Buckets: 8 -> Hash Full Join Hash Cond: (a.x = b.y) -> Seq Scan on pagg_tab1_p1 a @@ -681,6 +713,7 @@ SELECT a.x, sum(b.x) FROM pagg_tab1 a FULL OUTER JOIN pagg_tab2 b ON a.x = b.y G -> Seq Scan on pagg_tab2_p1 b -> Partial HashAggregate Group Key: a_1.x + Buckets: 8 -> Hash Full Join Hash Cond: (a_1.x = b_1.y) -> Seq Scan on pagg_tab1_p2 a_1 @@ -688,12 +721,13 @@ SELECT a.x, sum(b.x) FROM pagg_tab1 a FULL OUTER JOIN pagg_tab2 b ON a.x = b.y G -> Seq Scan on pagg_tab2_p2 b_1 -> Partial HashAggregate Group Key: a_2.x + Buckets: 8 -> Hash Full Join Hash Cond: (b_2.y = a_2.x) -> Seq Scan on pagg_tab2_p3 b_2 -> Hash -> Seq Scan on pagg_tab1_p3 a_2 -(26 rows) +(29 rows) SELECT a.x, sum(b.x) FROM pagg_tab1 a FULL OUTER JOIN pagg_tab2 b ON a.x = b.y GROUP BY a.x ORDER BY 1 NULLS LAST; x | sum @@ -728,6 +762,7 @@ SELECT a.x, b.y, count(*) FROM (SELECT * FROM pagg_tab1 WHERE x < 20) a LEFT JOI Sort Key: pagg_tab1.x, pagg_tab2.y -> HashAggregate Group Key: pagg_tab1.x, pagg_tab2.y + Buckets: 256 -> Hash Left Join Hash Cond: (pagg_tab1.x = pagg_tab2.y) Filter: ((pagg_tab1.x > 5) OR (pagg_tab2.y < 20)) @@ -742,7 +777,7 @@ SELECT a.x, b.y, count(*) FROM (SELECT * FROM pagg_tab1 WHERE x < 20) a LEFT JOI Filter: (y > 10) -> Seq Scan on pagg_tab2_p3 pagg_tab2_2 Filter: (y > 10) -(18 rows) +(19 rows) SELECT a.x, b.y, count(*) FROM (SELECT * FROM pagg_tab1 WHERE x < 20) a LEFT JOIN (SELECT * FROM pagg_tab2 WHERE y > 10) b ON a.x = b.y WHERE a.x > 5 or b.y < 20 GROUP BY a.x, b.y ORDER BY 1, 2; x | y | count @@ -768,6 +803,7 @@ SELECT a.x, b.y, count(*) FROM (SELECT * FROM pagg_tab1 WHERE x < 20) a FULL JOI Sort Key: pagg_tab1.x, pagg_tab2.y -> HashAggregate Group Key: pagg_tab1.x, pagg_tab2.y + Buckets: 256 -> Hash Full Join Hash Cond: (pagg_tab1.x = pagg_tab2.y) Filter: ((pagg_tab1.x > 5) OR (pagg_tab2.y < 20)) @@ -782,7 +818,7 @@ SELECT a.x, b.y, count(*) FROM (SELECT * FROM pagg_tab1 WHERE x < 20) a FULL JOI Filter: (y > 10) -> Seq Scan on pagg_tab2_p3 pagg_tab2_2 Filter: (y > 10) -(18 rows) +(19 rows) SELECT a.x, b.y, count(*) FROM (SELECT * FROM pagg_tab1 WHERE x < 20) a FULL JOIN (SELECT * FROM pagg_tab2 WHERE y > 10) b ON a.x = b.y WHERE a.x > 5 or b.y < 20 GROUP BY a.x, b.y ORDER BY 1, 2; x | y | count @@ -831,18 +867,22 @@ SELECT a, sum(b), avg(c), count(*) FROM pagg_tab_m GROUP BY a HAVING avg(c) < 22 Sort Key: pagg_tab_m.a, (sum(pagg_tab_m.b)), (avg(pagg_tab_m.c)) -> Finalize HashAggregate Group Key: pagg_tab_m.a + Buckets: 64 Filter: (avg(pagg_tab_m.c) < '22'::numeric) -> Append -> Partial HashAggregate Group Key: pagg_tab_m.a + Buckets: 16 -> Seq Scan on pagg_tab_m_p1 pagg_tab_m -> Partial HashAggregate Group Key: pagg_tab_m_1.a + Buckets: 16 -> Seq Scan on pagg_tab_m_p2 pagg_tab_m_1 -> Partial HashAggregate Group Key: pagg_tab_m_2.a + Buckets: 16 -> Seq Scan on pagg_tab_m_p3 pagg_tab_m_2 -(15 rows) +(19 rows) SELECT a, sum(b), avg(c), count(*) FROM pagg_tab_m GROUP BY a HAVING avg(c) < 22 ORDER BY 1, 2, 3; a | sum | avg | count @@ -865,17 +905,20 @@ SELECT a, sum(b), avg(c), count(*) FROM pagg_tab_m GROUP BY a, (a+b)/2 HAVING su -> Append -> HashAggregate Group Key: pagg_tab_m.a, ((pagg_tab_m.a + pagg_tab_m.b) / 2) + Buckets: 128 Filter: (sum(pagg_tab_m.b) < 50) -> Seq Scan on pagg_tab_m_p1 pagg_tab_m -> HashAggregate Group Key: pagg_tab_m_1.a, ((pagg_tab_m_1.a + pagg_tab_m_1.b) / 2) + Buckets: 128 Filter: (sum(pagg_tab_m_1.b) < 50) -> Seq Scan on pagg_tab_m_p2 pagg_tab_m_1 -> HashAggregate Group Key: pagg_tab_m_2.a, ((pagg_tab_m_2.a + pagg_tab_m_2.b) / 2) + Buckets: 128 Filter: (sum(pagg_tab_m_2.b) < 50) -> Seq Scan on pagg_tab_m_p3 pagg_tab_m_2 -(15 rows) +(18 rows) SELECT a, sum(b), avg(c), count(*) FROM pagg_tab_m GROUP BY a, (a+b)/2 HAVING sum(b) < 50 ORDER BY 1, 2, 3; a | sum | avg | count @@ -898,17 +941,20 @@ SELECT a, c, sum(b), avg(c), count(*) FROM pagg_tab_m GROUP BY (a+b)/2, 2, 1 HAV -> Append -> HashAggregate Group Key: ((pagg_tab_m.a + pagg_tab_m.b) / 2), pagg_tab_m.c, pagg_tab_m.a + Buckets: 128 Filter: ((sum(pagg_tab_m.b) = 50) AND (avg(pagg_tab_m.c) > '25'::numeric)) -> Seq Scan on pagg_tab_m_p1 pagg_tab_m -> HashAggregate Group Key: ((pagg_tab_m_1.a + pagg_tab_m_1.b) / 2), pagg_tab_m_1.c, pagg_tab_m_1.a + Buckets: 128 Filter: ((sum(pagg_tab_m_1.b) = 50) AND (avg(pagg_tab_m_1.c) > '25'::numeric)) -> Seq Scan on pagg_tab_m_p2 pagg_tab_m_1 -> HashAggregate Group Key: ((pagg_tab_m_2.a + pagg_tab_m_2.b) / 2), pagg_tab_m_2.c, pagg_tab_m_2.a + Buckets: 128 Filter: ((sum(pagg_tab_m_2.b) = 50) AND (avg(pagg_tab_m_2.c) > '25'::numeric)) -> Seq Scan on pagg_tab_m_p3 pagg_tab_m_2 -(15 rows) +(18 rows) SELECT a, c, sum(b), avg(c), count(*) FROM pagg_tab_m GROUP BY (a+b)/2, 2, 1 HAVING sum(b) = 50 AND avg(c) > 25 ORDER BY 1, 2, 3; a | c | sum | avg | count @@ -1032,6 +1078,7 @@ SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a HAVING avg(b) < 3 ORDER B -> Append -> HashAggregate Group Key: pagg_tab_ml.a + Buckets: 16 Filter: (avg(pagg_tab_ml.b) < '3'::numeric) -> Seq Scan on pagg_tab_ml_p1 pagg_tab_ml -> Finalize GroupAggregate @@ -1042,9 +1089,11 @@ SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a HAVING avg(b) < 3 ORDER B -> Append -> Partial HashAggregate Group Key: pagg_tab_ml_2.a + Buckets: 16 -> Seq Scan on pagg_tab_ml_p2_s1 pagg_tab_ml_2 -> Partial HashAggregate Group Key: pagg_tab_ml_3.a + Buckets: 16 -> Seq Scan on pagg_tab_ml_p2_s2 pagg_tab_ml_3 -> Finalize GroupAggregate Group Key: pagg_tab_ml_5.a @@ -1054,11 +1103,13 @@ SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a HAVING avg(b) < 3 ORDER B -> Append -> Partial HashAggregate Group Key: pagg_tab_ml_5.a + Buckets: 8 -> Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_5 -> Partial HashAggregate Group Key: pagg_tab_ml_6.a + Buckets: 8 -> Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_6 -(31 rows) +(36 rows) SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a HAVING avg(b) < 3 ORDER BY 1, 2, 3; a | sum | count @@ -1089,20 +1140,25 @@ SELECT b, sum(a), count(*) FROM pagg_tab_ml GROUP BY b ORDER BY 1, 2, 3; -> Append -> Partial HashAggregate Group Key: pagg_tab_ml.b + Buckets: 16 -> Seq Scan on pagg_tab_ml_p1 pagg_tab_ml -> Partial HashAggregate Group Key: pagg_tab_ml_1.b + Buckets: 16 -> Seq Scan on pagg_tab_ml_p2_s1 pagg_tab_ml_1 -> Partial HashAggregate Group Key: pagg_tab_ml_2.b + Buckets: 16 -> Seq Scan on pagg_tab_ml_p2_s2 pagg_tab_ml_2 -> Partial HashAggregate Group Key: pagg_tab_ml_3.b + Buckets: 8 -> Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_3 -> Partial HashAggregate Group Key: pagg_tab_ml_4.b + Buckets: 8 -> Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_4 -(22 rows) +(27 rows) SELECT b, sum(a), count(*) FROM pagg_tab_ml GROUP BY b HAVING avg(a) < 15 ORDER BY 1, 2, 3; b | sum | count @@ -1124,25 +1180,30 @@ SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a, b, c HAVING avg(b) > 7 O -> Append -> HashAggregate Group Key: pagg_tab_ml.a, pagg_tab_ml.b, pagg_tab_ml.c + Buckets: 512 Filter: (avg(pagg_tab_ml.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p1 pagg_tab_ml -> HashAggregate Group Key: pagg_tab_ml_1.a, pagg_tab_ml_1.b, pagg_tab_ml_1.c + Buckets: 256 Filter: (avg(pagg_tab_ml_1.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p2_s1 pagg_tab_ml_1 -> HashAggregate Group Key: pagg_tab_ml_2.a, pagg_tab_ml_2.b, pagg_tab_ml_2.c + Buckets: 256 Filter: (avg(pagg_tab_ml_2.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p2_s2 pagg_tab_ml_2 -> HashAggregate Group Key: pagg_tab_ml_3.a, pagg_tab_ml_3.b, pagg_tab_ml_3.c + Buckets: 128 Filter: (avg(pagg_tab_ml_3.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_3 -> HashAggregate Group Key: pagg_tab_ml_4.a, pagg_tab_ml_4.b, pagg_tab_ml_4.c + Buckets: 128 Filter: (avg(pagg_tab_ml_4.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_4 -(23 rows) +(28 rows) SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a, b, c HAVING avg(b) > 7 ORDER BY 1, 2, 3; a | sum | count @@ -1183,6 +1244,7 @@ SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a HAVING avg(b) < 3 ORDER B Sort Key: pagg_tab_ml.a -> Partial HashAggregate Group Key: pagg_tab_ml.a + Buckets: 16 -> Parallel Seq Scan on pagg_tab_ml_p1 pagg_tab_ml -> Finalize GroupAggregate Group Key: pagg_tab_ml_2.a @@ -1194,9 +1256,11 @@ SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a HAVING avg(b) < 3 ORDER B -> Parallel Append -> Partial HashAggregate Group Key: pagg_tab_ml_2.a + Buckets: 16 -> Parallel Seq Scan on pagg_tab_ml_p2_s1 pagg_tab_ml_2 -> Partial HashAggregate Group Key: pagg_tab_ml_3.a + Buckets: 16 -> Parallel Seq Scan on pagg_tab_ml_p2_s2 pagg_tab_ml_3 -> Finalize GroupAggregate Group Key: pagg_tab_ml_5.a @@ -1208,11 +1272,13 @@ SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a HAVING avg(b) < 3 ORDER B -> Parallel Append -> Partial HashAggregate Group Key: pagg_tab_ml_5.a + Buckets: 8 -> Parallel Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_5 -> Partial HashAggregate Group Key: pagg_tab_ml_6.a + Buckets: 8 -> Parallel Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_6 -(41 rows) +(46 rows) SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a HAVING avg(b) < 3 ORDER BY 1, 2, 3; a | sum | count @@ -1245,20 +1311,25 @@ SELECT b, sum(a), count(*) FROM pagg_tab_ml GROUP BY b ORDER BY 1, 2, 3; -> Parallel Append -> Partial HashAggregate Group Key: pagg_tab_ml.b + Buckets: 16 -> Parallel Seq Scan on pagg_tab_ml_p1 pagg_tab_ml -> Partial HashAggregate Group Key: pagg_tab_ml_1.b + Buckets: 16 -> Parallel Seq Scan on pagg_tab_ml_p2_s1 pagg_tab_ml_1 -> Partial HashAggregate Group Key: pagg_tab_ml_2.b + Buckets: 16 -> Parallel Seq Scan on pagg_tab_ml_p2_s2 pagg_tab_ml_2 -> Partial HashAggregate Group Key: pagg_tab_ml_3.b + Buckets: 8 -> Parallel Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_3 -> Partial HashAggregate Group Key: pagg_tab_ml_4.b + Buckets: 8 -> Parallel Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_4 -(24 rows) +(29 rows) SELECT b, sum(a), count(*) FROM pagg_tab_ml GROUP BY b HAVING avg(a) < 15 ORDER BY 1, 2, 3; b | sum | count @@ -1282,25 +1353,30 @@ SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a, b, c HAVING avg(b) > 7 O -> Parallel Append -> HashAggregate Group Key: pagg_tab_ml.a, pagg_tab_ml.b, pagg_tab_ml.c + Buckets: 512 Filter: (avg(pagg_tab_ml.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p1 pagg_tab_ml -> HashAggregate Group Key: pagg_tab_ml_1.a, pagg_tab_ml_1.b, pagg_tab_ml_1.c + Buckets: 256 Filter: (avg(pagg_tab_ml_1.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p2_s1 pagg_tab_ml_1 -> HashAggregate Group Key: pagg_tab_ml_2.a, pagg_tab_ml_2.b, pagg_tab_ml_2.c + Buckets: 256 Filter: (avg(pagg_tab_ml_2.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p2_s2 pagg_tab_ml_2 -> HashAggregate Group Key: pagg_tab_ml_3.a, pagg_tab_ml_3.b, pagg_tab_ml_3.c + Buckets: 128 Filter: (avg(pagg_tab_ml_3.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_3 -> HashAggregate Group Key: pagg_tab_ml_4.a, pagg_tab_ml_4.b, pagg_tab_ml_4.c + Buckets: 128 Filter: (avg(pagg_tab_ml_4.b) > '7'::numeric) -> Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_4 -(25 rows) +(30 rows) SELECT a, sum(b), count(*) FROM pagg_tab_ml GROUP BY a, b, c HAVING avg(b) > 7 ORDER BY 1, 2, 3; a | sum | count @@ -1351,14 +1427,17 @@ SELECT x, sum(y), avg(y), count(*) FROM pagg_tab_para GROUP BY x HAVING avg(y) < -> Parallel Append -> Partial HashAggregate Group Key: pagg_tab_para.x + Buckets: 16 -> Parallel Seq Scan on pagg_tab_para_p1 pagg_tab_para -> Partial HashAggregate Group Key: pagg_tab_para_1.x + Buckets: 16 -> Parallel Seq Scan on pagg_tab_para_p2 pagg_tab_para_1 -> Partial HashAggregate Group Key: pagg_tab_para_2.x + Buckets: 16 -> Parallel Seq Scan on pagg_tab_para_p3 pagg_tab_para_2 -(19 rows) +(22 rows) SELECT x, sum(y), avg(y), count(*) FROM pagg_tab_para GROUP BY x HAVING avg(y) < 7 ORDER BY 1, 2, 3; x | sum | avg | count @@ -1388,14 +1467,17 @@ SELECT y, sum(x), avg(x), count(*) FROM pagg_tab_para GROUP BY y HAVING avg(x) < -> Parallel Append -> Partial HashAggregate Group Key: pagg_tab_para.y + Buckets: 32 -> Parallel Seq Scan on pagg_tab_para_p1 pagg_tab_para -> Partial HashAggregate Group Key: pagg_tab_para_1.y + Buckets: 32 -> Parallel Seq Scan on pagg_tab_para_p2 pagg_tab_para_1 -> Partial HashAggregate Group Key: pagg_tab_para_2.y + Buckets: 32 -> Parallel Seq Scan on pagg_tab_para_p3 pagg_tab_para_2 -(19 rows) +(22 rows) SELECT y, sum(x), avg(x), count(*) FROM pagg_tab_para GROUP BY y HAVING avg(x) < 12 ORDER BY 1, 2, 3; y | sum | avg | count @@ -1425,11 +1507,12 @@ SELECT x, sum(y), avg(y), count(*) FROM pagg_tab_para GROUP BY x HAVING avg(y) < Sort Key: pagg_tab_para.x -> Partial HashAggregate Group Key: pagg_tab_para.x + Buckets: 64 -> Parallel Append -> Seq Scan on pagg_tab_para_p1 pagg_tab_para_1 -> Seq Scan on pagg_tab_para_p3 pagg_tab_para_3 -> Parallel Seq Scan on pagg_tab_para_p2 pagg_tab_para_2 -(15 rows) +(16 rows) SELECT x, sum(y), avg(y), count(*) FROM pagg_tab_para GROUP BY x HAVING avg(y) < 7 ORDER BY 1, 2, 3; x | sum | avg | count @@ -1459,11 +1542,12 @@ SELECT x, sum(y), avg(y), count(*) FROM pagg_tab_para GROUP BY x HAVING avg(y) < Sort Key: pagg_tab_para.x -> Partial HashAggregate Group Key: pagg_tab_para.x + Buckets: 64 -> Parallel Append -> Seq Scan on pagg_tab_para_p1 pagg_tab_para_1 -> Seq Scan on pagg_tab_para_p2 pagg_tab_para_2 -> Seq Scan on pagg_tab_para_p3 pagg_tab_para_3 -(15 rows) +(16 rows) SELECT x, sum(y), avg(y), count(*) FROM pagg_tab_para GROUP BY x HAVING avg(y) < 7 ORDER BY 1, 2, 3; x | sum | avg | count @@ -1488,17 +1572,20 @@ SELECT x, sum(y), avg(y), count(*) FROM pagg_tab_para GROUP BY x HAVING avg(y) < -> Append -> HashAggregate Group Key: pagg_tab_para.x + Buckets: 16 Filter: (avg(pagg_tab_para.y) < '7'::numeric) -> Seq Scan on pagg_tab_para_p1 pagg_tab_para -> HashAggregate Group Key: pagg_tab_para_1.x + Buckets: 16 Filter: (avg(pagg_tab_para_1.y) < '7'::numeric) -> Seq Scan on pagg_tab_para_p2 pagg_tab_para_1 -> HashAggregate Group Key: pagg_tab_para_2.x + Buckets: 16 Filter: (avg(pagg_tab_para_2.y) < '7'::numeric) -> Seq Scan on pagg_tab_para_p3 pagg_tab_para_2 -(15 rows) +(18 rows) SELECT x, sum(y), avg(y), count(*) FROM pagg_tab_para GROUP BY x HAVING avg(y) < 7 ORDER BY 1, 2, 3; x | sum | avg | count diff --git a/src/test/regress/expected/partition_join.out b/src/test/regress/expected/partition_join.out index b3fbe47..b830930 100644 --- a/src/test/regress/expected/partition_join.out +++ b/src/test/regress/expected/partition_join.out @@ -819,6 +819,7 @@ SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHER Join Filter: (t1_2.a = t1_5.b) -> HashAggregate Group Key: t1_5.b + Buckets: 4 -> Hash Join Hash Cond: (((t2_1.a + t2_1.b) / 2) = t1_5.b) -> Seq Scan on prt1_e_p1 t2_1 @@ -832,6 +833,7 @@ SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHER Join Filter: (t1_3.a = t1_6.b) -> HashAggregate Group Key: t1_6.b + Buckets: 4 -> Hash Join Hash Cond: (((t2_2.a + t2_2.b) / 2) = t1_6.b) -> Seq Scan on prt1_e_p2 t2_2 @@ -845,6 +847,7 @@ SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHER Join Filter: (t1_4.a = t1_7.b) -> HashAggregate Group Key: t1_7.b + Buckets: 2 -> Nested Loop -> Seq Scan on prt2_p3 t1_7 Filter: (a = 0) @@ -853,7 +856,7 @@ SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHER -> Index Scan using iprt1_p3_a on prt1_p3 t1_4 Index Cond: (a = ((t2_3.a + t2_3.b) / 2)) Filter: (b = 0) -(41 rows) +(44 rows) SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHERE t1.a = 0 AND t1.b = (t2.a + t2.b)/2) AND t1.b = 0 ORDER BY t1.a; a | b | c @@ -874,6 +877,7 @@ SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN ( -> Nested Loop -> HashAggregate Group Key: t1_6.b + Buckets: 4 -> Hash Semi Join Hash Cond: (t1_6.b = ((t1_9.a + t1_9.b) / 2)) -> Seq Scan on prt2_p1 t1_6 @@ -886,6 +890,7 @@ SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN ( -> Nested Loop -> HashAggregate Group Key: t1_7.b + Buckets: 4 -> Hash Semi Join Hash Cond: (t1_7.b = ((t1_10.a + t1_10.b) / 2)) -> Seq Scan on prt2_p2 t1_7 @@ -898,6 +903,7 @@ SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN ( -> Nested Loop -> HashAggregate Group Key: t1_8.b + Buckets: 2 -> Hash Semi Join Hash Cond: (t1_8.b = ((t1_11.a + t1_11.b) / 2)) -> Seq Scan on prt2_p3 t1_8 @@ -907,7 +913,7 @@ SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN ( -> Index Scan using iprt1_p3_a on prt1_p3 t1_5 Index Cond: (a = t1_8.b) Filter: (b = 0) -(39 rows) +(42 rows) SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a; a | b | c @@ -1466,6 +1472,7 @@ SELECT avg(t1.a), avg(t2.b), t1.c, t2.c FROM plt1 t1 RIGHT JOIN plt2 t2 ON t1.c Sort Key: t1.c -> HashAggregate Group Key: t1.c, t2.c + Buckets: 4 -> Append -> Hash Join Hash Cond: (t2_1.c = t1_1.c) @@ -1485,7 +1492,7 @@ SELECT avg(t1.a), avg(t2.b), t1.c, t2.c FROM plt1 t1 RIGHT JOIN plt2 t2 ON t1.c -> Hash -> Seq Scan on plt1_p3 t1_3 Filter: ((a % 25) = 0) -(23 rows) +(24 rows) -- -- multiple levels of partitioning diff --git a/src/test/regress/expected/pg_lsn.out b/src/test/regress/expected/pg_lsn.out index 64d41df..c6a5625 100644 --- a/src/test/regress/expected/pg_lsn.out +++ b/src/test/regress/expected/pg_lsn.out @@ -85,6 +85,7 @@ SELECT DISTINCT (i || '/' || j)::pg_lsn f Sort Key: (((((i.i)::text || '/'::text) || (j.j)::text))::pg_lsn) -> HashAggregate Group Key: ((((i.i)::text || '/'::text) || (j.j)::text))::pg_lsn + Buckets: 4 -> Nested Loop -> Function Scan on generate_series k -> Materialize @@ -93,7 +94,7 @@ SELECT DISTINCT (i || '/' || j)::pg_lsn f Filter: ((j > 0) AND (j <= 10)) -> Function Scan on generate_series i Filter: (i <= 10) -(12 rows) +(13 rows) SELECT DISTINCT (i || '/' || j)::pg_lsn f FROM generate_series(1, 10) i, diff --git a/src/test/regress/expected/select_distinct.out b/src/test/regress/expected/select_distinct.out index f3696c6..8e2903a 100644 --- a/src/test/regress/expected/select_distinct.out +++ b/src/test/regress/expected/select_distinct.out @@ -137,9 +137,10 @@ SELECT count(*) FROM -> HashAggregate Output: tenk1.two, tenk1.four, tenk1.two Group Key: tenk1.two, tenk1.four, tenk1.two + Buckets: 8 -> Seq Scan on public.tenk1 Output: tenk1.two, tenk1.four, tenk1.two -(7 rows) +(8 rows) SELECT count(*) FROM (SELECT DISTINCT two, four, two FROM tenk1) ss; diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out index 96dfb7c..2b8a253 100644 --- a/src/test/regress/expected/select_parallel.out +++ b/src/test/regress/expected/select_parallel.out @@ -226,12 +226,14 @@ explain (costs off) --------------------------------------------------- Finalize HashAggregate Group Key: (length((stringu1)::text)) + Buckets: 1024 -> Gather Workers Planned: 4 -> Partial HashAggregate Group Key: length((stringu1)::text) + Buckets: 1024 -> Parallel Seq Scan on tenk1 -(7 rows) +(9 rows) select length(stringu1) from tenk1 group by length(stringu1); length @@ -247,12 +249,14 @@ explain (costs off) Sort Key: stringu1 -> Finalize HashAggregate Group Key: stringu1 + Buckets: 1024 -> Gather Workers Planned: 4 -> Partial HashAggregate Group Key: stringu1 + Buckets: 1024 -> Parallel Seq Scan on tenk1 -(9 rows) +(11 rows) -- test that parallel plan for aggregates is not selected when -- target list contains parallel restricted clause. @@ -263,10 +267,11 @@ explain (costs off) ------------------------------------------------------------------- HashAggregate Group Key: sp_parallel_restricted(unique1) + Buckets: 16384 -> Gather Workers Planned: 4 -> Parallel Index Only Scan using tenk1_unique1 on tenk1 -(5 rows) +(6 rows) -- test prepared statement prepare tenk1_count(integer) As select count((unique1)) from tenk1 where hundred > $1; diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out index 71a677b..ec2e599 100644 --- a/src/test/regress/expected/subselect.out +++ b/src/test/regress/expected/subselect.out @@ -1007,9 +1007,10 @@ select * from int4_tbl o where (f1, f1) in -> HashAggregate Output: i.f1 Group Key: i.f1 + Buckets: 8 -> Seq Scan on public.int4_tbl i Output: i.f1 -(19 rows) +(20 rows) select * from int4_tbl o where (f1, f1) in (select f1, generate_series(1,50) / 10 g from int4_tbl i group by f1); diff --git a/src/test/regress/expected/tablesample.out b/src/test/regress/expected/tablesample.out index 078358d..fc41a81 100644 --- a/src/test/regress/expected/tablesample.out +++ b/src/test/regress/expected/tablesample.out @@ -255,11 +255,12 @@ select pct, count(unique1) from -------------------------------------------------------- HashAggregate Group Key: "*VALUES*".column1 + Buckets: 2 -> Nested Loop -> Values Scan on "*VALUES*" -> Sample Scan on tenk1 Sampling: bernoulli ("*VALUES*".column1) -(6 rows) +(7 rows) select pct, count(unique1) from (values (0),(100)) v(pct), diff --git a/src/test/regress/expected/union.out b/src/test/regress/expected/union.out index 6e72e92..2153974 100644 --- a/src/test/regress/expected/union.out +++ b/src/test/regress/expected/union.out @@ -355,12 +355,13 @@ select count(*) from Aggregate -> Subquery Scan on ss -> HashSetOp Intersect + Buckets: 8192 -> Append -> Subquery Scan on "*SELECT* 2" -> Seq Scan on tenk1 -> Subquery Scan on "*SELECT* 1" -> Index Only Scan using tenk1_unique1 on tenk1 tenk1_1 -(8 rows) +(9 rows) select count(*) from ( select unique1 from tenk1 intersect select fivethous from tenk1 ) ss; @@ -374,13 +375,14 @@ select unique1 from tenk1 except select unique2 from tenk1 where unique2 != 10; QUERY PLAN ------------------------------------------------------------------------ HashSetOp Except + Buckets: 16384 -> Append -> Subquery Scan on "*SELECT* 1" -> Index Only Scan using tenk1_unique1 on tenk1 -> Subquery Scan on "*SELECT* 2" -> Index Only Scan using tenk1_unique2 on tenk1 tenk1_1 Filter: (unique2 <> 10) -(7 rows) +(8 rows) select unique1 from tenk1 except select unique2 from tenk1 where unique2 != 10; unique1 @@ -585,12 +587,13 @@ select from generate_series(1,5) intersect select from generate_series(1,3); QUERY PLAN ---------------------------------------------------------------------- HashSetOp Intersect + Buckets: 2 -> Append -> Subquery Scan on "*SELECT* 1" -> Function Scan on generate_series -> Subquery Scan on "*SELECT* 2" -> Function Scan on generate_series generate_series_1 -(6 rows) +(7 rows) select from generate_series(1,5) union select from generate_series(1,3); -- @@ -726,12 +729,13 @@ explain (costs off) --------------------------------------------------- HashAggregate Group Key: ((t1.a || t1.b)) + Buckets: 8 -> Append -> Index Scan using t1_ab_idx on t1 Index Cond: ((a || b) = 'ab'::text) -> Index Only Scan using t2_pkey on t2 Index Cond: (ab = 'ab'::text) -(7 rows) +(8 rows) -- -- Test that ORDER BY for UNION ALL can be pushed down to inheritance @@ -864,11 +868,12 @@ ORDER BY x; Filter: (ss.x < 4) -> HashAggregate Group Key: (1), (generate_series(1, 10)) + Buckets: 16 -> Append -> ProjectSet -> Result -> Result -(10 rows) +(11 rows) SELECT * FROM (SELECT 1 AS t, generate_series(1,10) AS x diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out index d5fd404..ea34daf 100644 --- a/src/test/regress/expected/window.out +++ b/src/test/regress/expected/window.out @@ -624,8 +624,9 @@ select first_value(max(x)) over (), y WindowAgg -> HashAggregate Group Key: (tenk1.ten + tenk1.four) + Buckets: 64 -> Seq Scan on tenk1 -(4 rows) +(5 rows) -- test non-default frame specifications SELECT four, ten, diff --git a/src/test/regress/expected/write_parallel.out b/src/test/regress/expected/write_parallel.out index 0c4da25..25193a8 100644 --- a/src/test/regress/expected/write_parallel.out +++ b/src/test/regress/expected/write_parallel.out @@ -19,12 +19,14 @@ explain (costs off) create table parallel_write as --------------------------------------------------- Finalize HashAggregate Group Key: (length((stringu1)::text)) + Buckets: 1024 -> Gather Workers Planned: 4 -> Partial HashAggregate Group Key: length((stringu1)::text) + Buckets: 1024 -> Parallel Seq Scan on tenk1 -(7 rows) +(9 rows) create table parallel_write as select length(stringu1) from tenk1 group by length(stringu1); @@ -35,12 +37,14 @@ explain (costs off) select length(stringu1) into parallel_write --------------------------------------------------- Finalize HashAggregate Group Key: (length((stringu1)::text)) + Buckets: 1024 -> Gather Workers Planned: 4 -> Partial HashAggregate Group Key: length((stringu1)::text) + Buckets: 1024 -> Parallel Seq Scan on tenk1 -(7 rows) +(9 rows) select length(stringu1) into parallel_write from tenk1 group by length(stringu1); @@ -51,12 +55,14 @@ explain (costs off) create materialized view parallel_mat_view as --------------------------------------------------- Finalize HashAggregate Group Key: (length((stringu1)::text)) + Buckets: 1024 -> Gather Workers Planned: 4 -> Partial HashAggregate Group Key: length((stringu1)::text) + Buckets: 1024 -> Parallel Seq Scan on tenk1 -(7 rows) +(9 rows) create materialized view parallel_mat_view as select length(stringu1) from tenk1 group by length(stringu1); @@ -67,12 +73,14 @@ explain (costs off) create table parallel_write as execute prep_stmt; --------------------------------------------------- Finalize HashAggregate Group Key: (length((stringu1)::text)) + Buckets: 1024 -> Gather Workers Planned: 4 -> Partial HashAggregate Group Key: length((stringu1)::text) + Buckets: 1024 -> Parallel Seq Scan on tenk1 -(7 rows) +(9 rows) create table parallel_write as execute prep_stmt; drop table parallel_write; -- 2.7.4