From ebd479bf746c8ce38e7be8d323e2b4240cb035ab Mon Sep 17 00:00:00 2001 From: sandeep Date: Mon, 9 Aug 2021 11:57:19 +0530 Subject: [PATCH] [I44IY2] rename aggregation to HashAggregation --- ...etAndGroupSameSortIsMore.sort_agg.plan.txt | 4 +- .../BucketGroupAreDifferent.sort_agg.plan.txt | 4 +- .../ColNameEndWithInt.sort_agg.plan.txt | 4 +- .../groupsAreMoreThanBucket.sort_agg.plan.txt | 4 +- .../queries/q_InnerJoin.sort_agg.plan.txt | 4 +- ...erJoinGroupLessCriterias.sort_agg.plan.txt | 4 +- ...q_InnerJoinLessCriterias.sort_agg.plan.txt | 4 +- .../q_InnerJoinWrongOrder.sort_agg.plan.txt | 4 +- .../q_Inner_LeftJoin.sort_agg.plan.txt | 4 +- .../q_PartitionBucketCount1.sort_agg.plan.txt | 4 +- ...q_PartitionBucketCount32.sort_agg.plan.txt | 4 +- ...ketAndSortDifferentOrder.sort_agg.plan.txt | 4 +- .../q_groupByHavingMore.sort_agg.plan.txt | 4 +- .../queries/q_leftJoin.sort_agg.plan.txt | 4 +- .../queries/q_rightjoin.sort_agg.plan.txt | 4 +- .../q_rightjoin_wrong_order.sort_agg.plan.txt | 4 +- ...ort_groupby_notsameOrder.sort_agg.plan.txt | 4 +- ...rt_groupby_notsameOrder1.sort_agg.plan.txt | 4 +- .../planner/AbstractCostBasedPlanTest.java | 4 +- .../sql/presto/tpcds/q01.cte.plan.txt | 14 ++-- .../resources/sql/presto/tpcds/q01.plan.txt | 14 ++-- .../sql/presto/tpcds/q01.push.plan.txt | 14 ++-- .../sql/presto/tpcds/q01.reuse.plan.txt | 14 ++-- .../sql/presto/tpcds/q02.cte.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q02.plan.txt | 8 +-- .../sql/presto/tpcds/q02.push.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q03.plan.txt | 4 +- .../sql/presto/tpcds/q03.push.plan.txt | 4 +- .../sql/presto/tpcds/q04.cte.plan.txt | 48 +++++++------- .../resources/sql/presto/tpcds/q04.plan.txt | 48 +++++++------- .../sql/presto/tpcds/q04.push.plan.txt | 48 +++++++------- .../sql/presto/tpcds/q04.reuse.plan.txt | 48 +++++++------- .../resources/sql/presto/tpcds/q05.plan.txt | 16 ++--- .../sql/presto/tpcds/q05.push.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q06.plan.txt | 14 ++-- .../sql/presto/tpcds/q06.push.plan.txt | 14 ++-- .../resources/sql/presto/tpcds/q07.plan.txt | 4 +- .../sql/presto/tpcds/q07.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q08.plan.txt | 14 ++-- .../sql/presto/tpcds/q08.push.plan.txt | 14 ++-- .../resources/sql/presto/tpcds/q09.plan.txt | 60 ++++++++--------- .../sql/presto/tpcds/q09.push.plan.txt | 60 ++++++++--------- .../resources/sql/presto/tpcds/q10.plan.txt | 16 ++--- .../sql/presto/tpcds/q10.push.plan.txt | 16 ++--- .../sql/presto/tpcds/q11.cte.plan.txt | 24 +++---- .../resources/sql/presto/tpcds/q11.plan.txt | 24 +++---- .../sql/presto/tpcds/q11.push.plan.txt | 24 +++---- .../sql/presto/tpcds/q11.reuse.plan.txt | 24 +++---- .../resources/sql/presto/tpcds/q12.plan.txt | 4 +- .../sql/presto/tpcds/q12.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q13.plan.txt | 4 +- .../sql/presto/tpcds/q13.push.plan.txt | 4 +- .../sql/presto/tpcds/q14_1.cte.plan.txt | 64 +++++++++---------- .../resources/sql/presto/tpcds/q14_1.plan.txt | 64 +++++++++---------- .../sql/presto/tpcds/q14_1.push.plan.txt | 64 +++++++++---------- .../sql/presto/tpcds/q14_2.cte.plan.txt | 40 ++++++------ .../resources/sql/presto/tpcds/q14_2.plan.txt | 40 ++++++------ .../sql/presto/tpcds/q14_2.push.plan.txt | 40 ++++++------ .../resources/sql/presto/tpcds/q15.plan.txt | 4 +- .../sql/presto/tpcds/q15.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q16.plan.txt | 12 ++-- .../sql/presto/tpcds/q16.push.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q17.plan.txt | 4 +- .../sql/presto/tpcds/q17.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q18.plan.txt | 4 +- .../sql/presto/tpcds/q18.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q19.plan.txt | 4 +- .../sql/presto/tpcds/q19.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q20.plan.txt | 4 +- .../sql/presto/tpcds/q20.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q21.plan.txt | 4 +- .../sql/presto/tpcds/q21.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q22.plan.txt | 4 +- .../sql/presto/tpcds/q22.push.plan.txt | 4 +- .../sql/presto/tpcds/q23_1.cte.plan.txt | 38 +++++------ .../resources/sql/presto/tpcds/q23_1.plan.txt | 38 +++++------ .../sql/presto/tpcds/q23_1.push.plan.txt | 38 +++++------ .../sql/presto/tpcds/q23_2.cte.plan.txt | 40 ++++++------ .../resources/sql/presto/tpcds/q23_2.plan.txt | 40 ++++++------ .../sql/presto/tpcds/q23_2.push.plan.txt | 40 ++++++------ .../sql/presto/tpcds/q24_1.cte.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q24_1.plan.txt | 16 ++--- .../sql/presto/tpcds/q24_1.push.plan.txt | 16 ++--- .../sql/presto/tpcds/q24_1.reuse.plan.txt | 16 ++--- .../sql/presto/tpcds/q24_2.cte.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q24_2.plan.txt | 16 ++--- .../sql/presto/tpcds/q24_2.push.plan.txt | 16 ++--- .../sql/presto/tpcds/q24_2.reuse.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q25.plan.txt | 4 +- .../sql/presto/tpcds/q25.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q26.plan.txt | 4 +- .../sql/presto/tpcds/q26.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q27.plan.txt | 4 +- .../sql/presto/tpcds/q27.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q28.plan.txt | 24 +++---- .../sql/presto/tpcds/q28.push.plan.txt | 24 +++---- .../resources/sql/presto/tpcds/q29.plan.txt | 4 +- .../sql/presto/tpcds/q29.push.plan.txt | 4 +- .../sql/presto/tpcds/q30.cte.plan.txt | 14 ++-- .../resources/sql/presto/tpcds/q30.plan.txt | 14 ++-- .../sql/presto/tpcds/q30.push.plan.txt | 14 ++-- .../sql/presto/tpcds/q30.reuse.plan.txt | 14 ++-- .../sql/presto/tpcds/q31.cte.plan.txt | 24 +++---- .../resources/sql/presto/tpcds/q31.plan.txt | 24 +++---- .../sql/presto/tpcds/q31.push.plan.txt | 24 +++---- .../resources/sql/presto/tpcds/q32.plan.txt | 10 +-- .../sql/presto/tpcds/q32.push.plan.txt | 10 +-- .../resources/sql/presto/tpcds/q33.plan.txt | 20 +++--- .../sql/presto/tpcds/q33.push.plan.txt | 20 +++--- .../sql/presto/tpcds/q33.reuse.plan.txt | 20 +++--- .../resources/sql/presto/tpcds/q34.plan.txt | 4 +- .../sql/presto/tpcds/q34.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q35.plan.txt | 16 ++--- .../sql/presto/tpcds/q35.push.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q36.plan.txt | 4 +- .../sql/presto/tpcds/q36.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q37.plan.txt | 4 +- .../sql/presto/tpcds/q37.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q38.plan.txt | 24 +++---- .../sql/presto/tpcds/q38.push.plan.txt | 24 +++---- .../sql/presto/tpcds/q39_1.cte.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q39_1.plan.txt | 8 +-- .../sql/presto/tpcds/q39_1.push.plan.txt | 8 +-- .../sql/presto/tpcds/q39_2.cte.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q39_2.plan.txt | 8 +-- .../sql/presto/tpcds/q39_2.push.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q40.plan.txt | 4 +- .../sql/presto/tpcds/q40.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q41.plan.txt | 10 +-- .../sql/presto/tpcds/q41.push.plan.txt | 10 +-- .../resources/sql/presto/tpcds/q42.plan.txt | 4 +- .../sql/presto/tpcds/q42.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q43.plan.txt | 4 +- .../sql/presto/tpcds/q43.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q44.plan.txt | 16 ++--- .../sql/presto/tpcds/q44.push.plan.txt | 16 ++--- .../sql/presto/tpcds/q44.reuse.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q45.plan.txt | 4 +- .../sql/presto/tpcds/q45.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q46.plan.txt | 4 +- .../sql/presto/tpcds/q46.push.plan.txt | 4 +- .../sql/presto/tpcds/q47.cte.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q47.plan.txt | 12 ++-- .../sql/presto/tpcds/q47.push.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q48.plan.txt | 4 +- .../sql/presto/tpcds/q48.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q49.plan.txt | 20 +++--- .../sql/presto/tpcds/q49.push.plan.txt | 20 +++--- .../resources/sql/presto/tpcds/q50.plan.txt | 4 +- .../sql/presto/tpcds/q50.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q51.plan.txt | 8 +-- .../sql/presto/tpcds/q51.push.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q52.plan.txt | 4 +- .../sql/presto/tpcds/q52.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q53.plan.txt | 4 +- .../sql/presto/tpcds/q53.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q54.plan.txt | 20 +++--- .../sql/presto/tpcds/q54.push.plan.txt | 20 +++--- .../resources/sql/presto/tpcds/q55.plan.txt | 4 +- .../sql/presto/tpcds/q55.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q56.plan.txt | 20 +++--- .../sql/presto/tpcds/q56.push.plan.txt | 20 +++--- .../sql/presto/tpcds/q56.reuse.plan.txt | 20 +++--- .../sql/presto/tpcds/q57.cte.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q57.plan.txt | 12 ++-- .../sql/presto/tpcds/q57.push.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q58.plan.txt | 12 ++-- .../sql/presto/tpcds/q58.push.plan.txt | 12 ++-- .../sql/presto/tpcds/q58.reuse.plan.txt | 12 ++-- .../sql/presto/tpcds/q59.cte.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q59.plan.txt | 8 +-- .../sql/presto/tpcds/q59.push.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q60.plan.txt | 20 +++--- .../sql/presto/tpcds/q60.push.plan.txt | 20 +++--- .../sql/presto/tpcds/q60.reuse.plan.txt | 20 +++--- .../resources/sql/presto/tpcds/q61.plan.txt | 8 +-- .../sql/presto/tpcds/q61.push.plan.txt | 8 +-- .../sql/presto/tpcds/q61.reuse.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q62.plan.txt | 4 +- .../sql/presto/tpcds/q62.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q63.plan.txt | 4 +- .../sql/presto/tpcds/q63.push.plan.txt | 4 +- .../sql/presto/tpcds/q64.cte.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q64.plan.txt | 16 ++--- .../sql/presto/tpcds/q64.push.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q65.plan.txt | 12 ++-- .../sql/presto/tpcds/q65.push.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q66.plan.txt | 14 ++-- .../sql/presto/tpcds/q66.push.plan.txt | 14 ++-- .../sql/presto/tpcds/q66.reuse.plan.txt | 14 ++-- .../resources/sql/presto/tpcds/q67.plan.txt | 4 +- .../sql/presto/tpcds/q67.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q68.plan.txt | 4 +- .../sql/presto/tpcds/q68.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q69.plan.txt | 16 ++--- .../sql/presto/tpcds/q69.push.plan.txt | 16 ++--- .../resources/sql/presto/tpcds/q70.plan.txt | 8 +-- .../sql/presto/tpcds/q70.push.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q71.plan.txt | 4 +- .../sql/presto/tpcds/q71.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q72.plan.txt | 4 +- .../sql/presto/tpcds/q72.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q73.plan.txt | 4 +- .../sql/presto/tpcds/q73.push.plan.txt | 4 +- .../sql/presto/tpcds/q74.cte.plan.txt | 24 +++---- .../resources/sql/presto/tpcds/q74.plan.txt | 24 +++---- .../sql/presto/tpcds/q74.push.plan.txt | 24 +++---- .../sql/presto/tpcds/q74.reuse.plan.txt | 24 +++---- .../sql/presto/tpcds/q75.cte.plan.txt | 20 +++--- .../resources/sql/presto/tpcds/q75.plan.txt | 20 +++--- .../sql/presto/tpcds/q75.push.plan.txt | 20 +++--- .../sql/presto/tpcds/q75.reuse.plan.txt | 20 +++--- .../resources/sql/presto/tpcds/q76.plan.txt | 8 +-- .../sql/presto/tpcds/q76.push.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q77.plan.txt | 28 ++++---- .../sql/presto/tpcds/q77.push.plan.txt | 28 ++++---- .../resources/sql/presto/tpcds/q78.plan.txt | 12 ++-- .../sql/presto/tpcds/q78.push.plan.txt | 12 ++-- .../sql/presto/tpcds/q78.reuse.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q79.plan.txt | 4 +- .../sql/presto/tpcds/q79.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q80.plan.txt | 16 ++--- .../sql/presto/tpcds/q80.push.plan.txt | 16 ++--- .../sql/presto/tpcds/q80.reuse.plan.txt | 16 ++--- .../sql/presto/tpcds/q81.cte.plan.txt | 14 ++-- .../resources/sql/presto/tpcds/q81.plan.txt | 14 ++-- .../sql/presto/tpcds/q81.push.plan.txt | 14 ++-- .../sql/presto/tpcds/q81.reuse.plan.txt | 14 ++-- .../resources/sql/presto/tpcds/q82.plan.txt | 4 +- .../sql/presto/tpcds/q82.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q83.plan.txt | 12 ++-- .../sql/presto/tpcds/q83.push.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q85.plan.txt | 4 +- .../sql/presto/tpcds/q85.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q86.plan.txt | 4 +- .../sql/presto/tpcds/q86.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q87.plan.txt | 24 +++---- .../sql/presto/tpcds/q87.push.plan.txt | 24 +++---- .../resources/sql/presto/tpcds/q88.plan.txt | 32 +++++----- .../sql/presto/tpcds/q88.push.plan.txt | 32 +++++----- .../sql/presto/tpcds/q88.reuse.plan.txt | 32 +++++----- .../resources/sql/presto/tpcds/q89.plan.txt | 4 +- .../sql/presto/tpcds/q89.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q90.plan.txt | 8 +-- .../sql/presto/tpcds/q90.push.plan.txt | 8 +-- .../sql/presto/tpcds/q90.reuse.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q91.plan.txt | 4 +- .../sql/presto/tpcds/q91.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q92.plan.txt | 10 +-- .../sql/presto/tpcds/q92.push.plan.txt | 10 +-- .../resources/sql/presto/tpcds/q93.plan.txt | 4 +- .../sql/presto/tpcds/q93.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q94.plan.txt | 12 ++-- .../sql/presto/tpcds/q94.push.plan.txt | 12 ++-- .../sql/presto/tpcds/q95.cte.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q95.plan.txt | 8 +-- .../sql/presto/tpcds/q95.push.plan.txt | 8 +-- .../resources/sql/presto/tpcds/q96.plan.txt | 4 +- .../sql/presto/tpcds/q96.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q97.plan.txt | 12 ++-- .../sql/presto/tpcds/q97.push.plan.txt | 12 ++-- .../resources/sql/presto/tpcds/q98.plan.txt | 4 +- .../sql/presto/tpcds/q98.push.plan.txt | 4 +- .../resources/sql/presto/tpcds/q99.plan.txt | 4 +- .../sql/presto/tpcds/q99.push.plan.txt | 4 +- .../resources/sql/presto/tpch/q01.plan.txt | 4 +- .../resources/sql/presto/tpch/q02.plan.txt | 6 +- .../resources/sql/presto/tpch/q03.plan.txt | 4 +- .../resources/sql/presto/tpch/q04.plan.txt | 8 +-- .../resources/sql/presto/tpch/q05.plan.txt | 4 +- .../resources/sql/presto/tpch/q06.plan.txt | 4 +- .../resources/sql/presto/tpch/q07.plan.txt | 4 +- .../resources/sql/presto/tpch/q08.plan.txt | 4 +- .../resources/sql/presto/tpch/q09.plan.txt | 4 +- .../resources/sql/presto/tpch/q10.plan.txt | 4 +- .../resources/sql/presto/tpch/q11.plan.txt | 8 +-- .../resources/sql/presto/tpch/q12.plan.txt | 4 +- .../resources/sql/presto/tpch/q13.plan.txt | 8 +-- .../resources/sql/presto/tpch/q14.plan.txt | 4 +- .../resources/sql/presto/tpch/q15.plan.txt | 12 ++-- .../resources/sql/presto/tpch/q16.plan.txt | 8 +-- .../resources/sql/presto/tpch/q17_1.plan.txt | 10 +-- .../resources/sql/presto/tpch/q17_2.plan.txt | 8 +-- .../resources/sql/presto/tpch/q18.plan.txt | 8 +-- .../resources/sql/presto/tpch/q19.plan.txt | 4 +- .../resources/sql/presto/tpch/q20.plan.txt | 6 +- .../resources/sql/presto/tpch/q21.plan.txt | 10 +-- .../resources/sql/presto/tpch/q22.plan.txt | 12 ++-- .../sql/planner/planprinter/PlanPrinter.java | 2 +- 289 files changed, 1775 insertions(+), 1775 deletions(-) diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/BucketAndGroupSameSortIsMore.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/BucketAndGroupSameSortIsMore.sort_agg.plan.txt index 36b60cecd..b505b0116 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/BucketAndGroupSameSortIsMore.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/BucketAndGroupSameSortIsMore.sort_agg.plan.txt @@ -1,5 +1,5 @@ remote exchange (GATHER, SINGLE, []) - final SortAggregate over (ss_item_sk) + final sortaggregate over (ss_item_sk) local exchange (GATHER, SINGLE, []) - partial SortAggregate over (ss_item_sk) + partial sortaggregate over (ss_item_sk) scan store_sales_item_customer_solddate_buckarr1_buckcount4 diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/BucketGroupAreDifferent.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/BucketGroupAreDifferent.sort_agg.plan.txt index c295017d9..c085ea8d6 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/BucketGroupAreDifferent.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/BucketGroupAreDifferent.sort_agg.plan.txt @@ -1,5 +1,5 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk, ss_item_sk) + final hashaggregation over (ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk, ss_item_sk) + partial hashaggregation over (ss_customer_sk, ss_item_sk) scan store_sales_item_customer_solddate_buckarr1_buckcount4 diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/ColNameEndWithInt.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/ColNameEndWithInt.sort_agg.plan.txt index d1794ac08..ed7dbb6fc 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/ColNameEndWithInt.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/ColNameEndWithInt.sort_agg.plan.txt @@ -1,6 +1,6 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (data_1) + final hashaggregation over (data_1) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["data_1"]) - partial aggregation over (data_1) + partial hashaggregation over (data_1) scan sortwithcolnameendwithint diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/groupsAreMoreThanBucket.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/groupsAreMoreThanBucket.sort_agg.plan.txt index 46f2e73c0..2aaa47403 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/groupsAreMoreThanBucket.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/groupsAreMoreThanBucket.sort_agg.plan.txt @@ -1,5 +1,5 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + final hashaggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + partial hashaggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) scan store_sales_item_customer_solddate_buckarr2_buckcount3 diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoin.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoin.sort_agg.plan.txt index dc03f4279..825fb036f 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoin.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoin.sort_agg.plan.txt @@ -1,7 +1,7 @@ remote exchange (GATHER, SINGLE, []) - final SortAggregate over (ss_customer_sk, ss_item_sk) + final sortaggregate over (ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) - partial SortAggregate over (ss_customer_sk, ss_item_sk) + partial sortaggregate over (ss_customer_sk, ss_item_sk) join (INNER, PARTITIONED): scan store_sales_customer_item local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinGroupLessCriterias.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinGroupLessCriterias.sort_agg.plan.txt index b008912eb..3499f7ebd 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinGroupLessCriterias.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinGroupLessCriterias.sort_agg.plan.txt @@ -1,7 +1,7 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk, ss_item_sk) + final hashaggregation over (ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk, ss_item_sk) + partial hashaggregation over (ss_customer_sk, ss_item_sk) join (LEFT, PARTITIONED): scan store_sales_item_customer_solddate local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinLessCriterias.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinLessCriterias.sort_agg.plan.txt index 05dce0faa..78debe76d 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinLessCriterias.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinLessCriterias.sort_agg.plan.txt @@ -1,7 +1,7 @@ remote exchange (GATHER, SINGLE, []) - final SortAggregate over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + final sortaggregate over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) local exchange (GATHER, SINGLE, []) - partial SortAggregate over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + partial sortaggregate over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) join (LEFT, PARTITIONED): scan store_sales_item_customer_solddate local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinWrongOrder.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinWrongOrder.sort_agg.plan.txt index 937f7e1ff..7921dbd80 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinWrongOrder.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_InnerJoinWrongOrder.sort_agg.plan.txt @@ -1,7 +1,7 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + final hashaggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + partial hashaggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) join (LEFT, PARTITIONED): scan store_sales_item_customer_solddate local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_Inner_LeftJoin.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_Inner_LeftJoin.sort_agg.plan.txt index 7f94c1871..cb4711b13 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_Inner_LeftJoin.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_Inner_LeftJoin.sort_agg.plan.txt @@ -1,9 +1,9 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final SortAggregate over (ss_customer_sk, ss_item_sk) + final sortaggregate over (ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) - partial SortAggregate over (ss_customer_sk, ss_item_sk) + partial sortaggregate over (ss_customer_sk, ss_item_sk) join (LEFT, REPLICATED): join (INNER, REPLICATED): scan store_sales_item_customer diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_PartitionBucketCount1.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_PartitionBucketCount1.sort_agg.plan.txt index b2d68c4a9..a9fdf28fe 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_PartitionBucketCount1.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_PartitionBucketCount1.sort_agg.plan.txt @@ -1,5 +1,5 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (wr_return_quantity) + final hashaggregation over (wr_return_quantity) local exchange (GATHER, SINGLE, []) - partial aggregation over (wr_return_quantity) + partial hashaggregation over (wr_return_quantity) scan web_returns_partition_bucketcount1 diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_PartitionBucketCount32.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_PartitionBucketCount32.sort_agg.plan.txt index 55d34aa1c..a835aa393 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_PartitionBucketCount32.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_PartitionBucketCount32.sort_agg.plan.txt @@ -1,5 +1,5 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (wr_return_quantity) + final hashaggregation over (wr_return_quantity) local exchange (GATHER, SINGLE, []) - partial aggregation over (wr_return_quantity) + partial hashaggregation over (wr_return_quantity) scan web_returns_partition_bucketcount32 diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_bucketAndSortDifferentOrder.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_bucketAndSortDifferentOrder.sort_agg.plan.txt index 889ed0f47..f59128c67 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_bucketAndSortDifferentOrder.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_bucketAndSortDifferentOrder.sort_agg.plan.txt @@ -1,5 +1,5 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + final hashaggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + partial hashaggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) scan store_sales_item_customer_solddate_buckarr2_buckcount1_wrngorder diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_groupByHavingMore.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_groupByHavingMore.sort_agg.plan.txt index 78d9d0cb5..393b58db1 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_groupByHavingMore.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_groupByHavingMore.sort_agg.plan.txt @@ -1,5 +1,5 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + final hashaggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) + partial hashaggregation over (ss_customer_sk, ss_item_sk, ss_sold_date_sk) scan store_sales_customer_item diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_leftJoin.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_leftJoin.sort_agg.plan.txt index 65cb9e643..3a96464a5 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_leftJoin.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_leftJoin.sort_agg.plan.txt @@ -1,7 +1,7 @@ remote exchange (GATHER, SINGLE, []) - final SortAggregate over (ss_customer_sk, ss_item_sk) + final sortaggregate over (ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) - partial SortAggregate over (ss_customer_sk, ss_item_sk) + partial sortaggregate over (ss_customer_sk, ss_item_sk) join (LEFT, PARTITIONED): scan store_sales_customer_item local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_rightjoin.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_rightjoin.sort_agg.plan.txt index 8c4d1d87a..821babb2a 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_rightjoin.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_rightjoin.sort_agg.plan.txt @@ -1,8 +1,8 @@ remote exchange (GATHER, SINGLE, []) - final SortAggregate over (ss_customer_sk, ss_item_sk) + final sortaggregate over (ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"]) - partial SortAggregate over (ss_customer_sk, ss_item_sk) + partial sortaggregate over (ss_customer_sk, ss_item_sk) join (RIGHT, PARTITIONED): scan store_sales_customer_item local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_rightjoin_wrong_order.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_rightjoin_wrong_order.sort_agg.plan.txt index 476fa5f70..f5a3121e5 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_rightjoin_wrong_order.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_rightjoin_wrong_order.sort_agg.plan.txt @@ -1,7 +1,7 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (sr_customer_sk, sr_item_sk) + final hashaggregation over (sr_customer_sk, sr_item_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (sr_customer_sk, sr_item_sk) + partial hashaggregation over (sr_customer_sk, sr_item_sk) join (RIGHT, PARTITIONED): scan store_sales_customer_item local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_sort_groupby_notsameOrder.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_sort_groupby_notsameOrder.sort_agg.plan.txt index d203c7793..4b0fbbd04 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_sort_groupby_notsameOrder.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_sort_groupby_notsameOrder.sort_agg.plan.txt @@ -1,6 +1,6 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_item_sk) + final hashaggregation over (ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - partial aggregation over (ss_item_sk) + partial hashaggregation over (ss_item_sk) scan store_sales_customer_item diff --git a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_sort_groupby_notsameOrder1.sort_agg.plan.txt b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_sort_groupby_notsameOrder1.sort_agg.plan.txt index c22559715..924a9fb7c 100644 --- a/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_sort_groupby_notsameOrder1.sort_agg.plan.txt +++ b/presto-benchto-benchmarks/src/main/resources/sql/presto/queries/q_sort_groupby_notsameOrder1.sort_agg.plan.txt @@ -1,6 +1,6 @@ remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk, ss_sold_date_sk) + final hashaggregation over (ss_customer_sk, ss_sold_date_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_sold_date_sk"]) - partial aggregation over (ss_customer_sk, ss_sold_date_sk) + partial hashaggregation over (ss_customer_sk, ss_sold_date_sk) scan store_sales_item_customer_solddate diff --git a/presto-benchto-benchmarks/src/test/java/io/prestosql/sql/planner/AbstractCostBasedPlanTest.java b/presto-benchto-benchmarks/src/test/java/io/prestosql/sql/planner/AbstractCostBasedPlanTest.java index 716cfb8c0..5b42dbcc9 100644 --- a/presto-benchto-benchmarks/src/test/java/io/prestosql/sql/planner/AbstractCostBasedPlanTest.java +++ b/presto-benchto-benchmarks/src/test/java/io/prestosql/sql/planner/AbstractCostBasedPlanTest.java @@ -245,7 +245,7 @@ public abstract class AbstractCostBasedPlanTest if (node.getAggregationType().equals(AggregationNode.AggregationType.SORT_BASED)) { output( indent, - "%s SortAggregate over (%s)", + "%s sortaggregate over (%s)", node.getStep().name().toLowerCase(ENGLISH), node.getGroupingKeys().stream() .map(Object::toString) @@ -255,7 +255,7 @@ public abstract class AbstractCostBasedPlanTest else { output( indent, - "%s aggregation over (%s)", + "%s hashaggregation over (%s)", node.getStep().name().toLowerCase(ENGLISH), node.getGroupingKeys().stream() .map(Object::toString) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.cte.plan.txt index 59e414142..01dc2270a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.cte.plan.txt @@ -12,10 +12,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, REPLICATED): remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk", "sum"]) cte customer_total_return - final aggregation over (sr_customer_sk, sr_store_sk) + final hashaggregation over (sr_customer_sk, sr_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"]) - partial aggregation over (sr_customer_sk, sr_store_sk) + partial hashaggregation over (sr_customer_sk, sr_store_sk) join (INNER, REPLICATED): Filter scan store_returns @@ -29,16 +29,16 @@ local exchange (GATHER, SINGLE, []) scan store local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (sr_store_sk_24) + final hashaggregation over (sr_store_sk_24) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_store_sk_24"]) - partial aggregation over (sr_store_sk_24) + partial hashaggregation over (sr_store_sk_24) remote exchange (REPARTITION, HASH, ["sr_customer_sk_20", "sr_store_sk_24", "sum_70"]) cte customer_total_return - final aggregation over (sr_customer_sk_20, sr_store_sk_24) + final hashaggregation over (sr_customer_sk_20, sr_store_sk_24) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk_20", "sr_store_sk_24"]) - partial aggregation over (sr_customer_sk_20, sr_store_sk_24) + partial hashaggregation over (sr_customer_sk_20, sr_store_sk_24) join (INNER, REPLICATED): Filter scan store_returns @@ -48,5 +48,5 @@ local exchange (GATHER, SINGLE, []) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.plan.txt index 89d5d56a4..a8f2333a1 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.plan.txt @@ -8,10 +8,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk"]) join (INNER, REPLICATED): - final aggregation over (sr_customer_sk, sr_store_sk) + final hashaggregation over (sr_customer_sk, sr_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"]) - partial aggregation over (sr_customer_sk, sr_store_sk) + partial hashaggregation over (sr_customer_sk, sr_store_sk) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -22,14 +22,14 @@ local exchange (GATHER, SINGLE, []) scan store local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (sr_store_sk_24) + final hashaggregation over (sr_store_sk_24) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_store_sk_24"]) - partial aggregation over (sr_store_sk_24) - final aggregation over (sr_customer_sk_20, sr_store_sk_24) + partial hashaggregation over (sr_store_sk_24) + final hashaggregation over (sr_customer_sk_20, sr_store_sk_24) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk_20", "sr_store_sk_24"]) - partial aggregation over (sr_customer_sk_20, sr_store_sk_24) + partial hashaggregation over (sr_customer_sk_20, sr_store_sk_24) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -37,5 +37,5 @@ local exchange (GATHER, SINGLE, []) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.push.plan.txt index 45b1ed9ac..3f2706e4e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.push.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_customer_sk"]) join (INNER, REPLICATED): - final aggregation over (sr_customer_sk, sr_store_sk) + final hashaggregation over (sr_customer_sk, sr_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"]) - partial aggregation over (sr_customer_sk, sr_store_sk) + partial hashaggregation over (sr_customer_sk, sr_store_sk) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -22,14 +22,14 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (sr_store_sk_27) + final hashaggregation over (sr_store_sk_27) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_store_sk_27"]) - partial aggregation over (sr_store_sk_27) - final aggregation over (sr_customer_sk_23, sr_store_sk_27) + partial hashaggregation over (sr_store_sk_27) + final hashaggregation over (sr_customer_sk_23, sr_store_sk_27) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk_23", "sr_store_sk_27"]) - partial aggregation over (sr_customer_sk_23, sr_store_sk_27) + partial hashaggregation over (sr_customer_sk_23, sr_store_sk_27) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -37,5 +37,5 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.reuse.plan.txt index 017117737..7c6074261 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q01.reuse.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_customer_sk"]) join (INNER, REPLICATED): - final aggregation over (sr_customer_sk, sr_store_sk) + final hashaggregation over (sr_customer_sk, sr_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"]) - partial aggregation over (sr_customer_sk, sr_store_sk) + partial hashaggregation over (sr_customer_sk, sr_store_sk) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -22,14 +22,14 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (sr_store_sk_27) + final hashaggregation over (sr_store_sk_27) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_store_sk_27"]) - partial aggregation over (sr_store_sk_27) - final aggregation over (sr_customer_sk_23, sr_store_sk_27) + partial hashaggregation over (sr_store_sk_27) + final hashaggregation over (sr_customer_sk_23, sr_store_sk_27) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_customer_sk_23", "sr_store_sk_27"]) - partial aggregation over (sr_customer_sk_23, sr_store_sk_27) + partial hashaggregation over (sr_customer_sk_23, sr_store_sk_27) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -37,5 +37,5 @@ local exchange (GATHER, SINGLE, []) ReuseTableScan date_dim (Producer) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.cte.plan.txt index 01e11ad70..47fb2917d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.cte.plan.txt @@ -6,10 +6,10 @@ remote exchange (GATHER, SINGLE, []) join (INNER, REPLICATED): remote exchange (REPARTITION, HASH, ["d_week_seq", "sum", "sum_33", "sum_34", "sum_35", "sum_36", "sum_37", "sum_38"]) cte wswscs - final aggregation over (d_week_seq) + final hashaggregation over (d_week_seq) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq"]) - partial aggregation over (d_week_seq) + partial hashaggregation over (d_week_seq) join (INNER, REPLICATED): remote exchange (REPARTITION, HASH, ["sales_price_18", "sold_date_sk_17"]) cte wscs @@ -31,10 +31,10 @@ remote exchange (GATHER, SINGLE, []) join (INNER, REPLICATED): remote exchange (REPARTITION, HASH, ["d_week_seq_232", "sum_265", "sum_266", "sum_267", "sum_268", "sum_269", "sum_270", "sum_271"]) cte wswscs - final aggregation over (d_week_seq_232) + final hashaggregation over (d_week_seq_232) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq_232"]) - partial aggregation over (d_week_seq_232) + partial hashaggregation over (d_week_seq_232) join (INNER, REPLICATED): remote exchange (REPARTITION, HASH, ["sales_price_221", "sold_date_sk_220"]) cte wscs diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.plan.txt index e387f7335..42e4cd457 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): join (INNER, PARTITIONED): - final aggregation over (d_week_seq) + final hashaggregation over (d_week_seq) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq"]) - partial aggregation over (d_week_seq) + partial hashaggregation over (d_week_seq) join (INNER, REPLICATED): remote exchange (REPARTITION, ROUND_ROBIN, []) scan web_sales @@ -20,10 +20,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["subtract"]) join (INNER, PARTITIONED): - final aggregation over (d_week_seq_232) + final hashaggregation over (d_week_seq_232) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq_232"]) - partial aggregation over (d_week_seq_232) + partial hashaggregation over (d_week_seq_232) join (INNER, REPLICATED): remote exchange (REPARTITION, ROUND_ROBIN, []) scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.push.plan.txt index e8751313c..548afd8b4 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q02.push.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): join (INNER, PARTITIONED): - final aggregation over (d_week_seq) + final hashaggregation over (d_week_seq) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq"]) - partial aggregation over (d_week_seq) + partial hashaggregation over (d_week_seq) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["d_date_sk"]) scan date_dim @@ -21,10 +21,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["subtract"]) join (INNER, PARTITIONED): - final aggregation over (d_week_seq_237) + final hashaggregation over (d_week_seq_237) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq_237"]) - partial aggregation over (d_week_seq_237) + partial hashaggregation over (d_week_seq_237) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["d_date_sk_233"]) scan date_dim diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q03.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q03.plan.txt index 70aae3fa1..b01884a68 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q03.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q03.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_year, i_brand, i_brand_id) + final hashaggregation over (d_year, i_brand, i_brand_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "i_brand", "i_brand_id"]) - partial aggregation over (d_year, i_brand, i_brand_id) + partial hashaggregation over (d_year, i_brand, i_brand_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q03.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q03.push.plan.txt index 338498826..4300587ce 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q03.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q03.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_year, i_brand, i_brand_id) + final hashaggregation over (d_year, i_brand, i_brand_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "i_brand", "i_brand_id"]) - partial aggregation over (d_year, i_brand, i_brand_id) + partial hashaggregation over (d_year, i_brand, i_brand_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["d_date_sk"]) scan date_dim (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.cte.plan.txt index 6a662f416..7f363e637 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.cte.plan.txt @@ -9,10 +9,10 @@ local exchange (GATHER, SINGLE, []) local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) Filter - final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + final hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country", "c_customer_id", "c_email_address", "c_first_name", "c_last_name", "c_login", "c_preferred_cust_flag", "d_year"]) - partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + partial hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -27,7 +27,7 @@ local exchange (GATHER, SINGLE, []) Filter scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_29"]) - single aggregation over (c_birth_country_42, c_customer_id_29, c_email_address_44, c_first_name_36, c_last_name_37, c_login_43, c_preferred_cust_flag_38, d_year_52) + single hashaggregation over (c_birth_country_42, c_customer_id_29, c_email_address_44, c_first_name_36, c_last_name_37, c_login_43, c_preferred_cust_flag_38, d_year_52) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -37,7 +37,7 @@ local exchange (GATHER, SINGLE, []) Filter values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_123"]) - single aggregation over (c_birth_country_136, c_customer_id_123, c_email_address_138, c_first_name_130, c_last_name_131, c_login_137, c_preferred_cust_flag_132, d_year_146) + single hashaggregation over (c_birth_country_136, c_customer_id_123, c_email_address_138, c_first_name_130, c_last_name_131, c_login_137, c_preferred_cust_flag_132, d_year_146) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -48,10 +48,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_247"]) - final aggregation over (c_birth_country_260, c_customer_id_247, c_email_address_262, c_first_name_254, c_last_name_255, c_login_261, c_preferred_cust_flag_256, d_year_293) + final hashaggregation over (c_birth_country_260, c_customer_id_247, c_email_address_262, c_first_name_254, c_last_name_255, c_login_261, c_preferred_cust_flag_256, d_year_293) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_260", "c_customer_id_247", "c_email_address_262", "c_first_name_254", "c_last_name_255", "c_login_261", "c_preferred_cust_flag_256", "d_year_293"]) - partial aggregation over (c_birth_country_260, c_customer_id_247, c_email_address_262, c_first_name_254, c_last_name_255, c_login_261, c_preferred_cust_flag_256, d_year_293) + partial hashaggregation over (c_birth_country_260, c_customer_id_247, c_email_address_262, c_first_name_254, c_last_name_255, c_login_261, c_preferred_cust_flag_256, d_year_293) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_267"]) join (INNER, REPLICATED): @@ -66,7 +66,7 @@ local exchange (GATHER, SINGLE, []) Filter scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_354"]) - single aggregation over (c_birth_country_367, c_customer_id_354, c_email_address_369, c_first_name_361, c_last_name_362, c_login_368, c_preferred_cust_flag_363, d_year_411) + single hashaggregation over (c_birth_country_367, c_customer_id_354, c_email_address_369, c_first_name_361, c_last_name_362, c_login_368, c_preferred_cust_flag_363, d_year_411) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -76,7 +76,7 @@ local exchange (GATHER, SINGLE, []) Filter values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_482"]) - single aggregation over (c_birth_country_495, c_customer_id_482, c_email_address_497, c_first_name_489, c_last_name_490, c_login_496, c_preferred_cust_flag_491, d_year_539) + single hashaggregation over (c_birth_country_495, c_customer_id_482, c_email_address_497, c_first_name_489, c_last_name_490, c_login_496, c_preferred_cust_flag_491, d_year_539) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -87,7 +87,7 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_640"]) - single aggregation over (c_birth_country_653, c_customer_id_640, c_email_address_655, c_first_name_647, c_last_name_648, c_login_654, c_preferred_cust_flag_649, d_year_686) + single hashaggregation over (c_birth_country_653, c_customer_id_640, c_email_address_655, c_first_name_647, c_last_name_648, c_login_654, c_preferred_cust_flag_649, d_year_686) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -98,10 +98,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_747"]) Filter - final aggregation over (c_birth_country_760, c_customer_id_747, c_email_address_762, c_first_name_754, c_last_name_755, c_login_761, c_preferred_cust_flag_756, d_year_804) + final hashaggregation over (c_birth_country_760, c_customer_id_747, c_email_address_762, c_first_name_754, c_last_name_755, c_login_761, c_preferred_cust_flag_756, d_year_804) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_760", "c_customer_id_747", "c_email_address_762", "c_first_name_754", "c_last_name_755", "c_login_761", "c_preferred_cust_flag_756", "d_year_804"]) - partial aggregation over (c_birth_country_760, c_customer_id_747, c_email_address_762, c_first_name_754, c_last_name_755, c_login_761, c_preferred_cust_flag_756, d_year_804) + partial hashaggregation over (c_birth_country_760, c_customer_id_747, c_email_address_762, c_first_name_754, c_last_name_755, c_login_761, c_preferred_cust_flag_756, d_year_804) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_767"]) join (INNER, REPLICATED): @@ -116,7 +116,7 @@ local exchange (GATHER, SINGLE, []) Filter scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_875"]) - single aggregation over (c_birth_country_888, c_customer_id_875, c_email_address_890, c_first_name_882, c_last_name_883, c_login_889, c_preferred_cust_flag_884, d_year_932) + single hashaggregation over (c_birth_country_888, c_customer_id_875, c_email_address_890, c_first_name_882, c_last_name_883, c_login_889, c_preferred_cust_flag_884, d_year_932) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -127,7 +127,7 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1033"]) - single aggregation over (c_birth_country_1046, c_customer_id_1033, c_email_address_1048, c_first_name_1040, c_last_name_1041, c_login_1047, c_preferred_cust_flag_1042, d_year_1079) + single hashaggregation over (c_birth_country_1046, c_customer_id_1033, c_email_address_1048, c_first_name_1040, c_last_name_1041, c_login_1047, c_preferred_cust_flag_1042, d_year_1079) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -137,10 +137,10 @@ local exchange (GATHER, SINGLE, []) Filter values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1140"]) - final aggregation over (c_birth_country_1153, c_customer_id_1140, c_email_address_1155, c_first_name_1147, c_last_name_1148, c_login_1154, c_preferred_cust_flag_1149, d_year_1197) + final hashaggregation over (c_birth_country_1153, c_customer_id_1140, c_email_address_1155, c_first_name_1147, c_last_name_1148, c_login_1154, c_preferred_cust_flag_1149, d_year_1197) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_1153", "c_customer_id_1140", "c_email_address_1155", "c_first_name_1147", "c_last_name_1148", "c_login_1154", "c_preferred_cust_flag_1149", "d_year_1197"]) - partial aggregation over (c_birth_country_1153, c_customer_id_1140, c_email_address_1155, c_first_name_1147, c_last_name_1148, c_login_1154, c_preferred_cust_flag_1149, d_year_1197) + partial hashaggregation over (c_birth_country_1153, c_customer_id_1140, c_email_address_1155, c_first_name_1147, c_last_name_1148, c_login_1154, c_preferred_cust_flag_1149, d_year_1197) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_1160"]) join (INNER, REPLICATED): @@ -155,7 +155,7 @@ local exchange (GATHER, SINGLE, []) Filter scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_1268"]) - single aggregation over (c_birth_country_1281, c_customer_id_1268, c_email_address_1283, c_first_name_1275, c_last_name_1276, c_login_1282, c_preferred_cust_flag_1277, d_year_1325) + single hashaggregation over (c_birth_country_1281, c_customer_id_1268, c_email_address_1283, c_first_name_1275, c_last_name_1276, c_login_1282, c_preferred_cust_flag_1277, d_year_1325) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -166,7 +166,7 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1426"]) - single aggregation over (c_birth_country_1439, c_customer_id_1426, c_email_address_1441, c_first_name_1433, c_last_name_1434, c_login_1440, c_preferred_cust_flag_1435, d_year_1472) + single hashaggregation over (c_birth_country_1439, c_customer_id_1426, c_email_address_1441, c_first_name_1433, c_last_name_1434, c_login_1440, c_preferred_cust_flag_1435, d_year_1472) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -176,7 +176,7 @@ local exchange (GATHER, SINGLE, []) Filter values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1533"]) - single aggregation over (c_birth_country_1546, c_customer_id_1533, c_email_address_1548, c_first_name_1540, c_last_name_1541, c_login_1547, c_preferred_cust_flag_1542, d_year_1590) + single hashaggregation over (c_birth_country_1546, c_customer_id_1533, c_email_address_1548, c_first_name_1540, c_last_name_1541, c_login_1547, c_preferred_cust_flag_1542, d_year_1590) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -187,10 +187,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1661"]) Filter - final aggregation over (c_birth_country_1674, c_customer_id_1661, c_email_address_1676, c_first_name_1668, c_last_name_1669, c_login_1675, c_preferred_cust_flag_1670, d_year_1718) + final hashaggregation over (c_birth_country_1674, c_customer_id_1661, c_email_address_1676, c_first_name_1668, c_last_name_1669, c_login_1675, c_preferred_cust_flag_1670, d_year_1718) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_1674", "c_customer_id_1661", "c_email_address_1676", "c_first_name_1668", "c_last_name_1669", "c_login_1675", "c_preferred_cust_flag_1670", "d_year_1718"]) - partial aggregation over (c_birth_country_1674, c_customer_id_1661, c_email_address_1676, c_first_name_1668, c_last_name_1669, c_login_1675, c_preferred_cust_flag_1670, d_year_1718) + partial hashaggregation over (c_birth_country_1674, c_customer_id_1661, c_email_address_1676, c_first_name_1668, c_last_name_1669, c_login_1675, c_preferred_cust_flag_1670, d_year_1718) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1682"]) join (INNER, REPLICATED): @@ -206,7 +206,7 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1819"]) - single aggregation over (c_birth_country_1832, c_customer_id_1819, c_email_address_1834, c_first_name_1826, c_last_name_1827, c_login_1833, c_preferred_cust_flag_1828, d_year_1865) + single hashaggregation over (c_birth_country_1832, c_customer_id_1819, c_email_address_1834, c_first_name_1826, c_last_name_1827, c_login_1833, c_preferred_cust_flag_1828, d_year_1865) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -216,7 +216,7 @@ local exchange (GATHER, SINGLE, []) Filter values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1926"]) - single aggregation over (c_birth_country_1939, c_customer_id_1926, c_email_address_1941, c_first_name_1933, c_last_name_1934, c_login_1940, c_preferred_cust_flag_1935, d_year_1983) + single hashaggregation over (c_birth_country_1939, c_customer_id_1926, c_email_address_1941, c_first_name_1933, c_last_name_1934, c_login_1940, c_preferred_cust_flag_1935, d_year_1983) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -226,10 +226,10 @@ local exchange (GATHER, SINGLE, []) Filter values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_2054"]) - final aggregation over (c_birth_country_2067, c_customer_id_2054, c_email_address_2069, c_first_name_2061, c_last_name_2062, c_login_2068, c_preferred_cust_flag_2063, d_year_2111) + final hashaggregation over (c_birth_country_2067, c_customer_id_2054, c_email_address_2069, c_first_name_2061, c_last_name_2062, c_login_2068, c_preferred_cust_flag_2063, d_year_2111) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_2067", "c_customer_id_2054", "c_email_address_2069", "c_first_name_2061", "c_last_name_2062", "c_login_2068", "c_preferred_cust_flag_2063", "d_year_2111"]) - partial aggregation over (c_birth_country_2067, c_customer_id_2054, c_email_address_2069, c_first_name_2061, c_last_name_2062, c_login_2068, c_preferred_cust_flag_2063, d_year_2111) + partial hashaggregation over (c_birth_country_2067, c_customer_id_2054, c_email_address_2069, c_first_name_2061, c_last_name_2062, c_login_2068, c_preferred_cust_flag_2063, d_year_2111) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_2075"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.plan.txt index 9c717f9ef..2924676a4 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.plan.txt @@ -8,10 +8,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + final hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country", "c_customer_id", "c_email_address", "c_first_name", "c_last_name", "c_login", "c_preferred_cust_flag", "d_year"]) - partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + partial hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -23,14 +23,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_29"]) - single aggregation over (c_birth_country_42, c_customer_id_29, c_email_address_44, c_first_name_36, c_last_name_37, c_login_43, c_preferred_cust_flag_38, d_year_52) + single hashaggregation over (c_birth_country_42, c_customer_id_29, c_email_address_44, c_first_name_36, c_last_name_37, c_login_43, c_preferred_cust_flag_38, d_year_52) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_123"]) - single aggregation over (c_birth_country_136, c_customer_id_123, c_email_address_138, c_first_name_130, c_last_name_131, c_login_137, c_preferred_cust_flag_132, d_year_146) + single hashaggregation over (c_birth_country_136, c_customer_id_123, c_email_address_138, c_first_name_130, c_last_name_131, c_login_137, c_preferred_cust_flag_132, d_year_146) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -38,10 +38,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_247"]) - final aggregation over (c_birth_country_260, c_customer_id_247, c_email_address_262, c_first_name_254, c_last_name_255, c_login_261, c_preferred_cust_flag_256, d_year_293) + final hashaggregation over (c_birth_country_260, c_customer_id_247, c_email_address_262, c_first_name_254, c_last_name_255, c_login_261, c_preferred_cust_flag_256, d_year_293) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_260", "c_customer_id_247", "c_email_address_262", "c_first_name_254", "c_last_name_255", "c_login_261", "c_preferred_cust_flag_256", "d_year_293"]) - partial aggregation over (c_birth_country_260, c_customer_id_247, c_email_address_262, c_first_name_254, c_last_name_255, c_login_261, c_preferred_cust_flag_256, d_year_293) + partial hashaggregation over (c_birth_country_260, c_customer_id_247, c_email_address_262, c_first_name_254, c_last_name_255, c_login_261, c_preferred_cust_flag_256, d_year_293) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_267"]) join (INNER, REPLICATED): @@ -53,14 +53,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_246"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_354"]) - single aggregation over (c_birth_country_367, c_customer_id_354, c_email_address_369, c_first_name_361, c_last_name_362, c_login_368, c_preferred_cust_flag_363, d_year_411) + single hashaggregation over (c_birth_country_367, c_customer_id_354, c_email_address_369, c_first_name_361, c_last_name_362, c_login_368, c_preferred_cust_flag_363, d_year_411) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_482"]) - single aggregation over (c_birth_country_495, c_customer_id_482, c_email_address_497, c_first_name_489, c_last_name_490, c_login_496, c_preferred_cust_flag_491, d_year_539) + single hashaggregation over (c_birth_country_495, c_customer_id_482, c_email_address_497, c_first_name_489, c_last_name_490, c_login_496, c_preferred_cust_flag_491, d_year_539) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -68,17 +68,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_640"]) - single aggregation over (c_birth_country_653, c_customer_id_640, c_email_address_655, c_first_name_647, c_last_name_648, c_login_654, c_preferred_cust_flag_649, d_year_686) + single hashaggregation over (c_birth_country_653, c_customer_id_640, c_email_address_655, c_first_name_647, c_last_name_648, c_login_654, c_preferred_cust_flag_649, d_year_686) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_747"]) - final aggregation over (c_birth_country_760, c_customer_id_747, c_email_address_762, c_first_name_754, c_last_name_755, c_login_761, c_preferred_cust_flag_756, d_year_804) + final hashaggregation over (c_birth_country_760, c_customer_id_747, c_email_address_762, c_first_name_754, c_last_name_755, c_login_761, c_preferred_cust_flag_756, d_year_804) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_760", "c_customer_id_747", "c_email_address_762", "c_first_name_754", "c_last_name_755", "c_login_761", "c_preferred_cust_flag_756", "d_year_804"]) - partial aggregation over (c_birth_country_760, c_customer_id_747, c_email_address_762, c_first_name_754, c_last_name_755, c_login_761, c_preferred_cust_flag_756, d_year_804) + partial hashaggregation over (c_birth_country_760, c_customer_id_747, c_email_address_762, c_first_name_754, c_last_name_755, c_login_761, c_preferred_cust_flag_756, d_year_804) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_767"]) join (INNER, REPLICATED): @@ -90,7 +90,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_746"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_875"]) - single aggregation over (c_birth_country_888, c_customer_id_875, c_email_address_890, c_first_name_882, c_last_name_883, c_login_889, c_preferred_cust_flag_884, d_year_932) + single hashaggregation over (c_birth_country_888, c_customer_id_875, c_email_address_890, c_first_name_882, c_last_name_883, c_login_889, c_preferred_cust_flag_884, d_year_932) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -98,17 +98,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1033"]) - single aggregation over (c_birth_country_1046, c_customer_id_1033, c_email_address_1048, c_first_name_1040, c_last_name_1041, c_login_1047, c_preferred_cust_flag_1042, d_year_1079) + single hashaggregation over (c_birth_country_1046, c_customer_id_1033, c_email_address_1048, c_first_name_1040, c_last_name_1041, c_login_1047, c_preferred_cust_flag_1042, d_year_1079) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1140"]) - final aggregation over (c_birth_country_1153, c_customer_id_1140, c_email_address_1155, c_first_name_1147, c_last_name_1148, c_login_1154, c_preferred_cust_flag_1149, d_year_1197) + final hashaggregation over (c_birth_country_1153, c_customer_id_1140, c_email_address_1155, c_first_name_1147, c_last_name_1148, c_login_1154, c_preferred_cust_flag_1149, d_year_1197) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_1153", "c_customer_id_1140", "c_email_address_1155", "c_first_name_1147", "c_last_name_1148", "c_login_1154", "c_preferred_cust_flag_1149", "d_year_1197"]) - partial aggregation over (c_birth_country_1153, c_customer_id_1140, c_email_address_1155, c_first_name_1147, c_last_name_1148, c_login_1154, c_preferred_cust_flag_1149, d_year_1197) + partial hashaggregation over (c_birth_country_1153, c_customer_id_1140, c_email_address_1155, c_first_name_1147, c_last_name_1148, c_login_1154, c_preferred_cust_flag_1149, d_year_1197) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_1160"]) join (INNER, REPLICATED): @@ -120,7 +120,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_1139"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_1268"]) - single aggregation over (c_birth_country_1281, c_customer_id_1268, c_email_address_1283, c_first_name_1275, c_last_name_1276, c_login_1282, c_preferred_cust_flag_1277, d_year_1325) + single hashaggregation over (c_birth_country_1281, c_customer_id_1268, c_email_address_1283, c_first_name_1275, c_last_name_1276, c_login_1282, c_preferred_cust_flag_1277, d_year_1325) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -128,24 +128,24 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1426"]) - single aggregation over (c_birth_country_1439, c_customer_id_1426, c_email_address_1441, c_first_name_1433, c_last_name_1434, c_login_1440, c_preferred_cust_flag_1435, d_year_1472) + single hashaggregation over (c_birth_country_1439, c_customer_id_1426, c_email_address_1441, c_first_name_1433, c_last_name_1434, c_login_1440, c_preferred_cust_flag_1435, d_year_1472) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1533"]) - single aggregation over (c_birth_country_1546, c_customer_id_1533, c_email_address_1548, c_first_name_1540, c_last_name_1541, c_login_1547, c_preferred_cust_flag_1542, d_year_1590) + single hashaggregation over (c_birth_country_1546, c_customer_id_1533, c_email_address_1548, c_first_name_1540, c_last_name_1541, c_login_1547, c_preferred_cust_flag_1542, d_year_1590) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1661"]) - final aggregation over (c_birth_country_1674, c_customer_id_1661, c_email_address_1676, c_first_name_1668, c_last_name_1669, c_login_1675, c_preferred_cust_flag_1670, d_year_1718) + final hashaggregation over (c_birth_country_1674, c_customer_id_1661, c_email_address_1676, c_first_name_1668, c_last_name_1669, c_login_1675, c_preferred_cust_flag_1670, d_year_1718) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_1674", "c_customer_id_1661", "c_email_address_1676", "c_first_name_1668", "c_last_name_1669", "c_login_1675", "c_preferred_cust_flag_1670", "d_year_1718"]) - partial aggregation over (c_birth_country_1674, c_customer_id_1661, c_email_address_1676, c_first_name_1668, c_last_name_1669, c_login_1675, c_preferred_cust_flag_1670, d_year_1718) + partial hashaggregation over (c_birth_country_1674, c_customer_id_1661, c_email_address_1676, c_first_name_1668, c_last_name_1669, c_login_1675, c_preferred_cust_flag_1670, d_year_1718) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1682"]) join (INNER, REPLICATED): @@ -158,24 +158,24 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1819"]) - single aggregation over (c_birth_country_1832, c_customer_id_1819, c_email_address_1834, c_first_name_1826, c_last_name_1827, c_login_1833, c_preferred_cust_flag_1828, d_year_1865) + single hashaggregation over (c_birth_country_1832, c_customer_id_1819, c_email_address_1834, c_first_name_1826, c_last_name_1827, c_login_1833, c_preferred_cust_flag_1828, d_year_1865) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1926"]) - single aggregation over (c_birth_country_1939, c_customer_id_1926, c_email_address_1941, c_first_name_1933, c_last_name_1934, c_login_1940, c_preferred_cust_flag_1935, d_year_1983) + single hashaggregation over (c_birth_country_1939, c_customer_id_1926, c_email_address_1941, c_first_name_1933, c_last_name_1934, c_login_1940, c_preferred_cust_flag_1935, d_year_1983) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_2054"]) - final aggregation over (c_birth_country_2067, c_customer_id_2054, c_email_address_2069, c_first_name_2061, c_last_name_2062, c_login_2068, c_preferred_cust_flag_2063, d_year_2111) + final hashaggregation over (c_birth_country_2067, c_customer_id_2054, c_email_address_2069, c_first_name_2061, c_last_name_2062, c_login_2068, c_preferred_cust_flag_2063, d_year_2111) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_2067", "c_customer_id_2054", "c_email_address_2069", "c_first_name_2061", "c_last_name_2062", "c_login_2068", "c_preferred_cust_flag_2063", "d_year_2111"]) - partial aggregation over (c_birth_country_2067, c_customer_id_2054, c_email_address_2069, c_first_name_2061, c_last_name_2062, c_login_2068, c_preferred_cust_flag_2063, d_year_2111) + partial hashaggregation over (c_birth_country_2067, c_customer_id_2054, c_email_address_2069, c_first_name_2061, c_last_name_2062, c_login_2068, c_preferred_cust_flag_2063, d_year_2111) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_2075"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.push.plan.txt index 473751c40..6fa6583ae 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.push.plan.txt @@ -8,10 +8,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + final hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country", "c_customer_id", "c_email_address", "c_first_name", "c_last_name", "c_login", "c_preferred_cust_flag", "d_year"]) - partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + partial hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -23,14 +23,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_31"]) - single aggregation over (c_birth_country_44, c_customer_id_31, c_email_address_46, c_first_name_38, c_last_name_39, c_login_45, c_preferred_cust_flag_40, d_year_56) + single hashaggregation over (c_birth_country_44, c_customer_id_31, c_email_address_46, c_first_name_38, c_last_name_39, c_login_45, c_preferred_cust_flag_40, d_year_56) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_128"]) - single aggregation over (c_birth_country_141, c_customer_id_128, c_email_address_143, c_first_name_135, c_last_name_136, c_login_142, c_preferred_cust_flag_137, d_year_153) + single hashaggregation over (c_birth_country_141, c_customer_id_128, c_email_address_143, c_first_name_135, c_last_name_136, c_login_142, c_preferred_cust_flag_137, d_year_153) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -38,10 +38,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_255"]) - final aggregation over (c_birth_country_268, c_customer_id_255, c_email_address_270, c_first_name_262, c_last_name_263, c_login_269, c_preferred_cust_flag_264, d_year_303) + final hashaggregation over (c_birth_country_268, c_customer_id_255, c_email_address_270, c_first_name_262, c_last_name_263, c_login_269, c_preferred_cust_flag_264, d_year_303) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_268", "c_customer_id_255", "c_email_address_270", "c_first_name_262", "c_last_name_263", "c_login_269", "c_preferred_cust_flag_264", "d_year_303"]) - partial aggregation over (c_birth_country_268, c_customer_id_255, c_email_address_270, c_first_name_262, c_last_name_263, c_login_269, c_preferred_cust_flag_264, d_year_303) + partial hashaggregation over (c_birth_country_268, c_customer_id_255, c_email_address_270, c_first_name_262, c_last_name_263, c_login_269, c_preferred_cust_flag_264, d_year_303) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_276"]) join (INNER, REPLICATED): @@ -53,14 +53,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_254"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_365"]) - single aggregation over (c_birth_country_378, c_customer_id_365, c_email_address_380, c_first_name_372, c_last_name_373, c_login_379, c_preferred_cust_flag_374, d_year_424) + single hashaggregation over (c_birth_country_378, c_customer_id_365, c_email_address_380, c_first_name_372, c_last_name_373, c_login_379, c_preferred_cust_flag_374, d_year_424) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_496"]) - single aggregation over (c_birth_country_509, c_customer_id_496, c_email_address_511, c_first_name_503, c_last_name_504, c_login_510, c_preferred_cust_flag_505, d_year_555) + single hashaggregation over (c_birth_country_509, c_customer_id_496, c_email_address_511, c_first_name_503, c_last_name_504, c_login_510, c_preferred_cust_flag_505, d_year_555) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -68,17 +68,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_657"]) - single aggregation over (c_birth_country_670, c_customer_id_657, c_email_address_672, c_first_name_664, c_last_name_665, c_login_671, c_preferred_cust_flag_666, d_year_705) + single hashaggregation over (c_birth_country_670, c_customer_id_657, c_email_address_672, c_first_name_664, c_last_name_665, c_login_671, c_preferred_cust_flag_666, d_year_705) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_767"]) - final aggregation over (c_birth_country_780, c_customer_id_767, c_email_address_782, c_first_name_774, c_last_name_775, c_login_781, c_preferred_cust_flag_776, d_year_826) + final hashaggregation over (c_birth_country_780, c_customer_id_767, c_email_address_782, c_first_name_774, c_last_name_775, c_login_781, c_preferred_cust_flag_776, d_year_826) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_780", "c_customer_id_767", "c_email_address_782", "c_first_name_774", "c_last_name_775", "c_login_781", "c_preferred_cust_flag_776", "d_year_826"]) - partial aggregation over (c_birth_country_780, c_customer_id_767, c_email_address_782, c_first_name_774, c_last_name_775, c_login_781, c_preferred_cust_flag_776, d_year_826) + partial hashaggregation over (c_birth_country_780, c_customer_id_767, c_email_address_782, c_first_name_774, c_last_name_775, c_login_781, c_preferred_cust_flag_776, d_year_826) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_788"]) join (INNER, REPLICATED): @@ -90,7 +90,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_766"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_898"]) - single aggregation over (c_birth_country_911, c_customer_id_898, c_email_address_913, c_first_name_905, c_last_name_906, c_login_912, c_preferred_cust_flag_907, d_year_957) + single hashaggregation over (c_birth_country_911, c_customer_id_898, c_email_address_913, c_first_name_905, c_last_name_906, c_login_912, c_preferred_cust_flag_907, d_year_957) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -98,17 +98,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1059"]) - single aggregation over (c_birth_country_1072, c_customer_id_1059, c_email_address_1074, c_first_name_1066, c_last_name_1067, c_login_1073, c_preferred_cust_flag_1068, d_year_1107) + single hashaggregation over (c_birth_country_1072, c_customer_id_1059, c_email_address_1074, c_first_name_1066, c_last_name_1067, c_login_1073, c_preferred_cust_flag_1068, d_year_1107) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1169"]) - final aggregation over (c_birth_country_1182, c_customer_id_1169, c_email_address_1184, c_first_name_1176, c_last_name_1177, c_login_1183, c_preferred_cust_flag_1178, d_year_1228) + final hashaggregation over (c_birth_country_1182, c_customer_id_1169, c_email_address_1184, c_first_name_1176, c_last_name_1177, c_login_1183, c_preferred_cust_flag_1178, d_year_1228) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_1182", "c_customer_id_1169", "c_email_address_1184", "c_first_name_1176", "c_last_name_1177", "c_login_1183", "c_preferred_cust_flag_1178", "d_year_1228"]) - partial aggregation over (c_birth_country_1182, c_customer_id_1169, c_email_address_1184, c_first_name_1176, c_last_name_1177, c_login_1183, c_preferred_cust_flag_1178, d_year_1228) + partial hashaggregation over (c_birth_country_1182, c_customer_id_1169, c_email_address_1184, c_first_name_1176, c_last_name_1177, c_login_1183, c_preferred_cust_flag_1178, d_year_1228) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_1190"]) join (INNER, REPLICATED): @@ -120,7 +120,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_1168"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_1300"]) - single aggregation over (c_birth_country_1313, c_customer_id_1300, c_email_address_1315, c_first_name_1307, c_last_name_1308, c_login_1314, c_preferred_cust_flag_1309, d_year_1359) + single hashaggregation over (c_birth_country_1313, c_customer_id_1300, c_email_address_1315, c_first_name_1307, c_last_name_1308, c_login_1314, c_preferred_cust_flag_1309, d_year_1359) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -128,24 +128,24 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1461"]) - single aggregation over (c_birth_country_1474, c_customer_id_1461, c_email_address_1476, c_first_name_1468, c_last_name_1469, c_login_1475, c_preferred_cust_flag_1470, d_year_1509) + single hashaggregation over (c_birth_country_1474, c_customer_id_1461, c_email_address_1476, c_first_name_1468, c_last_name_1469, c_login_1475, c_preferred_cust_flag_1470, d_year_1509) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1571"]) - single aggregation over (c_birth_country_1584, c_customer_id_1571, c_email_address_1586, c_first_name_1578, c_last_name_1579, c_login_1585, c_preferred_cust_flag_1580, d_year_1630) + single hashaggregation over (c_birth_country_1584, c_customer_id_1571, c_email_address_1586, c_first_name_1578, c_last_name_1579, c_login_1585, c_preferred_cust_flag_1580, d_year_1630) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1702"]) - final aggregation over (c_birth_country_1715, c_customer_id_1702, c_email_address_1717, c_first_name_1709, c_last_name_1710, c_login_1716, c_preferred_cust_flag_1711, d_year_1761) + final hashaggregation over (c_birth_country_1715, c_customer_id_1702, c_email_address_1717, c_first_name_1709, c_last_name_1710, c_login_1716, c_preferred_cust_flag_1711, d_year_1761) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_1715", "c_customer_id_1702", "c_email_address_1717", "c_first_name_1709", "c_last_name_1710", "c_login_1716", "c_preferred_cust_flag_1711", "d_year_1761"]) - partial aggregation over (c_birth_country_1715, c_customer_id_1702, c_email_address_1717, c_first_name_1709, c_last_name_1710, c_login_1716, c_preferred_cust_flag_1711, d_year_1761) + partial hashaggregation over (c_birth_country_1715, c_customer_id_1702, c_email_address_1717, c_first_name_1709, c_last_name_1710, c_login_1716, c_preferred_cust_flag_1711, d_year_1761) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1724"]) join (INNER, REPLICATED): @@ -158,24 +158,24 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1863"]) - single aggregation over (c_birth_country_1876, c_customer_id_1863, c_email_address_1878, c_first_name_1870, c_last_name_1871, c_login_1877, c_preferred_cust_flag_1872, d_year_1911) + single hashaggregation over (c_birth_country_1876, c_customer_id_1863, c_email_address_1878, c_first_name_1870, c_last_name_1871, c_login_1877, c_preferred_cust_flag_1872, d_year_1911) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1973"]) - single aggregation over (c_birth_country_1986, c_customer_id_1973, c_email_address_1988, c_first_name_1980, c_last_name_1981, c_login_1987, c_preferred_cust_flag_1982, d_year_2032) + single hashaggregation over (c_birth_country_1986, c_customer_id_1973, c_email_address_1988, c_first_name_1980, c_last_name_1981, c_login_1987, c_preferred_cust_flag_1982, d_year_2032) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_2104"]) - final aggregation over (c_birth_country_2117, c_customer_id_2104, c_email_address_2119, c_first_name_2111, c_last_name_2112, c_login_2118, c_preferred_cust_flag_2113, d_year_2163) + final hashaggregation over (c_birth_country_2117, c_customer_id_2104, c_email_address_2119, c_first_name_2111, c_last_name_2112, c_login_2118, c_preferred_cust_flag_2113, d_year_2163) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_2117", "c_customer_id_2104", "c_email_address_2119", "c_first_name_2111", "c_last_name_2112", "c_login_2118", "c_preferred_cust_flag_2113", "d_year_2163"]) - partial aggregation over (c_birth_country_2117, c_customer_id_2104, c_email_address_2119, c_first_name_2111, c_last_name_2112, c_login_2118, c_preferred_cust_flag_2113, d_year_2163) + partial hashaggregation over (c_birth_country_2117, c_customer_id_2104, c_email_address_2119, c_first_name_2111, c_last_name_2112, c_login_2118, c_preferred_cust_flag_2113, d_year_2163) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_2126"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.reuse.plan.txt index 31dc5c647..0e74be943 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q04.reuse.plan.txt @@ -8,10 +8,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + final hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country", "c_customer_id", "c_email_address", "c_first_name", "c_last_name", "c_login", "c_preferred_cust_flag", "d_year"]) - partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + partial hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -23,14 +23,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_31"]) - single aggregation over (c_birth_country_44, c_customer_id_31, c_email_address_46, c_first_name_38, c_last_name_39, c_login_45, c_preferred_cust_flag_40, d_year_56) + single hashaggregation over (c_birth_country_44, c_customer_id_31, c_email_address_46, c_first_name_38, c_last_name_39, c_login_45, c_preferred_cust_flag_40, d_year_56) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_128"]) - single aggregation over (c_birth_country_141, c_customer_id_128, c_email_address_143, c_first_name_135, c_last_name_136, c_login_142, c_preferred_cust_flag_137, d_year_153) + single hashaggregation over (c_birth_country_141, c_customer_id_128, c_email_address_143, c_first_name_135, c_last_name_136, c_login_142, c_preferred_cust_flag_137, d_year_153) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -38,10 +38,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_255"]) - final aggregation over (c_birth_country_268, c_customer_id_255, c_email_address_270, c_first_name_262, c_last_name_263, c_login_269, c_preferred_cust_flag_264, d_year_303) + final hashaggregation over (c_birth_country_268, c_customer_id_255, c_email_address_270, c_first_name_262, c_last_name_263, c_login_269, c_preferred_cust_flag_264, d_year_303) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_268", "c_customer_id_255", "c_email_address_270", "c_first_name_262", "c_last_name_263", "c_login_269", "c_preferred_cust_flag_264", "d_year_303"]) - partial aggregation over (c_birth_country_268, c_customer_id_255, c_email_address_270, c_first_name_262, c_last_name_263, c_login_269, c_preferred_cust_flag_264, d_year_303) + partial hashaggregation over (c_birth_country_268, c_customer_id_255, c_email_address_270, c_first_name_262, c_last_name_263, c_login_269, c_preferred_cust_flag_264, d_year_303) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_276"]) join (INNER, REPLICATED): @@ -53,14 +53,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_254"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_365"]) - single aggregation over (c_birth_country_378, c_customer_id_365, c_email_address_380, c_first_name_372, c_last_name_373, c_login_379, c_preferred_cust_flag_374, d_year_424) + single hashaggregation over (c_birth_country_378, c_customer_id_365, c_email_address_380, c_first_name_372, c_last_name_373, c_login_379, c_preferred_cust_flag_374, d_year_424) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_496"]) - single aggregation over (c_birth_country_509, c_customer_id_496, c_email_address_511, c_first_name_503, c_last_name_504, c_login_510, c_preferred_cust_flag_505, d_year_555) + single hashaggregation over (c_birth_country_509, c_customer_id_496, c_email_address_511, c_first_name_503, c_last_name_504, c_login_510, c_preferred_cust_flag_505, d_year_555) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -68,17 +68,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_657"]) - single aggregation over (c_birth_country_670, c_customer_id_657, c_email_address_672, c_first_name_664, c_last_name_665, c_login_671, c_preferred_cust_flag_666, d_year_705) + single hashaggregation over (c_birth_country_670, c_customer_id_657, c_email_address_672, c_first_name_664, c_last_name_665, c_login_671, c_preferred_cust_flag_666, d_year_705) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_767"]) - final aggregation over (c_birth_country_780, c_customer_id_767, c_email_address_782, c_first_name_774, c_last_name_775, c_login_781, c_preferred_cust_flag_776, d_year_826) + final hashaggregation over (c_birth_country_780, c_customer_id_767, c_email_address_782, c_first_name_774, c_last_name_775, c_login_781, c_preferred_cust_flag_776, d_year_826) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_780", "c_customer_id_767", "c_email_address_782", "c_first_name_774", "c_last_name_775", "c_login_781", "c_preferred_cust_flag_776", "d_year_826"]) - partial aggregation over (c_birth_country_780, c_customer_id_767, c_email_address_782, c_first_name_774, c_last_name_775, c_login_781, c_preferred_cust_flag_776, d_year_826) + partial hashaggregation over (c_birth_country_780, c_customer_id_767, c_email_address_782, c_first_name_774, c_last_name_775, c_login_781, c_preferred_cust_flag_776, d_year_826) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_788"]) join (INNER, REPLICATED): @@ -90,7 +90,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_766"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_898"]) - single aggregation over (c_birth_country_911, c_customer_id_898, c_email_address_913, c_first_name_905, c_last_name_906, c_login_912, c_preferred_cust_flag_907, d_year_957) + single hashaggregation over (c_birth_country_911, c_customer_id_898, c_email_address_913, c_first_name_905, c_last_name_906, c_login_912, c_preferred_cust_flag_907, d_year_957) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -98,17 +98,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1059"]) - single aggregation over (c_birth_country_1072, c_customer_id_1059, c_email_address_1074, c_first_name_1066, c_last_name_1067, c_login_1073, c_preferred_cust_flag_1068, d_year_1107) + single hashaggregation over (c_birth_country_1072, c_customer_id_1059, c_email_address_1074, c_first_name_1066, c_last_name_1067, c_login_1073, c_preferred_cust_flag_1068, d_year_1107) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1169"]) - final aggregation over (c_birth_country_1182, c_customer_id_1169, c_email_address_1184, c_first_name_1176, c_last_name_1177, c_login_1183, c_preferred_cust_flag_1178, d_year_1228) + final hashaggregation over (c_birth_country_1182, c_customer_id_1169, c_email_address_1184, c_first_name_1176, c_last_name_1177, c_login_1183, c_preferred_cust_flag_1178, d_year_1228) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_1182", "c_customer_id_1169", "c_email_address_1184", "c_first_name_1176", "c_last_name_1177", "c_login_1183", "c_preferred_cust_flag_1178", "d_year_1228"]) - partial aggregation over (c_birth_country_1182, c_customer_id_1169, c_email_address_1184, c_first_name_1176, c_last_name_1177, c_login_1183, c_preferred_cust_flag_1178, d_year_1228) + partial hashaggregation over (c_birth_country_1182, c_customer_id_1169, c_email_address_1184, c_first_name_1176, c_last_name_1177, c_login_1183, c_preferred_cust_flag_1178, d_year_1228) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_1190"]) join (INNER, REPLICATED): @@ -120,7 +120,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_1168"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_1300"]) - single aggregation over (c_birth_country_1313, c_customer_id_1300, c_email_address_1315, c_first_name_1307, c_last_name_1308, c_login_1314, c_preferred_cust_flag_1309, d_year_1359) + single hashaggregation over (c_birth_country_1313, c_customer_id_1300, c_email_address_1315, c_first_name_1307, c_last_name_1308, c_login_1314, c_preferred_cust_flag_1309, d_year_1359) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -128,24 +128,24 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1461"]) - single aggregation over (c_birth_country_1474, c_customer_id_1461, c_email_address_1476, c_first_name_1468, c_last_name_1469, c_login_1475, c_preferred_cust_flag_1470, d_year_1509) + single hashaggregation over (c_birth_country_1474, c_customer_id_1461, c_email_address_1476, c_first_name_1468, c_last_name_1469, c_login_1475, c_preferred_cust_flag_1470, d_year_1509) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1571"]) - single aggregation over (c_birth_country_1584, c_customer_id_1571, c_email_address_1586, c_first_name_1578, c_last_name_1579, c_login_1585, c_preferred_cust_flag_1580, d_year_1630) + single hashaggregation over (c_birth_country_1584, c_customer_id_1571, c_email_address_1586, c_first_name_1578, c_last_name_1579, c_login_1585, c_preferred_cust_flag_1580, d_year_1630) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1702"]) - final aggregation over (c_birth_country_1715, c_customer_id_1702, c_email_address_1717, c_first_name_1709, c_last_name_1710, c_login_1716, c_preferred_cust_flag_1711, d_year_1761) + final hashaggregation over (c_birth_country_1715, c_customer_id_1702, c_email_address_1717, c_first_name_1709, c_last_name_1710, c_login_1716, c_preferred_cust_flag_1711, d_year_1761) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_1715", "c_customer_id_1702", "c_email_address_1717", "c_first_name_1709", "c_last_name_1710", "c_login_1716", "c_preferred_cust_flag_1711", "d_year_1761"]) - partial aggregation over (c_birth_country_1715, c_customer_id_1702, c_email_address_1717, c_first_name_1709, c_last_name_1710, c_login_1716, c_preferred_cust_flag_1711, d_year_1761) + partial hashaggregation over (c_birth_country_1715, c_customer_id_1702, c_email_address_1717, c_first_name_1709, c_last_name_1710, c_login_1716, c_preferred_cust_flag_1711, d_year_1761) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1724"]) join (INNER, REPLICATED): @@ -158,24 +158,24 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_1863"]) - single aggregation over (c_birth_country_1876, c_customer_id_1863, c_email_address_1878, c_first_name_1870, c_last_name_1871, c_login_1877, c_preferred_cust_flag_1872, d_year_1911) + single hashaggregation over (c_birth_country_1876, c_customer_id_1863, c_email_address_1878, c_first_name_1870, c_last_name_1871, c_login_1877, c_preferred_cust_flag_1872, d_year_1911) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_1973"]) - single aggregation over (c_birth_country_1986, c_customer_id_1973, c_email_address_1988, c_first_name_1980, c_last_name_1981, c_login_1987, c_preferred_cust_flag_1982, d_year_2032) + single hashaggregation over (c_birth_country_1986, c_customer_id_1973, c_email_address_1988, c_first_name_1980, c_last_name_1981, c_login_1987, c_preferred_cust_flag_1982, d_year_2032) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_2104"]) - final aggregation over (c_birth_country_2117, c_customer_id_2104, c_email_address_2119, c_first_name_2111, c_last_name_2112, c_login_2118, c_preferred_cust_flag_2113, d_year_2163) + final hashaggregation over (c_birth_country_2117, c_customer_id_2104, c_email_address_2119, c_first_name_2111, c_last_name_2112, c_login_2118, c_preferred_cust_flag_2113, d_year_2163) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_2117", "c_customer_id_2104", "c_email_address_2119", "c_first_name_2111", "c_last_name_2112", "c_login_2118", "c_preferred_cust_flag_2113", "d_year_2163"]) - partial aggregation over (c_birth_country_2117, c_customer_id_2104, c_email_address_2119, c_first_name_2111, c_last_name_2112, c_login_2118, c_preferred_cust_flag_2113, d_year_2163) + partial hashaggregation over (c_birth_country_2117, c_customer_id_2104, c_email_address_2119, c_first_name_2111, c_last_name_2112, c_login_2118, c_preferred_cust_flag_2113, d_year_2163) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_2126"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q05.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q05.plan.txt index aa0d48239..098d66d14 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q05.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q05.plan.txt @@ -1,14 +1,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, id$gid) + final hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) - partial aggregation over (channel$gid, groupid, id$gid) + partial hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (s_store_id) + final hashaggregation over (s_store_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id"]) - partial aggregation over (s_store_id) + partial hashaggregation over (s_store_id) join (INNER, REPLICATED): join (INNER, REPLICATED): remote exchange (REPARTITION, ROUND_ROBIN, []) @@ -20,10 +20,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store - final aggregation over (cp_catalog_page_id) + final hashaggregation over (cp_catalog_page_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cp_catalog_page_id"]) - partial aggregation over (cp_catalog_page_id) + partial hashaggregation over (cp_catalog_page_id) join (INNER, REPLICATED): join (INNER, REPLICATED): remote exchange (REPARTITION, ROUND_ROBIN, []) @@ -35,10 +35,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan catalog_page - final aggregation over (web_site_id) + final hashaggregation over (web_site_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["web_site_id"]) - partial aggregation over (web_site_id) + partial hashaggregation over (web_site_id) join (INNER, REPLICATED): join (INNER, REPLICATED): remote exchange (REPARTITION, ROUND_ROBIN, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q05.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q05.push.plan.txt index 8f8db8033..718ef8c61 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q05.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q05.push.plan.txt @@ -1,14 +1,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, id$gid) + final hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) - partial aggregation over (channel$gid, groupid, id$gid) + partial hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (s_store_id) + final hashaggregation over (s_store_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id"]) - partial aggregation over (s_store_id) + partial hashaggregation over (s_store_id) join (INNER, REPLICATED): join (INNER, REPLICATED): remote exchange (REPARTITION, ROUND_ROBIN, []) @@ -20,10 +20,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store - final aggregation over (cp_catalog_page_id) + final hashaggregation over (cp_catalog_page_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cp_catalog_page_id"]) - partial aggregation over (cp_catalog_page_id) + partial hashaggregation over (cp_catalog_page_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cp_catalog_page_sk"]) scan catalog_page @@ -36,10 +36,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - final aggregation over (web_site_id) + final hashaggregation over (web_site_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["web_site_id"]) - partial aggregation over (web_site_id) + partial hashaggregation over (web_site_id) join (INNER, REPLICATED): join (INNER, REPLICATED): remote exchange (REPARTITION, ROUND_ROBIN, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q06.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q06.plan.txt index 1fc16834e..056a0d67b 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q06.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q06.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_state) + final hashaggregation over (ca_state) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state"]) - partial aggregation over (ca_state) + partial hashaggregation over (ca_state) cross join: join (LEFT, REPLICATED): join (INNER, REPLICATED): @@ -19,10 +19,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_month_seq_3) + final hashaggregation over (d_month_seq_3) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_month_seq_3"]) - partial aggregation over (d_month_seq_3) + partial hashaggregation over (d_month_seq_3) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) @@ -37,12 +37,12 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (i_category_43) + final hashaggregation over (i_category_43) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category_43"]) - partial aggregation over (i_category_43) + partial hashaggregation over (i_category_43) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q06.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q06.push.plan.txt index 88f5fbc50..7e2e1d804 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q06.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q06.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_state) + final hashaggregation over (ca_state) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state"]) - partial aggregation over (ca_state) + partial hashaggregation over (ca_state) cross join: join (LEFT, REPLICATED): join (INNER, PARTITIONED): @@ -23,10 +23,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_month_seq_7) + final hashaggregation over (d_month_seq_7) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_month_seq_7"]) - partial aggregation over (d_month_seq_7) + partial hashaggregation over (d_month_seq_7) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) @@ -38,12 +38,12 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (i_category_48) + final hashaggregation over (i_category_48) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category_48"]) - partial aggregation over (i_category_48) + partial hashaggregation over (i_category_48) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q07.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q07.plan.txt index 32f4763b4..e569934df 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q07.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q07.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q07.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q07.push.plan.txt index 5b5f4f50e..af4389163 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q07.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q07.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_cdemo_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q08.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q08.plan.txt index 059fe336d..0fcf27f7f 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q08.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q08.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (s_store_name) + final hashaggregation over (s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_name"]) - partial aggregation over (s_store_name) + partial hashaggregation over (s_store_name) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["substr_55"]) join (INNER, REPLICATED): @@ -17,17 +17,17 @@ local exchange (GATHER, SINGLE, []) scan store local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["substr_56"]) - final aggregation over (expr_29) + final hashaggregation over (expr_29) local exchange (REPARTITION, HASH, ["expr_29"]) remote exchange (REPARTITION, HASH, ["expr_47"]) - partial aggregation over (expr_47) + partial hashaggregation over (expr_47) scan customer_address remote exchange (REPARTITION, HASH, ["expr_50"]) - partial aggregation over (expr_50) - final aggregation over (ca_zip_11) + partial hashaggregation over (expr_50) + final hashaggregation over (ca_zip_11) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_zip_11"]) - partial aggregation over (ca_zip_11) + partial hashaggregation over (ca_zip_11) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ca_address_sk_2"]) scan customer_address diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q08.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q08.push.plan.txt index 55dec1982..72447d717 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q08.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q08.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (s_store_name) + final hashaggregation over (s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_name"]) - partial aggregation over (s_store_name) + partial hashaggregation over (s_store_name) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["substr_60"]) join (INNER, REPLICATED): @@ -17,17 +17,17 @@ local exchange (GATHER, SINGLE, []) scan store local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["substr_61"]) - final aggregation over (expr_34) + final hashaggregation over (expr_34) local exchange (REPARTITION, HASH, ["expr_34"]) remote exchange (REPARTITION, HASH, ["expr_52"]) - partial aggregation over (expr_52) + partial hashaggregation over (expr_52) scan customer_address remote exchange (REPARTITION, HASH, ["expr_55"]) - partial aggregation over (expr_55) - final aggregation over (ca_zip_14) + partial hashaggregation over (expr_55) + final hashaggregation over (ca_zip_14) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_zip_14"]) - partial aggregation over (ca_zip_14) + partial hashaggregation over (ca_zip_14) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ca_address_sk_5"]) scan customer_address diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q09.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q09.plan.txt index 6a40a2a3e..816605141 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q09.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q09.plan.txt @@ -17,106 +17,106 @@ remote exchange (GATHER, SINGLE, []) scan reason local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q09.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q09.push.plan.txt index 822214e10..7efed1a55 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q09.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q09.push.plan.txt @@ -17,106 +17,106 @@ remote exchange (GATHER, SINGLE, []) scan reason (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan store_sales (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q10.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q10.plan.txt index 59f909e68..13ef15268 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q10.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q10.plan.txt @@ -1,14 +1,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (cd_credit_rating, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) + final hashaggregation over (cd_credit_rating, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cd_credit_rating", "cd_dep_college_count", "cd_dep_count", "cd_dep_employed_count", "cd_education_status", "cd_gender", "cd_marital_status", "cd_purchase_estimate"]) - partial aggregation over (cd_credit_rating, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) + partial hashaggregation over (cd_credit_rating, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) join (RIGHT, PARTITIONED): - final aggregation over (cs_ship_customer_sk) + final hashaggregation over (cs_ship_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"]) - partial aggregation over (cs_ship_customer_sk) + partial hashaggregation over (cs_ship_customer_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) @@ -16,10 +16,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim local exchange (GATHER, SINGLE, []) join (RIGHT, PARTITIONED): - final aggregation over (ws_bill_customer_sk) + final hashaggregation over (ws_bill_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) - partial aggregation over (ws_bill_customer_sk) + partial hashaggregation over (ws_bill_customer_sk) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) @@ -32,10 +32,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) join (INNER, PARTITIONED): - final aggregation over (ss_customer_sk) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q10.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q10.push.plan.txt index 71bcd0c22..fd4bcba2a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q10.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q10.push.plan.txt @@ -1,14 +1,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (cd_credit_rating, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) + final hashaggregation over (cd_credit_rating, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cd_credit_rating", "cd_dep_college_count", "cd_dep_count", "cd_dep_employed_count", "cd_education_status", "cd_gender", "cd_marital_status", "cd_purchase_estimate"]) - partial aggregation over (cd_credit_rating, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) + partial hashaggregation over (cd_credit_rating, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) join (RIGHT, PARTITIONED): - final aggregation over (cs_ship_customer_sk) + final hashaggregation over (cs_ship_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"]) - partial aggregation over (cs_ship_customer_sk) + partial hashaggregation over (cs_ship_customer_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) @@ -16,10 +16,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) join (RIGHT, PARTITIONED): - final aggregation over (ws_bill_customer_sk) + final hashaggregation over (ws_bill_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) - partial aggregation over (ws_bill_customer_sk) + partial hashaggregation over (ws_bill_customer_sk) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) @@ -32,10 +32,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) join (INNER, PARTITIONED): - final aggregation over (ss_customer_sk) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.cte.plan.txt index 6a2fc9502..bb0688e19 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.cte.plan.txt @@ -6,10 +6,10 @@ local exchange (GATHER, SINGLE, []) local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) Filter - final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + final hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country", "c_customer_id", "c_email_address", "c_first_name", "c_last_name", "c_login", "c_preferred_cust_flag", "d_year"]) - partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + partial hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -24,7 +24,7 @@ local exchange (GATHER, SINGLE, []) Filter scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_29"]) - single aggregation over (c_birth_country_42, c_customer_id_29, c_email_address_44, c_first_name_36, c_last_name_37, c_login_43, c_preferred_cust_flag_38, d_year_52) + single hashaggregation over (c_birth_country_42, c_customer_id_29, c_email_address_44, c_first_name_36, c_last_name_37, c_login_43, c_preferred_cust_flag_38, d_year_52) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -35,10 +35,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_153"]) - final aggregation over (c_birth_country_166, c_customer_id_153, c_email_address_168, c_first_name_160, c_last_name_161, c_login_167, c_preferred_cust_flag_162, d_year_199) + final hashaggregation over (c_birth_country_166, c_customer_id_153, c_email_address_168, c_first_name_160, c_last_name_161, c_login_167, c_preferred_cust_flag_162, d_year_199) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_166", "c_customer_id_153", "c_email_address_168", "c_first_name_160", "c_last_name_161", "c_login_167", "c_preferred_cust_flag_162", "d_year_199"]) - partial aggregation over (c_birth_country_166, c_customer_id_153, c_email_address_168, c_first_name_160, c_last_name_161, c_login_167, c_preferred_cust_flag_162, d_year_199) + partial hashaggregation over (c_birth_country_166, c_customer_id_153, c_email_address_168, c_first_name_160, c_last_name_161, c_login_167, c_preferred_cust_flag_162, d_year_199) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_173"]) join (INNER, REPLICATED): @@ -53,7 +53,7 @@ local exchange (GATHER, SINGLE, []) Filter scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_260"]) - single aggregation over (c_birth_country_273, c_customer_id_260, c_email_address_275, c_first_name_267, c_last_name_268, c_login_274, c_preferred_cust_flag_269, d_year_317) + single hashaggregation over (c_birth_country_273, c_customer_id_260, c_email_address_275, c_first_name_267, c_last_name_268, c_login_274, c_preferred_cust_flag_269, d_year_317) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -64,7 +64,7 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_418"]) - single aggregation over (c_birth_country_431, c_customer_id_418, c_email_address_433, c_first_name_425, c_last_name_426, c_login_432, c_preferred_cust_flag_427, d_year_464) + single hashaggregation over (c_birth_country_431, c_customer_id_418, c_email_address_433, c_first_name_425, c_last_name_426, c_login_432, c_preferred_cust_flag_427, d_year_464) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -75,10 +75,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_525"]) Filter - final aggregation over (c_birth_country_538, c_customer_id_525, c_email_address_540, c_first_name_532, c_last_name_533, c_login_539, c_preferred_cust_flag_534, d_year_582) + final hashaggregation over (c_birth_country_538, c_customer_id_525, c_email_address_540, c_first_name_532, c_last_name_533, c_login_539, c_preferred_cust_flag_534, d_year_582) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_538", "c_customer_id_525", "c_email_address_540", "c_first_name_532", "c_last_name_533", "c_login_539", "c_preferred_cust_flag_534", "d_year_582"]) - partial aggregation over (c_birth_country_538, c_customer_id_525, c_email_address_540, c_first_name_532, c_last_name_533, c_login_539, c_preferred_cust_flag_534, d_year_582) + partial hashaggregation over (c_birth_country_538, c_customer_id_525, c_email_address_540, c_first_name_532, c_last_name_533, c_login_539, c_preferred_cust_flag_534, d_year_582) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_546"]) join (INNER, REPLICATED): @@ -94,7 +94,7 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_683"]) - single aggregation over (c_birth_country_696, c_customer_id_683, c_email_address_698, c_first_name_690, c_last_name_691, c_login_697, c_preferred_cust_flag_692, d_year_729) + single hashaggregation over (c_birth_country_696, c_customer_id_683, c_email_address_698, c_first_name_690, c_last_name_691, c_login_697, c_preferred_cust_flag_692, d_year_729) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -104,10 +104,10 @@ local exchange (GATHER, SINGLE, []) Filter values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_790"]) - final aggregation over (c_birth_country_803, c_customer_id_790, c_email_address_805, c_first_name_797, c_last_name_798, c_login_804, c_preferred_cust_flag_799, d_year_847) + final hashaggregation over (c_birth_country_803, c_customer_id_790, c_email_address_805, c_first_name_797, c_last_name_798, c_login_804, c_preferred_cust_flag_799, d_year_847) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_803", "c_customer_id_790", "c_email_address_805", "c_first_name_797", "c_last_name_798", "c_login_804", "c_preferred_cust_flag_799", "d_year_847"]) - partial aggregation over (c_birth_country_803, c_customer_id_790, c_email_address_805, c_first_name_797, c_last_name_798, c_login_804, c_preferred_cust_flag_799, d_year_847) + partial hashaggregation over (c_birth_country_803, c_customer_id_790, c_email_address_805, c_first_name_797, c_last_name_798, c_login_804, c_preferred_cust_flag_799, d_year_847) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_811"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.plan.txt index 61b219d87..105201473 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + final hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country", "c_customer_id", "c_email_address", "c_first_name", "c_last_name", "c_login", "c_preferred_cust_flag", "d_year"]) - partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + partial hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -20,7 +20,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_29"]) - single aggregation over (c_birth_country_42, c_customer_id_29, c_email_address_44, c_first_name_36, c_last_name_37, c_login_43, c_preferred_cust_flag_38, d_year_52) + single hashaggregation over (c_birth_country_42, c_customer_id_29, c_email_address_44, c_first_name_36, c_last_name_37, c_login_43, c_preferred_cust_flag_38, d_year_52) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -28,10 +28,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_153"]) - final aggregation over (c_birth_country_166, c_customer_id_153, c_email_address_168, c_first_name_160, c_last_name_161, c_login_167, c_preferred_cust_flag_162, d_year_199) + final hashaggregation over (c_birth_country_166, c_customer_id_153, c_email_address_168, c_first_name_160, c_last_name_161, c_login_167, c_preferred_cust_flag_162, d_year_199) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_166", "c_customer_id_153", "c_email_address_168", "c_first_name_160", "c_last_name_161", "c_login_167", "c_preferred_cust_flag_162", "d_year_199"]) - partial aggregation over (c_birth_country_166, c_customer_id_153, c_email_address_168, c_first_name_160, c_last_name_161, c_login_167, c_preferred_cust_flag_162, d_year_199) + partial hashaggregation over (c_birth_country_166, c_customer_id_153, c_email_address_168, c_first_name_160, c_last_name_161, c_login_167, c_preferred_cust_flag_162, d_year_199) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_173"]) join (INNER, REPLICATED): @@ -43,7 +43,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_152"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_260"]) - single aggregation over (c_birth_country_273, c_customer_id_260, c_email_address_275, c_first_name_267, c_last_name_268, c_login_274, c_preferred_cust_flag_269, d_year_317) + single hashaggregation over (c_birth_country_273, c_customer_id_260, c_email_address_275, c_first_name_267, c_last_name_268, c_login_274, c_preferred_cust_flag_269, d_year_317) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -51,17 +51,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_418"]) - single aggregation over (c_birth_country_431, c_customer_id_418, c_email_address_433, c_first_name_425, c_last_name_426, c_login_432, c_preferred_cust_flag_427, d_year_464) + single hashaggregation over (c_birth_country_431, c_customer_id_418, c_email_address_433, c_first_name_425, c_last_name_426, c_login_432, c_preferred_cust_flag_427, d_year_464) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_525"]) - final aggregation over (c_birth_country_538, c_customer_id_525, c_email_address_540, c_first_name_532, c_last_name_533, c_login_539, c_preferred_cust_flag_534, d_year_582) + final hashaggregation over (c_birth_country_538, c_customer_id_525, c_email_address_540, c_first_name_532, c_last_name_533, c_login_539, c_preferred_cust_flag_534, d_year_582) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_538", "c_customer_id_525", "c_email_address_540", "c_first_name_532", "c_last_name_533", "c_login_539", "c_preferred_cust_flag_534", "d_year_582"]) - partial aggregation over (c_birth_country_538, c_customer_id_525, c_email_address_540, c_first_name_532, c_last_name_533, c_login_539, c_preferred_cust_flag_534, d_year_582) + partial hashaggregation over (c_birth_country_538, c_customer_id_525, c_email_address_540, c_first_name_532, c_last_name_533, c_login_539, c_preferred_cust_flag_534, d_year_582) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_546"]) join (INNER, REPLICATED): @@ -74,17 +74,17 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_683"]) - single aggregation over (c_birth_country_696, c_customer_id_683, c_email_address_698, c_first_name_690, c_last_name_691, c_login_697, c_preferred_cust_flag_692, d_year_729) + single hashaggregation over (c_birth_country_696, c_customer_id_683, c_email_address_698, c_first_name_690, c_last_name_691, c_login_697, c_preferred_cust_flag_692, d_year_729) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_790"]) - final aggregation over (c_birth_country_803, c_customer_id_790, c_email_address_805, c_first_name_797, c_last_name_798, c_login_804, c_preferred_cust_flag_799, d_year_847) + final hashaggregation over (c_birth_country_803, c_customer_id_790, c_email_address_805, c_first_name_797, c_last_name_798, c_login_804, c_preferred_cust_flag_799, d_year_847) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_803", "c_customer_id_790", "c_email_address_805", "c_first_name_797", "c_last_name_798", "c_login_804", "c_preferred_cust_flag_799", "d_year_847"]) - partial aggregation over (c_birth_country_803, c_customer_id_790, c_email_address_805, c_first_name_797, c_last_name_798, c_login_804, c_preferred_cust_flag_799, d_year_847) + partial hashaggregation over (c_birth_country_803, c_customer_id_790, c_email_address_805, c_first_name_797, c_last_name_798, c_login_804, c_preferred_cust_flag_799, d_year_847) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_811"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.push.plan.txt index 25c8afa8a..5ff5bf6a6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.push.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + final hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country", "c_customer_id", "c_email_address", "c_first_name", "c_last_name", "c_login", "c_preferred_cust_flag", "d_year"]) - partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + partial hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -20,7 +20,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_31"]) - single aggregation over (c_birth_country_44, c_customer_id_31, c_email_address_46, c_first_name_38, c_last_name_39, c_login_45, c_preferred_cust_flag_40, d_year_56) + single hashaggregation over (c_birth_country_44, c_customer_id_31, c_email_address_46, c_first_name_38, c_last_name_39, c_login_45, c_preferred_cust_flag_40, d_year_56) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -28,10 +28,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_158"]) - final aggregation over (c_birth_country_171, c_customer_id_158, c_email_address_173, c_first_name_165, c_last_name_166, c_login_172, c_preferred_cust_flag_167, d_year_206) + final hashaggregation over (c_birth_country_171, c_customer_id_158, c_email_address_173, c_first_name_165, c_last_name_166, c_login_172, c_preferred_cust_flag_167, d_year_206) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_171", "c_customer_id_158", "c_email_address_173", "c_first_name_165", "c_last_name_166", "c_login_172", "c_preferred_cust_flag_167", "d_year_206"]) - partial aggregation over (c_birth_country_171, c_customer_id_158, c_email_address_173, c_first_name_165, c_last_name_166, c_login_172, c_preferred_cust_flag_167, d_year_206) + partial hashaggregation over (c_birth_country_171, c_customer_id_158, c_email_address_173, c_first_name_165, c_last_name_166, c_login_172, c_preferred_cust_flag_167, d_year_206) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_179"]) join (INNER, REPLICATED): @@ -43,7 +43,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_157"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_268"]) - single aggregation over (c_birth_country_281, c_customer_id_268, c_email_address_283, c_first_name_275, c_last_name_276, c_login_282, c_preferred_cust_flag_277, d_year_327) + single hashaggregation over (c_birth_country_281, c_customer_id_268, c_email_address_283, c_first_name_275, c_last_name_276, c_login_282, c_preferred_cust_flag_277, d_year_327) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -51,17 +51,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_429"]) - single aggregation over (c_birth_country_442, c_customer_id_429, c_email_address_444, c_first_name_436, c_last_name_437, c_login_443, c_preferred_cust_flag_438, d_year_477) + single hashaggregation over (c_birth_country_442, c_customer_id_429, c_email_address_444, c_first_name_436, c_last_name_437, c_login_443, c_preferred_cust_flag_438, d_year_477) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_539"]) - final aggregation over (c_birth_country_552, c_customer_id_539, c_email_address_554, c_first_name_546, c_last_name_547, c_login_553, c_preferred_cust_flag_548, d_year_598) + final hashaggregation over (c_birth_country_552, c_customer_id_539, c_email_address_554, c_first_name_546, c_last_name_547, c_login_553, c_preferred_cust_flag_548, d_year_598) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_552", "c_customer_id_539", "c_email_address_554", "c_first_name_546", "c_last_name_547", "c_login_553", "c_preferred_cust_flag_548", "d_year_598"]) - partial aggregation over (c_birth_country_552, c_customer_id_539, c_email_address_554, c_first_name_546, c_last_name_547, c_login_553, c_preferred_cust_flag_548, d_year_598) + partial hashaggregation over (c_birth_country_552, c_customer_id_539, c_email_address_554, c_first_name_546, c_last_name_547, c_login_553, c_preferred_cust_flag_548, d_year_598) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_561"]) join (INNER, REPLICATED): @@ -74,17 +74,17 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_700"]) - single aggregation over (c_birth_country_713, c_customer_id_700, c_email_address_715, c_first_name_707, c_last_name_708, c_login_714, c_preferred_cust_flag_709, d_year_748) + single hashaggregation over (c_birth_country_713, c_customer_id_700, c_email_address_715, c_first_name_707, c_last_name_708, c_login_714, c_preferred_cust_flag_709, d_year_748) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_810"]) - final aggregation over (c_birth_country_823, c_customer_id_810, c_email_address_825, c_first_name_817, c_last_name_818, c_login_824, c_preferred_cust_flag_819, d_year_869) + final hashaggregation over (c_birth_country_823, c_customer_id_810, c_email_address_825, c_first_name_817, c_last_name_818, c_login_824, c_preferred_cust_flag_819, d_year_869) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_823", "c_customer_id_810", "c_email_address_825", "c_first_name_817", "c_last_name_818", "c_login_824", "c_preferred_cust_flag_819", "d_year_869"]) - partial aggregation over (c_birth_country_823, c_customer_id_810, c_email_address_825, c_first_name_817, c_last_name_818, c_login_824, c_preferred_cust_flag_819, d_year_869) + partial hashaggregation over (c_birth_country_823, c_customer_id_810, c_email_address_825, c_first_name_817, c_last_name_818, c_login_824, c_preferred_cust_flag_819, d_year_869) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_832"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.reuse.plan.txt index 3be0fdbdd..824a482a5 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q11.reuse.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + final hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country", "c_customer_id", "c_email_address", "c_first_name", "c_last_name", "c_login", "c_preferred_cust_flag", "d_year"]) - partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) + partial hashaggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -20,7 +20,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_31"]) - single aggregation over (c_birth_country_44, c_customer_id_31, c_email_address_46, c_first_name_38, c_last_name_39, c_login_45, c_preferred_cust_flag_40, d_year_56) + single hashaggregation over (c_birth_country_44, c_customer_id_31, c_email_address_46, c_first_name_38, c_last_name_39, c_login_45, c_preferred_cust_flag_40, d_year_56) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -28,10 +28,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_158"]) - final aggregation over (c_birth_country_171, c_customer_id_158, c_email_address_173, c_first_name_165, c_last_name_166, c_login_172, c_preferred_cust_flag_167, d_year_206) + final hashaggregation over (c_birth_country_171, c_customer_id_158, c_email_address_173, c_first_name_165, c_last_name_166, c_login_172, c_preferred_cust_flag_167, d_year_206) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_171", "c_customer_id_158", "c_email_address_173", "c_first_name_165", "c_last_name_166", "c_login_172", "c_preferred_cust_flag_167", "d_year_206"]) - partial aggregation over (c_birth_country_171, c_customer_id_158, c_email_address_173, c_first_name_165, c_last_name_166, c_login_172, c_preferred_cust_flag_167, d_year_206) + partial hashaggregation over (c_birth_country_171, c_customer_id_158, c_email_address_173, c_first_name_165, c_last_name_166, c_login_172, c_preferred_cust_flag_167, d_year_206) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_179"]) join (INNER, REPLICATED): @@ -43,7 +43,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_157"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_268"]) - single aggregation over (c_birth_country_281, c_customer_id_268, c_email_address_283, c_first_name_275, c_last_name_276, c_login_282, c_preferred_cust_flag_277, d_year_327) + single hashaggregation over (c_birth_country_281, c_customer_id_268, c_email_address_283, c_first_name_275, c_last_name_276, c_login_282, c_preferred_cust_flag_277, d_year_327) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -51,17 +51,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_429"]) - single aggregation over (c_birth_country_442, c_customer_id_429, c_email_address_444, c_first_name_436, c_last_name_437, c_login_443, c_preferred_cust_flag_438, d_year_477) + single hashaggregation over (c_birth_country_442, c_customer_id_429, c_email_address_444, c_first_name_436, c_last_name_437, c_login_443, c_preferred_cust_flag_438, d_year_477) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_539"]) - final aggregation over (c_birth_country_552, c_customer_id_539, c_email_address_554, c_first_name_546, c_last_name_547, c_login_553, c_preferred_cust_flag_548, d_year_598) + final hashaggregation over (c_birth_country_552, c_customer_id_539, c_email_address_554, c_first_name_546, c_last_name_547, c_login_553, c_preferred_cust_flag_548, d_year_598) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_552", "c_customer_id_539", "c_email_address_554", "c_first_name_546", "c_last_name_547", "c_login_553", "c_preferred_cust_flag_548", "d_year_598"]) - partial aggregation over (c_birth_country_552, c_customer_id_539, c_email_address_554, c_first_name_546, c_last_name_547, c_login_553, c_preferred_cust_flag_548, d_year_598) + partial hashaggregation over (c_birth_country_552, c_customer_id_539, c_email_address_554, c_first_name_546, c_last_name_547, c_login_553, c_preferred_cust_flag_548, d_year_598) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_561"]) join (INNER, REPLICATED): @@ -74,17 +74,17 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_700"]) - single aggregation over (c_birth_country_713, c_customer_id_700, c_email_address_715, c_first_name_707, c_last_name_708, c_login_714, c_preferred_cust_flag_709, d_year_748) + single hashaggregation over (c_birth_country_713, c_customer_id_700, c_email_address_715, c_first_name_707, c_last_name_708, c_login_714, c_preferred_cust_flag_709, d_year_748) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_810"]) - final aggregation over (c_birth_country_823, c_customer_id_810, c_email_address_825, c_first_name_817, c_last_name_818, c_login_824, c_preferred_cust_flag_819, d_year_869) + final hashaggregation over (c_birth_country_823, c_customer_id_810, c_email_address_825, c_first_name_817, c_last_name_818, c_login_824, c_preferred_cust_flag_819, d_year_869) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_birth_country_823", "c_customer_id_810", "c_email_address_825", "c_first_name_817", "c_last_name_818", "c_login_824", "c_preferred_cust_flag_819", "d_year_869"]) - partial aggregation over (c_birth_country_823, c_customer_id_810, c_email_address_825, c_first_name_817, c_last_name_818, c_login_824, c_preferred_cust_flag_819, d_year_869) + partial hashaggregation over (c_birth_country_823, c_customer_id_810, c_email_address_825, c_first_name_817, c_last_name_818, c_login_824, c_preferred_cust_flag_819, d_year_869) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_832"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q12.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q12.plan.txt index 6f94c98c5..fc5623e58 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q12.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q12.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_class"]) - final aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category", "i_class", "i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q12.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q12.push.plan.txt index d9fdb6bcb..24bcb9059 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q12.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q12.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_class"]) - final aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category", "i_class", "i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk"]) scan item (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q13.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q13.plan.txt index 4101ad459..8716eb714 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q13.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q13.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q13.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q13.push.plan.txt index dd46c8d01..a9a0a6ddc 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q13.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q13.push.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan customer_demographics local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.cte.plan.txt index 0e0edf5ef..b1f84d00f 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.cte.plan.txt @@ -1,16 +1,16 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, i_brand_id$gid_1742, i_category_id$gid_1744, i_class_id$gid_1743) + final hashaggregation over (channel$gid, groupid, i_brand_id$gid_1742, i_category_id$gid_1744, i_class_id$gid_1743) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "i_brand_id$gid_1742", "i_category_id$gid_1744", "i_class_id$gid_1743"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "i_brand_id$gid_1742", "i_category_id$gid_1744", "i_class_id$gid_1743"]) - partial aggregation over (channel$gid, groupid, i_brand_id$gid_1742, i_category_id$gid_1744, i_class_id$gid_1743) + partial hashaggregation over (channel$gid, groupid, i_brand_id$gid_1742, i_category_id$gid_1744, i_class_id$gid_1743) local exchange (REPARTITION, ROUND_ROBIN, []) Filter cross join: - final aggregation over (i_brand_id, i_category_id, i_class_id) + final hashaggregation over (i_brand_id, i_category_id, i_class_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id"]) - partial aggregation over (i_brand_id, i_category_id, i_class_id) + partial hashaggregation over (i_brand_id, i_category_id, i_class_id) Filter semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) @@ -34,10 +34,10 @@ local exchange (GATHER, SINGLE, []) Filter scan item Filter - final aggregation over (expr_216, expr_217, expr_218) + final hashaggregation over (expr_216, expr_217, expr_218) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_53", "i_category_id_57", "i_class_id_55"]) - partial aggregation over (i_brand_id_53, i_category_id_57, i_class_id_55) + partial hashaggregation over (i_brand_id_53, i_category_id_57, i_class_id_55) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -50,7 +50,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_108", "i_category_id_112", "i_class_id_110"]) - partial aggregation over (i_brand_id_108, i_category_id_112, i_class_id_110) + partial hashaggregation over (i_brand_id_108, i_category_id_112, i_class_id_110) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -63,7 +63,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_167", "i_category_id_171", "i_class_id_169"]) - partial aggregation over (i_brand_id_167, i_category_id_171, i_class_id_169) + partial hashaggregation over (i_brand_id_167, i_category_id_171, i_class_id_169) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -80,10 +80,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte avg_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan store_sales @@ -91,7 +91,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan catalog_sales @@ -99,7 +99,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan web_sales @@ -109,10 +109,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim Filter cross join: - final aggregation over (i_brand_id_508, i_category_id_512, i_class_id_510) + final hashaggregation over (i_brand_id_508, i_category_id_512, i_class_id_510) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_508", "i_category_id_512", "i_class_id_510"]) - partial aggregation over (i_brand_id_508, i_category_id_512, i_class_id_510) + partial hashaggregation over (i_brand_id_508, i_category_id_512, i_class_id_510) Filter semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_482"]) @@ -136,10 +136,10 @@ local exchange (GATHER, SINGLE, []) Filter scan item Filter - final aggregation over (expr_836, expr_837, expr_838) + final hashaggregation over (expr_836, expr_837, expr_838) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_604", "i_category_id_608", "i_class_id_606"]) - partial aggregation over (i_brand_id_604, i_category_id_608, i_class_id_606) + partial hashaggregation over (i_brand_id_604, i_category_id_608, i_class_id_606) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -152,7 +152,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_694", "i_category_id_698", "i_class_id_696"]) - partial aggregation over (i_brand_id_694, i_category_id_698, i_class_id_696) + partial hashaggregation over (i_brand_id_694, i_category_id_698, i_class_id_696) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -165,7 +165,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_787", "i_category_id_791", "i_class_id_789"]) - partial aggregation over (i_brand_id_787, i_category_id_791, i_class_id_789) + partial hashaggregation over (i_brand_id_787, i_category_id_791, i_class_id_789) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -182,10 +182,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte avg_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan store_sales @@ -193,7 +193,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan catalog_sales @@ -201,7 +201,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan web_sales @@ -211,10 +211,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim Filter cross join: - final aggregation over (i_brand_id_1135, i_category_id_1139, i_class_id_1137) + final hashaggregation over (i_brand_id_1135, i_category_id_1139, i_class_id_1137) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_1135", "i_category_id_1139", "i_class_id_1137"]) - partial aggregation over (i_brand_id_1135, i_category_id_1139, i_class_id_1137) + partial hashaggregation over (i_brand_id_1135, i_category_id_1139, i_class_id_1137) Filter semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk_1097"]) @@ -238,10 +238,10 @@ local exchange (GATHER, SINGLE, []) Filter scan item Filter - final aggregation over (expr_1463, expr_1464, expr_1465) + final hashaggregation over (expr_1463, expr_1464, expr_1465) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_1231", "i_category_id_1235", "i_class_id_1233"]) - partial aggregation over (i_brand_id_1231, i_category_id_1235, i_class_id_1233) + partial hashaggregation over (i_brand_id_1231, i_category_id_1235, i_class_id_1233) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -254,7 +254,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_1321", "i_category_id_1325", "i_class_id_1323"]) - partial aggregation over (i_brand_id_1321, i_category_id_1325, i_class_id_1323) + partial hashaggregation over (i_brand_id_1321, i_category_id_1325, i_class_id_1323) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -267,7 +267,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_1414", "i_category_id_1418", "i_class_id_1416"]) - partial aggregation over (i_brand_id_1414, i_category_id_1418, i_class_id_1416) + partial hashaggregation over (i_brand_id_1414, i_category_id_1418, i_class_id_1416) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -284,10 +284,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte avg_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan store_sales @@ -295,7 +295,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan catalog_sales @@ -303,7 +303,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.plan.txt index ec4c1ac8a..36dc72222 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.plan.txt @@ -1,15 +1,15 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, i_brand_id$gid_1742, i_category_id$gid_1744, i_class_id$gid_1743) + final hashaggregation over (channel$gid, groupid, i_brand_id$gid_1742, i_category_id$gid_1744, i_class_id$gid_1743) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "i_brand_id$gid_1742", "i_category_id$gid_1744", "i_class_id$gid_1743"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "i_brand_id$gid_1742", "i_category_id$gid_1744", "i_class_id$gid_1743"]) - partial aggregation over (channel$gid, groupid, i_brand_id$gid_1742, i_category_id$gid_1744, i_class_id$gid_1743) + partial hashaggregation over (channel$gid, groupid, i_brand_id$gid_1742, i_category_id$gid_1744, i_class_id$gid_1743) local exchange (REPARTITION, ROUND_ROBIN, []) cross join: - final aggregation over (i_brand_id, i_category_id, i_class_id) + final hashaggregation over (i_brand_id, i_category_id, i_class_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id"]) - partial aggregation over (i_brand_id, i_category_id, i_class_id) + partial hashaggregation over (i_brand_id, i_category_id, i_class_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) join (INNER, REPLICATED): @@ -26,10 +26,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_8", "i_category_id_12", "i_class_id_10"]) scan item - final aggregation over (expr_216, expr_217, expr_218) + final hashaggregation over (expr_216, expr_217, expr_218) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_53", "i_category_id_57", "i_class_id_55"]) - partial aggregation over (i_brand_id_53, i_category_id_57, i_class_id_55) + partial hashaggregation over (i_brand_id_53, i_category_id_57, i_class_id_55) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -40,7 +40,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_108", "i_category_id_112", "i_class_id_110"]) - partial aggregation over (i_brand_id_108, i_category_id_112, i_class_id_110) + partial hashaggregation over (i_brand_id_108, i_category_id_112, i_class_id_110) join (INNER, REPLICATED): join (INNER, REPLICATED): scan catalog_sales @@ -51,7 +51,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_167", "i_category_id_171", "i_class_id_169"]) - partial aggregation over (i_brand_id_167, i_category_id_171, i_class_id_169) + partial hashaggregation over (i_brand_id_167, i_category_id_171, i_class_id_169) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales @@ -63,32 +63,32 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim cross join: - final aggregation over (i_brand_id_508, i_category_id_512, i_class_id_510) + final hashaggregation over (i_brand_id_508, i_category_id_512, i_class_id_510) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_508", "i_category_id_512", "i_class_id_510"]) - partial aggregation over (i_brand_id_508, i_category_id_512, i_class_id_510) + partial hashaggregation over (i_brand_id_508, i_category_id_512, i_class_id_510) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_482"]) join (INNER, REPLICATED): @@ -105,10 +105,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_559", "i_category_id_563", "i_class_id_561"]) scan item - final aggregation over (expr_836, expr_837, expr_838) + final hashaggregation over (expr_836, expr_837, expr_838) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_604", "i_category_id_608", "i_class_id_606"]) - partial aggregation over (i_brand_id_604, i_category_id_608, i_class_id_606) + partial hashaggregation over (i_brand_id_604, i_category_id_608, i_class_id_606) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -119,7 +119,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_694", "i_category_id_698", "i_class_id_696"]) - partial aggregation over (i_brand_id_694, i_category_id_698, i_class_id_696) + partial hashaggregation over (i_brand_id_694, i_category_id_698, i_class_id_696) join (INNER, REPLICATED): join (INNER, REPLICATED): scan catalog_sales @@ -130,7 +130,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_787", "i_category_id_791", "i_class_id_789"]) - partial aggregation over (i_brand_id_787, i_category_id_791, i_class_id_789) + partial hashaggregation over (i_brand_id_787, i_category_id_791, i_class_id_789) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales @@ -142,32 +142,32 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim cross join: - final aggregation over (i_brand_id_1135, i_category_id_1139, i_class_id_1137) + final hashaggregation over (i_brand_id_1135, i_category_id_1139, i_class_id_1137) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_1135", "i_category_id_1139", "i_class_id_1137"]) - partial aggregation over (i_brand_id_1135, i_category_id_1139, i_class_id_1137) + partial hashaggregation over (i_brand_id_1135, i_category_id_1139, i_class_id_1137) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk_1097"]) join (INNER, REPLICATED): @@ -184,10 +184,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_1186", "i_category_id_1190", "i_class_id_1188"]) scan item - final aggregation over (expr_1463, expr_1464, expr_1465) + final hashaggregation over (expr_1463, expr_1464, expr_1465) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_1231", "i_category_id_1235", "i_class_id_1233"]) - partial aggregation over (i_brand_id_1231, i_category_id_1235, i_class_id_1233) + partial hashaggregation over (i_brand_id_1231, i_category_id_1235, i_class_id_1233) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -198,7 +198,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_1321", "i_category_id_1325", "i_class_id_1323"]) - partial aggregation over (i_brand_id_1321, i_category_id_1325, i_class_id_1323) + partial hashaggregation over (i_brand_id_1321, i_category_id_1325, i_class_id_1323) join (INNER, REPLICATED): join (INNER, REPLICATED): scan catalog_sales @@ -209,7 +209,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_1414", "i_category_id_1418", "i_class_id_1416"]) - partial aggregation over (i_brand_id_1414, i_category_id_1418, i_class_id_1416) + partial hashaggregation over (i_brand_id_1414, i_category_id_1418, i_class_id_1416) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales @@ -221,22 +221,22 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.push.plan.txt index ffbcfa3ae..a384b9242 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_1.push.plan.txt @@ -1,15 +1,15 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, i_brand_id$gid_1798, i_category_id$gid_1800, i_class_id$gid_1799) + final hashaggregation over (channel$gid, groupid, i_brand_id$gid_1798, i_category_id$gid_1800, i_class_id$gid_1799) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "i_brand_id$gid_1798", "i_category_id$gid_1800", "i_class_id$gid_1799"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "i_brand_id$gid_1798", "i_category_id$gid_1800", "i_class_id$gid_1799"]) - partial aggregation over (channel$gid, groupid, i_brand_id$gid_1798, i_category_id$gid_1800, i_class_id$gid_1799) + partial hashaggregation over (channel$gid, groupid, i_brand_id$gid_1798, i_category_id$gid_1800, i_class_id$gid_1799) local exchange (REPARTITION, ROUND_ROBIN, []) cross join: - final aggregation over (i_brand_id, i_category_id, i_class_id) + final hashaggregation over (i_brand_id, i_category_id, i_class_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id"]) - partial aggregation over (i_brand_id, i_category_id, i_class_id) + partial hashaggregation over (i_brand_id, i_category_id, i_class_id) semijoin (PARTITIONED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk"]) @@ -26,10 +26,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_10", "i_category_id_14", "i_class_id_12"]) scan item - final aggregation over (expr_228, expr_229, expr_230) + final hashaggregation over (expr_228, expr_229, expr_230) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_57", "i_category_id_61", "i_class_id_59"]) - partial aggregation over (i_brand_id_57, i_category_id_61, i_class_id_59) + partial hashaggregation over (i_brand_id_57, i_category_id_61, i_class_id_59) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_28"]) join (INNER, REPLICATED): @@ -41,7 +41,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_50"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_115", "i_category_id_119", "i_class_id_117"]) - partial aggregation over (i_brand_id_115, i_category_id_119, i_class_id_117) + partial hashaggregation over (i_brand_id_115, i_category_id_119, i_class_id_117) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, REPLICATED): @@ -53,7 +53,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_108"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_177", "i_category_id_181", "i_class_id_179"]) - partial aggregation over (i_brand_id_177, i_category_id_181, i_class_id_179) + partial hashaggregation over (i_brand_id_177, i_category_id_181, i_class_id_179) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk"]) join (INNER, REPLICATED): @@ -66,32 +66,32 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) cross join: - final aggregation over (i_brand_id_527, i_category_id_531, i_class_id_529) + final hashaggregation over (i_brand_id_527, i_category_id_531, i_class_id_529) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_527", "i_category_id_531", "i_class_id_529"]) - partial aggregation over (i_brand_id_527, i_category_id_531, i_class_id_529) + partial hashaggregation over (i_brand_id_527, i_category_id_531, i_class_id_529) semijoin (PARTITIONED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk_520"]) @@ -108,10 +108,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_580", "i_category_id_584", "i_class_id_582"]) scan item - final aggregation over (expr_867, expr_868, expr_869) + final hashaggregation over (expr_867, expr_868, expr_869) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_627", "i_category_id_631", "i_class_id_629"]) - partial aggregation over (i_brand_id_627, i_category_id_631, i_class_id_629) + partial hashaggregation over (i_brand_id_627, i_category_id_631, i_class_id_629) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_598"]) join (INNER, REPLICATED): @@ -123,7 +123,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_620"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_720", "i_category_id_724", "i_class_id_722"]) - partial aggregation over (i_brand_id_720, i_category_id_724, i_class_id_722) + partial hashaggregation over (i_brand_id_720, i_category_id_724, i_class_id_722) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_693"]) join (INNER, REPLICATED): @@ -135,7 +135,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_713"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_816", "i_category_id_820", "i_class_id_818"]) - partial aggregation over (i_brand_id_816, i_category_id_820, i_class_id_818) + partial hashaggregation over (i_brand_id_816, i_category_id_820, i_class_id_818) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk_777"]) join (INNER, REPLICATED): @@ -148,32 +148,32 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) cross join: - final aggregation over (i_brand_id_1173, i_category_id_1177, i_class_id_1175) + final hashaggregation over (i_brand_id_1173, i_category_id_1177, i_class_id_1175) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_1173", "i_category_id_1177", "i_class_id_1175"]) - partial aggregation over (i_brand_id_1173, i_category_id_1177, i_class_id_1175) + partial hashaggregation over (i_brand_id_1173, i_category_id_1177, i_class_id_1175) semijoin (PARTITIONED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk_1166"]) @@ -190,10 +190,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_1226", "i_category_id_1230", "i_class_id_1228"]) scan item - final aggregation over (expr_1513, expr_1514, expr_1515) + final hashaggregation over (expr_1513, expr_1514, expr_1515) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_1273", "i_category_id_1277", "i_class_id_1275"]) - partial aggregation over (i_brand_id_1273, i_category_id_1277, i_class_id_1275) + partial hashaggregation over (i_brand_id_1273, i_category_id_1277, i_class_id_1275) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_1244"]) join (INNER, REPLICATED): @@ -205,7 +205,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_1266"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_1366", "i_category_id_1370", "i_class_id_1368"]) - partial aggregation over (i_brand_id_1366, i_category_id_1370, i_class_id_1368) + partial hashaggregation over (i_brand_id_1366, i_category_id_1370, i_class_id_1368) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_1339"]) join (INNER, REPLICATED): @@ -217,7 +217,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_1359"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_1462", "i_category_id_1466", "i_class_id_1464"]) - partial aggregation over (i_brand_id_1462, i_category_id_1466, i_class_id_1464) + partial hashaggregation over (i_brand_id_1462, i_category_id_1466, i_class_id_1464) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk_1423"]) join (INNER, REPLICATED): @@ -230,22 +230,22 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.cte.plan.txt index 326b94bb7..6b648ce16 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.cte.plan.txt @@ -3,10 +3,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): Filter cross join: - final aggregation over (i_brand_id, i_category_id, i_class_id) + final hashaggregation over (i_brand_id, i_category_id, i_class_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id"]) - partial aggregation over (i_brand_id, i_category_id, i_class_id) + partial hashaggregation over (i_brand_id, i_category_id, i_class_id) join (INNER, REPLICATED): Filter semijoin (PARTITIONED): @@ -31,10 +31,10 @@ local exchange (GATHER, SINGLE, []) Filter scan item Filter - final aggregation over (expr_216, expr_217, expr_218) + final hashaggregation over (expr_216, expr_217, expr_218) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_53", "i_category_id_57", "i_class_id_55"]) - partial aggregation over (i_brand_id_53, i_category_id_57, i_class_id_55) + partial hashaggregation over (i_brand_id_53, i_category_id_57, i_class_id_55) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -47,7 +47,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_108", "i_category_id_112", "i_class_id_110"]) - partial aggregation over (i_brand_id_108, i_category_id_112, i_class_id_110) + partial hashaggregation over (i_brand_id_108, i_category_id_112, i_class_id_110) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -60,7 +60,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_167", "i_category_id_171", "i_class_id_169"]) - partial aggregation over (i_brand_id_167, i_category_id_171, i_class_id_169) + partial hashaggregation over (i_brand_id_167, i_category_id_171, i_class_id_169) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -83,10 +83,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte avg_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan store_sales @@ -94,7 +94,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan catalog_sales @@ -102,7 +102,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan web_sales @@ -112,10 +112,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim Filter cross join: - final aggregation over (i_brand_id_534, i_category_id_538, i_class_id_536) + final hashaggregation over (i_brand_id_534, i_category_id_538, i_class_id_536) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_534", "i_category_id_538", "i_class_id_536"]) - partial aggregation over (i_brand_id_534, i_category_id_538, i_class_id_536) + partial hashaggregation over (i_brand_id_534, i_category_id_538, i_class_id_536) join (INNER, REPLICATED): Filter semijoin (PARTITIONED): @@ -140,10 +140,10 @@ local exchange (GATHER, SINGLE, []) Filter scan item Filter - final aggregation over (expr_862, expr_863, expr_864) + final hashaggregation over (expr_862, expr_863, expr_864) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_630", "i_category_id_634", "i_class_id_632"]) - partial aggregation over (i_brand_id_630, i_category_id_634, i_class_id_632) + partial hashaggregation over (i_brand_id_630, i_category_id_634, i_class_id_632) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -156,7 +156,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_720", "i_category_id_724", "i_class_id_722"]) - partial aggregation over (i_brand_id_720, i_category_id_724, i_class_id_722) + partial hashaggregation over (i_brand_id_720, i_category_id_724, i_class_id_722) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -169,7 +169,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_813", "i_category_id_817", "i_class_id_815"]) - partial aggregation over (i_brand_id_813, i_category_id_817, i_class_id_815) + partial hashaggregation over (i_brand_id_813, i_category_id_817, i_class_id_815) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -192,10 +192,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte avg_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan store_sales @@ -203,7 +203,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan catalog_sales @@ -211,7 +211,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): Filter scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.plan.txt index 6b3da8b0b..28c637b43 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): cross join: - final aggregation over (i_brand_id, i_category_id, i_class_id) + final hashaggregation over (i_brand_id, i_category_id, i_class_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id"]) - partial aggregation over (i_brand_id, i_category_id, i_class_id) + partial hashaggregation over (i_brand_id, i_category_id, i_class_id) join (INNER, REPLICATED): semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) @@ -23,10 +23,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_8", "i_category_id_12", "i_class_id_10"]) scan item - final aggregation over (expr_216, expr_217, expr_218) + final hashaggregation over (expr_216, expr_217, expr_218) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_53", "i_category_id_57", "i_class_id_55"]) - partial aggregation over (i_brand_id_53, i_category_id_57, i_class_id_55) + partial hashaggregation over (i_brand_id_53, i_category_id_57, i_class_id_55) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -37,7 +37,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_108", "i_category_id_112", "i_class_id_110"]) - partial aggregation over (i_brand_id_108, i_category_id_112, i_class_id_110) + partial hashaggregation over (i_brand_id_108, i_category_id_112, i_class_id_110) join (INNER, REPLICATED): join (INNER, REPLICATED): scan catalog_sales @@ -48,7 +48,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_167", "i_category_id_171", "i_class_id_169"]) - partial aggregation over (i_brand_id_167, i_category_id_171, i_class_id_169) + partial hashaggregation over (i_brand_id_167, i_category_id_171, i_class_id_169) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales @@ -65,32 +65,32 @@ local exchange (GATHER, SINGLE, []) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim cross join: - final aggregation over (i_brand_id_534, i_category_id_538, i_class_id_536) + final hashaggregation over (i_brand_id_534, i_category_id_538, i_class_id_536) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_534", "i_category_id_538", "i_class_id_536"]) - partial aggregation over (i_brand_id_534, i_category_id_538, i_class_id_536) + partial hashaggregation over (i_brand_id_534, i_category_id_538, i_class_id_536) join (INNER, REPLICATED): semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_506"]) @@ -108,10 +108,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_585", "i_category_id_589", "i_class_id_587"]) scan item - final aggregation over (expr_862, expr_863, expr_864) + final hashaggregation over (expr_862, expr_863, expr_864) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_630", "i_category_id_634", "i_class_id_632"]) - partial aggregation over (i_brand_id_630, i_category_id_634, i_class_id_632) + partial hashaggregation over (i_brand_id_630, i_category_id_634, i_class_id_632) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -122,7 +122,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_720", "i_category_id_724", "i_class_id_722"]) - partial aggregation over (i_brand_id_720, i_category_id_724, i_class_id_722) + partial hashaggregation over (i_brand_id_720, i_category_id_724, i_class_id_722) join (INNER, REPLICATED): join (INNER, REPLICATED): scan catalog_sales @@ -133,7 +133,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_813", "i_category_id_817", "i_class_id_815"]) - partial aggregation over (i_brand_id_813, i_category_id_817, i_class_id_815) + partial hashaggregation over (i_brand_id_813, i_category_id_817, i_class_id_815) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales @@ -150,22 +150,22 @@ local exchange (GATHER, SINGLE, []) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.push.plan.txt index 10d44430f..a5776693e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q14_2.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): cross join: - final aggregation over (i_brand_id, i_category_id, i_class_id) + final hashaggregation over (i_brand_id, i_category_id, i_class_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id"]) - partial aggregation over (i_brand_id, i_category_id, i_class_id) + partial hashaggregation over (i_brand_id, i_category_id, i_class_id) join (INNER, REPLICATED): semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) @@ -24,10 +24,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_10", "i_category_id_14", "i_class_id_12"]) scan item - final aggregation over (expr_228, expr_229, expr_230) + final hashaggregation over (expr_228, expr_229, expr_230) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_57", "i_category_id_61", "i_class_id_59"]) - partial aggregation over (i_brand_id_57, i_category_id_61, i_class_id_59) + partial hashaggregation over (i_brand_id_57, i_category_id_61, i_class_id_59) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_28"]) join (INNER, REPLICATED): @@ -39,7 +39,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_50"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_115", "i_category_id_119", "i_class_id_117"]) - partial aggregation over (i_brand_id_115, i_category_id_119, i_class_id_117) + partial hashaggregation over (i_brand_id_115, i_category_id_119, i_class_id_117) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, REPLICATED): @@ -51,7 +51,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_108"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_177", "i_category_id_181", "i_class_id_179"]) - partial aggregation over (i_brand_id_177, i_category_id_181, i_class_id_179) + partial hashaggregation over (i_brand_id_177, i_category_id_181, i_class_id_179) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk"]) join (INNER, REPLICATED): @@ -69,32 +69,32 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) cross join: - final aggregation over (i_brand_id_554, i_category_id_558, i_class_id_556) + final hashaggregation over (i_brand_id_554, i_category_id_558, i_class_id_556) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_554", "i_category_id_558", "i_class_id_556"]) - partial aggregation over (i_brand_id_554, i_category_id_558, i_class_id_556) + partial hashaggregation over (i_brand_id_554, i_category_id_558, i_class_id_556) join (INNER, REPLICATED): semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_525"]) @@ -113,10 +113,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_brand_id_607", "i_category_id_611", "i_class_id_609"]) scan item - final aggregation over (expr_894, expr_895, expr_896) + final hashaggregation over (expr_894, expr_895, expr_896) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_654", "i_category_id_658", "i_class_id_656"]) - partial aggregation over (i_brand_id_654, i_category_id_658, i_class_id_656) + partial hashaggregation over (i_brand_id_654, i_category_id_658, i_class_id_656) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_625"]) join (INNER, REPLICATED): @@ -128,7 +128,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_647"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_747", "i_category_id_751", "i_class_id_749"]) - partial aggregation over (i_brand_id_747, i_category_id_751, i_class_id_749) + partial hashaggregation over (i_brand_id_747, i_category_id_751, i_class_id_749) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_720"]) join (INNER, REPLICATED): @@ -140,7 +140,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_740"]) scan item remote exchange (REPARTITION, HASH, ["i_brand_id_843", "i_category_id_847", "i_class_id_845"]) - partial aggregation over (i_brand_id_843, i_category_id_847, i_class_id_845) + partial hashaggregation over (i_brand_id_843, i_category_id_847, i_class_id_845) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk_804"]) join (INNER, REPLICATED): @@ -158,22 +158,22 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q15.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q15.plan.txt index f359fbefb..033841d18 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q15.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q15.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_zip) + final hashaggregation over (ca_zip) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_zip"]) - partial aggregation over (ca_zip) + partial hashaggregation over (ca_zip) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q15.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q15.push.plan.txt index 3aa3f806d..d31c312bb 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q15.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q15.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_zip) + final hashaggregation over (ca_zip) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_zip"]) - partial aggregation over (ca_zip) + partial hashaggregation over (ca_zip) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q16.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q16.plan.txt index 8fc57e09f..2eb9a343c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q16.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q16.plan.txt @@ -1,11 +1,11 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (LEFT, PARTITIONED): - final aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique) + final hashaggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique) + partial hashaggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_order_number_17"]) scan catalog_sales @@ -24,8 +24,8 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan call_center - final aggregation over (cr_order_number) + final hashaggregation over (cr_order_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cr_order_number"]) - partial aggregation over (cr_order_number) + partial hashaggregation over (cr_order_number) scan catalog_returns diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q16.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q16.push.plan.txt index 03f8fd25c..1c9824ac9 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q16.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q16.push.plan.txt @@ -1,17 +1,17 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) join (RIGHT, PARTITIONED): - final aggregation over (cr_order_number) + final hashaggregation over (cr_order_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cr_order_number"]) - partial aggregation over (cr_order_number) + partial hashaggregation over (cr_order_number) scan catalog_returns - final aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique) + final hashaggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique) + partial hashaggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_order_number_20"]) scan catalog_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q17.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q17.plan.txt index aed83ab39..58e394f3c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q17.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q17.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_desc, i_item_id, s_state) + final hashaggregation over (i_item_desc, i_item_id, s_state) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_state"]) - partial aggregation over (i_item_desc, i_item_id, s_state) + partial hashaggregation over (i_item_desc, i_item_id, s_state) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk", "ss_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q17.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q17.push.plan.txt index c70db7efd..ed4404615 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q17.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q17.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_desc, i_item_id, s_state) + final hashaggregation over (i_item_desc, i_item_id, s_state) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_state"]) - partial aggregation over (i_item_desc, i_item_id, s_state) + partial hashaggregation over (i_item_desc, i_item_id, s_state) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q18.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q18.plan.txt index 1af346266..503c4aa0a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q18.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q18.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_country$gid, ca_county$gid, ca_state$gid, groupid, i_item_id$gid) + final hashaggregation over (ca_country$gid, ca_county$gid, ca_state$gid, groupid, i_item_id$gid) local exchange (REPARTITION, HASH, ["ca_country$gid", "ca_county$gid", "ca_state$gid", "groupid", "i_item_id$gid"]) remote exchange (REPARTITION, HASH, ["ca_country$gid", "ca_county$gid", "ca_state$gid", "groupid", "i_item_id$gid"]) - partial aggregation over (ca_country$gid, ca_county$gid, ca_state$gid, groupid, i_item_id$gid) + partial hashaggregation over (ca_country$gid, ca_county$gid, ca_state$gid, groupid, i_item_id$gid) local exchange (REPARTITION, HASH, ["ca_country", "i_item_id"]) remote exchange (REPARTITION, HASH, ["ca_country", "i_item_id"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q18.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q18.push.plan.txt index 38ac39b97..b65a9bd12 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q18.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q18.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_country$gid, ca_county$gid, ca_state$gid, groupid, i_item_id$gid) + final hashaggregation over (ca_country$gid, ca_county$gid, ca_state$gid, groupid, i_item_id$gid) local exchange (REPARTITION, HASH, ["ca_country$gid", "ca_county$gid", "ca_state$gid", "groupid", "i_item_id$gid"]) remote exchange (REPARTITION, HASH, ["ca_country$gid", "ca_county$gid", "ca_state$gid", "groupid", "i_item_id$gid"]) - partial aggregation over (ca_country$gid, ca_county$gid, ca_state$gid, groupid, i_item_id$gid) + partial hashaggregation over (ca_country$gid, ca_county$gid, ca_state$gid, groupid, i_item_id$gid) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q19.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q19.plan.txt index c500acf6f..3ac794287 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q19.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q19.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id) + final hashaggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_brand_id", "i_manufact", "i_manufact_id"]) - partial aggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id) + partial hashaggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ca_address_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q19.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q19.push.plan.txt index 1d64d6845..6e9b5cda4 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q19.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q19.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id) + final hashaggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_brand_id", "i_manufact", "i_manufact_id"]) - partial aggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id) + partial hashaggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id) join (INNER, REPLICATED): scan customer_address local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q20.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q20.plan.txt index 852a9d2a3..26a464378 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q20.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q20.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_class"]) - final aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category", "i_class", "i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan catalog_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q20.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q20.push.plan.txt index 3ea921ea2..c76958616 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q20.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q20.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_class"]) - final aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category", "i_class", "i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk"]) scan item (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q21.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q21.plan.txt index 50e40917c..f9eb6bbd7 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q21.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q21.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_id, w_warehouse_name) + final hashaggregation over (i_item_id, w_warehouse_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id", "w_warehouse_name"]) - partial aggregation over (i_item_id, w_warehouse_name) + partial hashaggregation over (i_item_id, w_warehouse_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q21.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q21.push.plan.txt index 011b9d737..1f128431a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q21.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q21.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_id, w_warehouse_name) + final hashaggregation over (i_item_id, w_warehouse_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id", "w_warehouse_name"]) - partial aggregation over (i_item_id, w_warehouse_name) + partial hashaggregation over (i_item_id, w_warehouse_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q22.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q22.plan.txt index 2fd28d3f3..61bef61b8 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q22.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q22.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid) + final hashaggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid) local exchange (REPARTITION, HASH, ["groupid", "i_brand$gid", "i_category$gid", "i_class$gid", "i_product_name$gid"]) remote exchange (REPARTITION, HASH, ["groupid", "i_brand$gid", "i_category$gid", "i_class$gid", "i_product_name$gid"]) - partial aggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid) + partial hashaggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid) local exchange (REPARTITION, HASH, ["i_brand", "i_product_name"]) remote exchange (REPARTITION, HASH, ["i_brand", "i_product_name"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q22.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q22.push.plan.txt index 758df8f2d..d75effb24 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q22.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q22.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid) + final hashaggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid) local exchange (REPARTITION, HASH, ["groupid", "i_brand$gid", "i_category$gid", "i_class$gid", "i_product_name$gid"]) remote exchange (REPARTITION, HASH, ["groupid", "i_brand$gid", "i_category$gid", "i_class$gid", "i_product_name$gid"]) - partial aggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid) + partial hashaggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid) local exchange (REPARTITION, HASH, ["i_brand", "i_product_name"]) remote exchange (REPARTITION, HASH, ["i_brand", "i_product_name"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.cte.plan.txt index 5a9e0e50c..569c516b4 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.cte.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () Filter semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) @@ -20,10 +20,10 @@ final aggregation over () remote exchange (REPARTITION, HASH, ["count_31", "d_date_3", "ss_item_sk", "substr"]) cte frequent_ss_items Filter - final aggregation over (d_date_3, ss_item_sk, substr) + final hashaggregation over (d_date_3, ss_item_sk, substr) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_3", "ss_item_sk", "substr"]) - partial aggregation over (d_date_3, ss_item_sk, substr) + partial hashaggregation over (d_date_3, ss_item_sk, substr) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -41,9 +41,9 @@ final aggregation over () cte best_ss_customer Filter cross join: - final aggregation over (ss_customer_sk_60) + final hashaggregation over (ss_customer_sk_60) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_60) + partial hashaggregation over (ss_customer_sk_60) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_60"]) scan store_sales @@ -55,13 +55,13 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte max_store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (ss_customer_sk_90) + partial hashaggregation over () + final hashaggregation over (ss_customer_sk_90) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_90) + partial hashaggregation over (ss_customer_sk_90) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_90"]) @@ -74,7 +74,7 @@ final aggregation over () remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - partial aggregation over () + partial hashaggregation over () Filter semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) @@ -93,10 +93,10 @@ final aggregation over () remote exchange (REPARTITION, HASH, ["count_304", "d_date_249", "ss_item_sk_226", "substr_297"]) cte frequent_ss_items Filter - final aggregation over (d_date_249, ss_item_sk_226, substr_297) + final hashaggregation over (d_date_249, ss_item_sk_226, substr_297) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_249", "ss_item_sk_226", "substr_297"]) - partial aggregation over (d_date_249, ss_item_sk_226, substr_297) + partial hashaggregation over (d_date_249, ss_item_sk_226, substr_297) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -114,9 +114,9 @@ final aggregation over () cte best_ss_customer Filter cross join: - final aggregation over (ss_customer_sk_335) + final hashaggregation over (ss_customer_sk_335) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_335) + partial hashaggregation over (ss_customer_sk_335) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_335"]) scan store_sales @@ -128,13 +128,13 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte max_store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (ss_customer_sk_385) + partial hashaggregation over () + final hashaggregation over (ss_customer_sk_385) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_385) + partial hashaggregation over (ss_customer_sk_385) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_385"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.plan.txt index fea373b3c..fb566ee05 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) semijoin (PARTITIONED): @@ -13,10 +13,10 @@ final aggregation over () scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - final aggregation over (d_date_3, ss_item_sk, substr) + final hashaggregation over (d_date_3, ss_item_sk, substr) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_3", "ss_item_sk", "substr"]) - partial aggregation over (d_date_3, ss_item_sk, substr) + partial hashaggregation over (d_date_3, ss_item_sk, substr) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -29,9 +29,9 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk_60"]) cross join: - final aggregation over (ss_customer_sk_60) + final hashaggregation over (ss_customer_sk_60) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_60) + partial hashaggregation over (ss_customer_sk_60) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_60"]) scan store_sales @@ -40,13 +40,13 @@ final aggregation over () scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (ss_customer_sk_90) + partial hashaggregation over () + final hashaggregation over (ss_customer_sk_90) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_90) + partial hashaggregation over (ss_customer_sk_90) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_90"]) join (INNER, REPLICATED): @@ -57,7 +57,7 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_110"]) scan customer - partial aggregation over () + partial hashaggregation over () semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) semijoin (PARTITIONED): @@ -69,10 +69,10 @@ final aggregation over () scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk_226"]) - final aggregation over (d_date_249, ss_item_sk_226, substr_297) + final hashaggregation over (d_date_249, ss_item_sk_226, substr_297) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_249", "ss_item_sk_226", "substr_297"]) - partial aggregation over (d_date_249, ss_item_sk_226, substr_297) + partial hashaggregation over (d_date_249, ss_item_sk_226, substr_297) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -85,9 +85,9 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk_335"]) cross join: - final aggregation over (ss_customer_sk_335) + final hashaggregation over (ss_customer_sk_335) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_335) + partial hashaggregation over (ss_customer_sk_335) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_335"]) scan store_sales @@ -96,13 +96,13 @@ final aggregation over () scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (ss_customer_sk_385) + partial hashaggregation over () + final hashaggregation over (ss_customer_sk_385) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_385) + partial hashaggregation over (ss_customer_sk_385) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_385"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.push.plan.txt index 939e31f95..06fdba791 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_1.push.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) semijoin (PARTITIONED): @@ -13,9 +13,9 @@ final aggregation over () scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk"]) - final aggregation over (d_date_5, i_item_sk, substr) + final hashaggregation over (d_date_5, i_item_sk, substr) local exchange (GATHER, SINGLE, []) - partial aggregation over (d_date_5, i_item_sk, substr) + partial hashaggregation over (d_date_5, i_item_sk, substr) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) join (INNER, REPLICATED): @@ -29,10 +29,10 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) cross join: - final aggregation over (c_customer_sk) + final hashaggregation over (c_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) - partial aggregation over (c_customer_sk) + partial hashaggregation over (c_customer_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -40,14 +40,14 @@ final aggregation over () scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_customer_sk_117) + partial hashaggregation over () + final hashaggregation over (c_customer_sk_117) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_117"]) - partial aggregation over (c_customer_sk_117) + partial hashaggregation over (c_customer_sk_117) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -57,7 +57,7 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer - partial aggregation over () + partial hashaggregation over () semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) semijoin (PARTITIONED): @@ -69,9 +69,9 @@ final aggregation over () scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_288"]) - final aggregation over (d_date_261, i_item_sk_288, substr_311) + final hashaggregation over (d_date_261, i_item_sk_288, substr_311) local exchange (GATHER, SINGLE, []) - partial aggregation over (d_date_261, i_item_sk_288, substr_311) + partial hashaggregation over (d_date_261, i_item_sk_288, substr_311) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_237"]) join (INNER, REPLICATED): @@ -85,10 +85,10 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_370"]) cross join: - final aggregation over (c_customer_sk_370) + final hashaggregation over (c_customer_sk_370) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_370"]) - partial aggregation over (c_customer_sk_370) + partial hashaggregation over (c_customer_sk_370) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -96,14 +96,14 @@ final aggregation over () scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_customer_sk_422) + partial hashaggregation over () + final hashaggregation over (c_customer_sk_422) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_422"]) - partial aggregation over (c_customer_sk_422) + partial hashaggregation over (c_customer_sk_422) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.cte.plan.txt index 2630f3e8e..3c6cd7029 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.cte.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (c_first_name, c_last_name) + final hashaggregation over (c_first_name, c_last_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name"]) - partial aggregation over (c_first_name, c_last_name) + partial hashaggregation over (c_first_name, c_last_name) Filter semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) @@ -28,10 +28,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["count_31", "d_date_3", "ss_item_sk", "substr"]) cte frequent_ss_items Filter - final aggregation over (d_date_3, ss_item_sk, substr) + final hashaggregation over (d_date_3, ss_item_sk, substr) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_3", "ss_item_sk", "substr"]) - partial aggregation over (d_date_3, ss_item_sk, substr) + partial hashaggregation over (d_date_3, ss_item_sk, substr) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -49,9 +49,9 @@ local exchange (GATHER, SINGLE, []) cte best_ss_customer Filter cross join: - final aggregation over (ss_customer_sk_60) + final hashaggregation over (ss_customer_sk_60) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_60) + partial hashaggregation over (ss_customer_sk_60) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_60"]) scan store_sales @@ -63,13 +63,13 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte max_store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (ss_customer_sk_108) + partial hashaggregation over () + final hashaggregation over (ss_customer_sk_108) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_108) + partial hashaggregation over (ss_customer_sk_108) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_108"]) @@ -82,10 +82,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) Filter scan date_dim - final aggregation over (c_first_name_229, c_last_name_230) + final hashaggregation over (c_first_name_229, c_last_name_230) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_229", "c_last_name_230"]) - partial aggregation over (c_first_name_229, c_last_name_230) + partial hashaggregation over (c_first_name_229, c_last_name_230) Filter semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) @@ -110,10 +110,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["count_348", "d_date_293", "ss_item_sk_270", "substr_341"]) cte frequent_ss_items Filter - final aggregation over (d_date_293, ss_item_sk_270, substr_341) + final hashaggregation over (d_date_293, ss_item_sk_270, substr_341) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_293", "ss_item_sk_270", "substr_341"]) - partial aggregation over (d_date_293, ss_item_sk_270, substr_341) + partial hashaggregation over (d_date_293, ss_item_sk_270, substr_341) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -131,9 +131,9 @@ local exchange (GATHER, SINGLE, []) cte best_ss_customer Filter cross join: - final aggregation over (ss_customer_sk_379) + final hashaggregation over (ss_customer_sk_379) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_379) + partial hashaggregation over (ss_customer_sk_379) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_379"]) scan store_sales @@ -145,13 +145,13 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cte max_store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (ss_customer_sk_429) + partial hashaggregation over () + final hashaggregation over (ss_customer_sk_429) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_429) + partial hashaggregation over (ss_customer_sk_429) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_429"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.plan.txt index 39b23c22e..193163053 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (c_first_name, c_last_name) + final hashaggregation over (c_first_name, c_last_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name"]) - partial aggregation over (c_first_name, c_last_name) + partial hashaggregation over (c_first_name, c_last_name) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) semijoin (PARTITIONED): @@ -20,10 +20,10 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - final aggregation over (d_date_3, ss_item_sk, substr) + final hashaggregation over (d_date_3, ss_item_sk, substr) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_3", "ss_item_sk", "substr"]) - partial aggregation over (d_date_3, ss_item_sk, substr) + partial hashaggregation over (d_date_3, ss_item_sk, substr) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -36,9 +36,9 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk_60"]) cross join: - final aggregation over (ss_customer_sk_60) + final hashaggregation over (ss_customer_sk_60) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_60) + partial hashaggregation over (ss_customer_sk_60) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_60"]) scan store_sales @@ -47,13 +47,13 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (ss_customer_sk_108) + partial hashaggregation over () + final hashaggregation over (ss_customer_sk_108) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_108) + partial hashaggregation over (ss_customer_sk_108) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_108"]) join (INNER, REPLICATED): @@ -64,10 +64,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_128"]) scan customer - final aggregation over (c_first_name_229, c_last_name_230) + final hashaggregation over (c_first_name_229, c_last_name_230) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_229", "c_last_name_230"]) - partial aggregation over (c_first_name_229, c_last_name_230) + partial hashaggregation over (c_first_name_229, c_last_name_230) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) semijoin (PARTITIONED): @@ -84,10 +84,10 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk_270"]) - final aggregation over (d_date_293, ss_item_sk_270, substr_341) + final hashaggregation over (d_date_293, ss_item_sk_270, substr_341) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_293", "ss_item_sk_270", "substr_341"]) - partial aggregation over (d_date_293, ss_item_sk_270, substr_341) + partial hashaggregation over (d_date_293, ss_item_sk_270, substr_341) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -100,9 +100,9 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk_379"]) cross join: - final aggregation over (ss_customer_sk_379) + final hashaggregation over (ss_customer_sk_379) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_379) + partial hashaggregation over (ss_customer_sk_379) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_379"]) scan store_sales @@ -111,13 +111,13 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (ss_customer_sk_429) + partial hashaggregation over () + final hashaggregation over (ss_customer_sk_429) local exchange (GATHER, SINGLE, []) - partial aggregation over (ss_customer_sk_429) + partial hashaggregation over (ss_customer_sk_429) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_429"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.push.plan.txt index d670834fb..8c1cfec2a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q23_2.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (c_first_name, c_last_name) + final hashaggregation over (c_first_name, c_last_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name"]) - partial aggregation over (c_first_name, c_last_name) + partial hashaggregation over (c_first_name, c_last_name) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) semijoin (PARTITIONED): @@ -20,9 +20,9 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk"]) - final aggregation over (d_date_6, i_item_sk, substr) + final hashaggregation over (d_date_6, i_item_sk, substr) local exchange (GATHER, SINGLE, []) - partial aggregation over (d_date_6, i_item_sk, substr) + partial hashaggregation over (d_date_6, i_item_sk, substr) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) join (INNER, REPLICATED): @@ -36,10 +36,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_86"]) cross join: - final aggregation over (c_customer_sk_86) + final hashaggregation over (c_customer_sk_86) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_86"]) - partial aggregation over (c_customer_sk_86) + partial hashaggregation over (c_customer_sk_86) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -47,14 +47,14 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_customer_sk_136) + partial hashaggregation over () + final hashaggregation over (c_customer_sk_136) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_136"]) - partial aggregation over (c_customer_sk_136) + partial hashaggregation over (c_customer_sk_136) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -64,10 +64,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer - final aggregation over (c_first_name_240, c_last_name_241) + final hashaggregation over (c_first_name_240, c_last_name_241) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_240", "c_last_name_241"]) - partial aggregation over (c_first_name_240, c_last_name_241) + partial hashaggregation over (c_first_name_240, c_last_name_241) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) semijoin (PARTITIONED): @@ -84,9 +84,9 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_334"]) - final aggregation over (d_date_307, i_item_sk_334, substr_357) + final hashaggregation over (d_date_307, i_item_sk_334, substr_357) local exchange (GATHER, SINGLE, []) - partial aggregation over (d_date_307, i_item_sk_334, substr_357) + partial hashaggregation over (d_date_307, i_item_sk_334, substr_357) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_283"]) join (INNER, REPLICATED): @@ -100,10 +100,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_416"]) cross join: - final aggregation over (c_customer_sk_416) + final hashaggregation over (c_customer_sk_416) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_416"]) - partial aggregation over (c_customer_sk_416) + partial hashaggregation over (c_customer_sk_416) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -111,14 +111,14 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_customer_sk_468) + partial hashaggregation over () + final hashaggregation over (c_customer_sk_468) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_468"]) - partial aggregation over (c_customer_sk_468) + partial hashaggregation over (c_customer_sk_468) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.cte.plan.txt index 28fa69925..f3e7ebef6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.cte.plan.txt @@ -1,17 +1,17 @@ remote exchange (GATHER, SINGLE, []) Filter cross join: - final aggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, s_store_name) Filter remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name", "sum"]) cte ssales - final aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + final hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["c_birth_country", "s_zip"]) join (INNER, PARTITIONED): @@ -40,16 +40,16 @@ remote exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () remote exchange (REPARTITION, HASH, ["c_first_name_181", "c_last_name_182", "ca_state_199", "i_color_168", "i_current_price_156", "i_manager_id_171", "i_size_166", "i_units_169", "s_state_146", "s_store_name_127", "sum_225"]) cte ssales - final aggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) + final hashaggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_181", "c_last_name_182", "ca_state_199", "i_color_168", "i_current_price_156", "i_manager_id_171", "i_size_166", "i_units_169", "s_state_146", "s_store_name_127"]) - partial aggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) + partial hashaggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["c_birth_country_187", "s_zip_147"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.plan.txt index f591a7648..a51faaf67 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.plan.txt @@ -1,13 +1,13 @@ remote exchange (GATHER, SINGLE, []) cross join: - final aggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, s_store_name) - final aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) @@ -33,14 +33,14 @@ remote exchange (GATHER, SINGLE, []) scan store local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) + partial hashaggregation over () + final hashaggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_181", "c_last_name_182", "ca_state_199", "i_color_168", "i_current_price_156", "i_manager_id_171", "i_size_166", "i_units_169", "s_state_146", "s_store_name_127"]) - partial aggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) + partial hashaggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["c_birth_country_187", "s_zip_147"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.push.plan.txt index 81c7cf2cd..2b3c2df7d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.push.plan.txt @@ -1,13 +1,13 @@ remote exchange (GATHER, SINGLE, []) cross join: - final aggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, s_store_name) - final aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -31,14 +31,14 @@ remote exchange (GATHER, SINGLE, []) scan item (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) + partial hashaggregation over () + final hashaggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_190", "c_last_name_191", "ca_state_209", "i_color_176", "i_current_price_164", "i_manager_id_179", "i_size_174", "i_units_177", "s_state_153", "s_store_name_134"]) - partial aggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) + partial hashaggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk_159"]) scan item diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.reuse.plan.txt index 6a32938b0..03e058f9a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_1.reuse.plan.txt @@ -1,13 +1,13 @@ remote exchange (GATHER, SINGLE, []) cross join: - final aggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, s_store_name) - final aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -31,14 +31,14 @@ remote exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) + partial hashaggregation over () + final hashaggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_190", "c_last_name_191", "ca_state_209", "i_color_176", "i_current_price_164", "i_manager_id_179", "i_size_174", "i_units_177", "s_state_153", "s_store_name_134"]) - partial aggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) + partial hashaggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk_159"]) scan item diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.cte.plan.txt index 28fa69925..f3e7ebef6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.cte.plan.txt @@ -1,17 +1,17 @@ remote exchange (GATHER, SINGLE, []) Filter cross join: - final aggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, s_store_name) Filter remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name", "sum"]) cte ssales - final aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + final hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["c_birth_country", "s_zip"]) join (INNER, PARTITIONED): @@ -40,16 +40,16 @@ remote exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () remote exchange (REPARTITION, HASH, ["c_first_name_181", "c_last_name_182", "ca_state_199", "i_color_168", "i_current_price_156", "i_manager_id_171", "i_size_166", "i_units_169", "s_state_146", "s_store_name_127", "sum_225"]) cte ssales - final aggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) + final hashaggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_181", "c_last_name_182", "ca_state_199", "i_color_168", "i_current_price_156", "i_manager_id_171", "i_size_166", "i_units_169", "s_state_146", "s_store_name_127"]) - partial aggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) + partial hashaggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["c_birth_country_187", "s_zip_147"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.plan.txt index f591a7648..a51faaf67 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.plan.txt @@ -1,13 +1,13 @@ remote exchange (GATHER, SINGLE, []) cross join: - final aggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, s_store_name) - final aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) @@ -33,14 +33,14 @@ remote exchange (GATHER, SINGLE, []) scan store local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) + partial hashaggregation over () + final hashaggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_181", "c_last_name_182", "ca_state_199", "i_color_168", "i_current_price_156", "i_manager_id_171", "i_size_166", "i_units_169", "s_state_146", "s_store_name_127"]) - partial aggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) + partial hashaggregation over (c_first_name_181, c_last_name_182, ca_state_199, i_color_168, i_current_price_156, i_manager_id_171, i_size_166, i_units_169, s_state_146, s_store_name_127) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["c_birth_country_187", "s_zip_147"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.push.plan.txt index 81c7cf2cd..2b3c2df7d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.push.plan.txt @@ -1,13 +1,13 @@ remote exchange (GATHER, SINGLE, []) cross join: - final aggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, s_store_name) - final aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -31,14 +31,14 @@ remote exchange (GATHER, SINGLE, []) scan item (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) + partial hashaggregation over () + final hashaggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_190", "c_last_name_191", "ca_state_209", "i_color_176", "i_current_price_164", "i_manager_id_179", "i_size_174", "i_units_177", "s_state_153", "s_store_name_134"]) - partial aggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) + partial hashaggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk_159"]) scan item diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.reuse.plan.txt index 6a32938b0..03e058f9a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q24_2.reuse.plan.txt @@ -1,13 +1,13 @@ remote exchange (GATHER, SINGLE, []) cross join: - final aggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, s_store_name) - final aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, s_store_name) + final hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "ca_state", "i_color", "i_current_price", "i_manager_id", "i_size", "i_units", "s_state", "s_store_name"]) - partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) + partial hashaggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name) join (INNER, REPLICATED): scan store_returns local exchange (GATHER, SINGLE, []) @@ -31,14 +31,14 @@ remote exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) + partial hashaggregation over () + final hashaggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_190", "c_last_name_191", "ca_state_209", "i_color_176", "i_current_price_164", "i_manager_id_179", "i_size_174", "i_units_177", "s_state_153", "s_store_name_134"]) - partial aggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) + partial hashaggregation over (c_first_name_190, c_last_name_191, ca_state_209, i_color_176, i_current_price_164, i_manager_id_179, i_size_174, i_units_177, s_state_153, s_store_name_134) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk_159"]) scan item diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q25.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q25.plan.txt index 6ada8064b..9b502358b 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q25.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q25.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) + final hashaggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_store_id", "s_store_name"]) - partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) + partial hashaggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk", "ss_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q25.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q25.push.plan.txt index 1f0671ce4..cdd393dac 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q25.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q25.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) + final hashaggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_store_id", "s_store_name"]) - partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) + partial hashaggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q26.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q26.plan.txt index 555bb67d3..880950403 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q26.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q26.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q26.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q26.push.plan.txt index 3c5adcebc..3188cff24 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q26.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q26.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q27.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q27.plan.txt index ed0e2e73e..d3d4729d5 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q27.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q27.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (groupid, i_item_id$gid, s_state$gid) + final hashaggregation over (groupid, i_item_id$gid, s_state$gid) local exchange (REPARTITION, HASH, ["groupid", "i_item_id$gid", "s_state$gid"]) remote exchange (REPARTITION, HASH, ["groupid", "i_item_id$gid", "s_state$gid"]) - partial aggregation over (groupid, i_item_id$gid, s_state$gid) + partial hashaggregation over (groupid, i_item_id$gid, s_state$gid) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q27.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q27.push.plan.txt index b7b1d58ed..a70a6407d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q27.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q27.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (groupid, i_item_id$gid, s_state$gid) + final hashaggregation over (groupid, i_item_id$gid, s_state$gid) local exchange (REPARTITION, HASH, ["groupid", "i_item_id$gid", "s_state$gid"]) remote exchange (REPARTITION, HASH, ["groupid", "i_item_id$gid", "s_state$gid"]) - partial aggregation over (groupid, i_item_id$gid, s_state$gid) + partial hashaggregation over (groupid, i_item_id$gid, s_state$gid) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q28.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q28.plan.txt index f8b139b70..3aa9314d9 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q28.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q28.plan.txt @@ -3,45 +3,45 @@ cross join: cross join: cross join: cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price"]) scan store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_27"]) scan store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_68"]) scan store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_109"]) scan store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_150"]) scan store_sales - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_191"]) scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q28.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q28.push.plan.txt index 0080969ad..f87de8125 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q28.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q28.push.plan.txt @@ -3,45 +3,45 @@ cross join: cross join: cross join: cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_27"]) scan store_sales (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price"]) scan store_sales (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_69"]) scan store_sales (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_111"]) scan store_sales (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_153"]) scan store_sales (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_list_price_195"]) scan store_sales (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q29.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q29.plan.txt index 0480fc46f..cbd0467f0 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q29.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q29.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) + final hashaggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_store_id", "s_store_name"]) - partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) + partial hashaggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q29.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q29.push.plan.txt index 5c06f3053..a6222c9d5 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q29.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q29.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) + final hashaggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_store_id", "s_store_name"]) - partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) + partial hashaggregation over (i_item_desc, i_item_id, s_store_id, s_store_name) join (INNER, REPLICATED): join (INNER, REPLICATED): scan catalog_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.cte.plan.txt index 2f1b9e6e7..c2decaffa 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.cte.plan.txt @@ -6,10 +6,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, REPLICATED): remote exchange (REPARTITION, HASH, ["ca_state", "sum", "wr_returning_customer_sk"]) cte customer_total_return - final aggregation over (ca_state, wr_returning_customer_sk) + final hashaggregation over (ca_state, wr_returning_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "wr_returning_customer_sk"]) - partial aggregation over (ca_state, wr_returning_customer_sk) + partial hashaggregation over (ca_state, wr_returning_customer_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk"]) join (INNER, REPLICATED): @@ -33,16 +33,16 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (ca_state_90) + final hashaggregation over (ca_state_90) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_90"]) - partial aggregation over (ca_state_90) + partial hashaggregation over (ca_state_90) remote exchange (REPARTITION, HASH, ["ca_state_90", "sum_100", "wr_returning_customer_sk_37"]) cte customer_total_return - final aggregation over (ca_state_90, wr_returning_customer_sk_37) + final hashaggregation over (ca_state_90, wr_returning_customer_sk_37) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_90", "wr_returning_customer_sk_37"]) - partial aggregation over (ca_state_90, wr_returning_customer_sk_37) + partial hashaggregation over (ca_state_90, wr_returning_customer_sk_37) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk_40"]) join (INNER, REPLICATED): @@ -57,5 +57,5 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.plan.txt index 8953e9982..d2e35d816 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.plan.txt @@ -3,10 +3,10 @@ local exchange (GATHER, SINGLE, []) cross join: join (LEFT, REPLICATED): join (INNER, REPLICATED): - final aggregation over (ca_state, wr_returning_customer_sk) + final hashaggregation over (ca_state, wr_returning_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "wr_returning_customer_sk"]) - partial aggregation over (ca_state, wr_returning_customer_sk) + partial hashaggregation over (ca_state, wr_returning_customer_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk"]) join (INNER, REPLICATED): @@ -26,14 +26,14 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (ca_state_90) + final hashaggregation over (ca_state_90) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_90"]) - partial aggregation over (ca_state_90) - final aggregation over (ca_state_90, wr_returning_customer_sk_37) + partial hashaggregation over (ca_state_90) + final hashaggregation over (ca_state_90, wr_returning_customer_sk_37) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_90", "wr_returning_customer_sk_37"]) - partial aggregation over (ca_state_90, wr_returning_customer_sk_37) + partial hashaggregation over (ca_state_90, wr_returning_customer_sk_37) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk_40"]) join (INNER, REPLICATED): @@ -46,5 +46,5 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.push.plan.txt index e62f82f36..8315a987e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.push.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state"]) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_returning_customer_sk"]) - final aggregation over (ca_state, wr_returning_customer_sk) + final hashaggregation over (ca_state, wr_returning_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "wr_returning_customer_sk"]) - partial aggregation over (ca_state, wr_returning_customer_sk) + partial hashaggregation over (ca_state, wr_returning_customer_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ca_address_sk"]) scan customer_address @@ -27,14 +27,14 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer_address (pushdown = true) - final aggregation over (ca_state_96) + final hashaggregation over (ca_state_96) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_96"]) - partial aggregation over (ca_state_96) - final aggregation over (ca_state_96, wr_returning_customer_sk_41) + partial hashaggregation over (ca_state_96) + final hashaggregation over (ca_state_96, wr_returning_customer_sk_41) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_96", "wr_returning_customer_sk_41"]) - partial aggregation over (ca_state_96, wr_returning_customer_sk_41) + partial hashaggregation over (ca_state_96, wr_returning_customer_sk_41) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ca_address_sk_88"]) scan customer_address @@ -48,5 +48,5 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.reuse.plan.txt index 4bef584bd..38c636f95 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q30.reuse.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state"]) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_returning_customer_sk"]) - final aggregation over (ca_state, wr_returning_customer_sk) + final hashaggregation over (ca_state, wr_returning_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "wr_returning_customer_sk"]) - partial aggregation over (ca_state, wr_returning_customer_sk) + partial hashaggregation over (ca_state, wr_returning_customer_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ca_address_sk"]) scan customer_address @@ -27,14 +27,14 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer_address - final aggregation over (ca_state_96) + final hashaggregation over (ca_state_96) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_96"]) - partial aggregation over (ca_state_96) - final aggregation over (ca_state_96, wr_returning_customer_sk_41) + partial hashaggregation over (ca_state_96) + final hashaggregation over (ca_state_96, wr_returning_customer_sk_41) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_96", "wr_returning_customer_sk_41"]) - partial aggregation over (ca_state_96, wr_returning_customer_sk_41) + partial hashaggregation over (ca_state_96, wr_returning_customer_sk_41) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ca_address_sk_88"]) scan customer_address @@ -48,5 +48,5 @@ local exchange (GATHER, SINGLE, []) ReuseTableScan date_dim (Producer) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.cte.plan.txt index 208bbd9b8..1581405d6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.cte.plan.txt @@ -8,10 +8,10 @@ remote exchange (GATHER, SINGLE, []) Filter remote exchange (REPARTITION, HASH, ["ca_county_81", "d_qoy_56", "d_year_52", "sum_94"]) cte ss - final aggregation over (ca_county_81, d_qoy_56, d_year_52) + final hashaggregation over (ca_county_81, d_qoy_56, d_year_52) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_81", "d_qoy_56", "d_year_52"]) - partial aggregation over (ca_county_81, d_qoy_56, d_year_52) + partial hashaggregation over (ca_county_81, d_qoy_56, d_year_52) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk_29"]) join (INNER, REPLICATED): @@ -30,10 +30,10 @@ remote exchange (GATHER, SINGLE, []) Filter remote exchange (REPARTITION, HASH, ["ca_county_173", "d_qoy_148", "d_year_144", "sum_186"]) cte ss - final aggregation over (ca_county_173, d_qoy_148, d_year_144) + final hashaggregation over (ca_county_173, d_qoy_148, d_year_144) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_173", "d_qoy_148", "d_year_144"]) - partial aggregation over (ca_county_173, d_qoy_148, d_year_144) + partial hashaggregation over (ca_county_173, d_qoy_148, d_year_144) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk_121"]) join (INNER, REPLICATED): @@ -53,10 +53,10 @@ remote exchange (GATHER, SINGLE, []) Filter remote exchange (REPARTITION, HASH, ["ca_county_345", "d_qoy_320", "d_year_316", "sum_358"]) cte ws - final aggregation over (ca_county_345, d_qoy_320, d_year_316) + final hashaggregation over (ca_county_345, d_qoy_320, d_year_316) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_345", "d_qoy_320", "d_year_316"]) - partial aggregation over (ca_county_345, d_qoy_320, d_year_316) + partial hashaggregation over (ca_county_345, d_qoy_320, d_year_316) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_283"]) join (INNER, REPLICATED): @@ -74,10 +74,10 @@ remote exchange (GATHER, SINGLE, []) Filter remote exchange (REPARTITION, HASH, ["ca_county_448", "d_qoy_423", "d_year_419", "sum_461"]) cte ws - final aggregation over (ca_county_448, d_qoy_423, d_year_419) + final hashaggregation over (ca_county_448, d_qoy_423, d_year_419) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_448", "d_qoy_423", "d_year_419"]) - partial aggregation over (ca_county_448, d_qoy_423, d_year_419) + partial hashaggregation over (ca_county_448, d_qoy_423, d_year_419) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_386"]) join (INNER, REPLICATED): @@ -96,10 +96,10 @@ remote exchange (GATHER, SINGLE, []) Filter remote exchange (REPARTITION, HASH, ["ca_county", "d_qoy", "d_year", "sum"]) cte ss - final aggregation over (ca_county, d_qoy, d_year) + final hashaggregation over (ca_county, d_qoy, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county", "d_qoy", "d_year"]) - partial aggregation over (ca_county, d_qoy, d_year) + partial hashaggregation over (ca_county, d_qoy, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk"]) join (INNER, REPLICATED): @@ -118,10 +118,10 @@ remote exchange (GATHER, SINGLE, []) Filter remote exchange (REPARTITION, HASH, ["ca_county_242", "d_qoy_217", "d_year_213", "sum_255"]) cte ws - final aggregation over (ca_county_242, d_qoy_217, d_year_213) + final hashaggregation over (ca_county_242, d_qoy_217, d_year_213) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_242", "d_qoy_217", "d_year_213"]) - partial aggregation over (ca_county_242, d_qoy_217, d_year_213) + partial hashaggregation over (ca_county_242, d_qoy_217, d_year_213) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.plan.txt index 10deb26af..3fd7ec4aa 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.plan.txt @@ -4,10 +4,10 @@ remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): join (INNER, PARTITIONED): join (INNER, PARTITIONED): - final aggregation over (ca_county_81, d_qoy_56, d_year_52) + final hashaggregation over (ca_county_81, d_qoy_56, d_year_52) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_81", "d_qoy_56", "d_year_52"]) - partial aggregation over (ca_county_81, d_qoy_56, d_year_52) + partial hashaggregation over (ca_county_81, d_qoy_56, d_year_52) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk_29"]) join (INNER, REPLICATED): @@ -20,10 +20,10 @@ remote exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_173", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}]) - final aggregation over (ca_county_173, d_qoy_148, d_year_144) + final hashaggregation over (ca_county_173, d_qoy_148, d_year_144) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_173", "d_qoy_148", "d_year_144"]) - partial aggregation over (ca_county_173, d_qoy_148, d_year_144) + partial hashaggregation over (ca_county_173, d_qoy_148, d_year_144) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk_121"]) join (INNER, REPLICATED): @@ -35,10 +35,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_address_sk_166"]) scan customer_address join (INNER, PARTITIONED): - final aggregation over (ca_county_345, d_qoy_320, d_year_316) + final hashaggregation over (ca_county_345, d_qoy_320, d_year_316) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_345", "d_qoy_320", "d_year_316"]) - partial aggregation over (ca_county_345, d_qoy_320, d_year_316) + partial hashaggregation over (ca_county_345, d_qoy_320, d_year_316) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_283"]) join (INNER, REPLICATED): @@ -51,10 +51,10 @@ remote exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_448", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}]) - final aggregation over (ca_county_448, d_qoy_423, d_year_419) + final hashaggregation over (ca_county_448, d_qoy_423, d_year_419) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_448", "d_qoy_423", "d_year_419"]) - partial aggregation over (ca_county_448, d_qoy_423, d_year_419) + partial hashaggregation over (ca_county_448, d_qoy_423, d_year_419) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_386"]) join (INNER, REPLICATED): @@ -68,10 +68,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}]) join (INNER, PARTITIONED): - final aggregation over (ca_county, d_qoy, d_year) + final hashaggregation over (ca_county, d_qoy, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county", "d_qoy", "d_year"]) - partial aggregation over (ca_county, d_qoy, d_year) + partial hashaggregation over (ca_county, d_qoy, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk"]) join (INNER, REPLICATED): @@ -82,10 +82,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_address_sk"]) scan customer_address - final aggregation over (ca_county_242, d_qoy_217, d_year_213) + final hashaggregation over (ca_county_242, d_qoy_217, d_year_213) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_242", "d_qoy_217", "d_year_213"]) - partial aggregation over (ca_county_242, d_qoy_217, d_year_213) + partial hashaggregation over (ca_county_242, d_qoy_217, d_year_213) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.push.plan.txt index 4580851be..fe0c74ca4 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.push.plan.txt @@ -4,10 +4,10 @@ remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): join (INNER, PARTITIONED): join (INNER, PARTITIONED): - final aggregation over (ca_county_85, d_qoy_59, d_year_55) + final hashaggregation over (ca_county_85, d_qoy_59, d_year_55) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_85", "d_qoy_59", "d_year_55"]) - partial aggregation over (ca_county_85, d_qoy_59, d_year_55) + partial hashaggregation over (ca_county_85, d_qoy_59, d_year_55) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk_31"]) join (INNER, REPLICATED): @@ -20,10 +20,10 @@ remote exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_180", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}]) - final aggregation over (ca_county_180, d_qoy_154, d_year_150) + final hashaggregation over (ca_county_180, d_qoy_154, d_year_150) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_180", "d_qoy_154", "d_year_150"]) - partial aggregation over (ca_county_180, d_qoy_154, d_year_150) + partial hashaggregation over (ca_county_180, d_qoy_154, d_year_150) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk_126"]) join (INNER, REPLICATED): @@ -35,10 +35,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_address_sk_173"]) scan customer_address join (INNER, PARTITIONED): - final aggregation over (ca_county_358, d_qoy_332, d_year_328) + final hashaggregation over (ca_county_358, d_qoy_332, d_year_328) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_358", "d_qoy_332", "d_year_328"]) - partial aggregation over (ca_county_358, d_qoy_332, d_year_328) + partial hashaggregation over (ca_county_358, d_qoy_332, d_year_328) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_294"]) join (INNER, REPLICATED): @@ -51,10 +51,10 @@ remote exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_464", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}]) - final aggregation over (ca_county_464, d_qoy_438, d_year_434) + final hashaggregation over (ca_county_464, d_qoy_438, d_year_434) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_464", "d_qoy_438", "d_year_434"]) - partial aggregation over (ca_county_464, d_qoy_438, d_year_434) + partial hashaggregation over (ca_county_464, d_qoy_438, d_year_434) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_400"]) join (INNER, REPLICATED): @@ -68,10 +68,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}]) join (INNER, PARTITIONED): - final aggregation over (ca_county, d_qoy, d_year) + final hashaggregation over (ca_county, d_qoy, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county", "d_qoy", "d_year"]) - partial aggregation over (ca_county, d_qoy, d_year) + partial hashaggregation over (ca_county, d_qoy, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk"]) join (INNER, REPLICATED): @@ -82,10 +82,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_address_sk"]) scan customer_address - final aggregation over (ca_county_252, d_qoy_226, d_year_222) + final hashaggregation over (ca_county_252, d_qoy_226, d_year_222) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_county_252", "d_qoy_226", "d_year_222"]) - partial aggregation over (ca_county_252, d_qoy_226, d_year_222) + partial hashaggregation over (ca_county_252, d_qoy_226, d_year_222) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q32.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q32.plan.txt index bcf3e2fd6..445d99901 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q32.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q32.plan.txt @@ -1,13 +1,13 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () cross join: join (RIGHT, PARTITIONED): - final aggregation over (cs_item_sk_15) + final hashaggregation over (cs_item_sk_15) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk_15"]) - partial aggregation over (cs_item_sk_15) + partial hashaggregation over (cs_item_sk_15) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) @@ -26,5 +26,5 @@ final aggregation over () scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q32.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q32.push.plan.txt index 7c926d7ef..fe0652e02 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q32.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q32.push.plan.txt @@ -1,13 +1,13 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () cross join: join (RIGHT, PARTITIONED): - final aggregation over (cs_item_sk_17) + final hashaggregation over (cs_item_sk_17) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk_17"]) - partial aggregation over (cs_item_sk_17) + partial hashaggregation over (cs_item_sk_17) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) @@ -27,5 +27,5 @@ final aggregation over () scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.plan.txt index df84a9229..b30955bc2 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_266) + final hashaggregation over (expr_266) local exchange (REPARTITION, HASH, ["expr_266"]) - partial aggregation over (i_manufact_id) - final aggregation over (i_manufact_id) + partial hashaggregation over (i_manufact_id) + final hashaggregation over (i_manufact_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id) + partial hashaggregation over (i_manufact_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id"]) join (INNER, REPLICATED): @@ -24,10 +24,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_id_14"]) scan item - partial aggregation over (i_manufact_id_98) - final aggregation over (i_manufact_id_98) + partial hashaggregation over (i_manufact_id_98) + final hashaggregation over (i_manufact_id_98) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id_98) + partial hashaggregation over (i_manufact_id_98) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id_98"]) join (INNER, REPLICATED): @@ -46,10 +46,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_id_121"]) scan item - partial aggregation over (i_manufact_id_210) - final aggregation over (i_manufact_id_210) + partial hashaggregation over (i_manufact_id_210) + final hashaggregation over (i_manufact_id_210) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id_210) + partial hashaggregation over (i_manufact_id_210) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id_210"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.push.plan.txt index 5c906498d..133592397 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.push.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_280) + final hashaggregation over (expr_280) local exchange (REPARTITION, HASH, ["expr_280"]) - partial aggregation over (i_manufact_id) - final aggregation over (i_manufact_id) + partial hashaggregation over (i_manufact_id) + final hashaggregation over (i_manufact_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id) + partial hashaggregation over (i_manufact_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id"]) join (INNER, PARTITIONED): @@ -25,10 +25,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_id_17"]) scan item (pushdown = true) - partial aggregation over (i_manufact_id_105) - final aggregation over (i_manufact_id_105) + partial hashaggregation over (i_manufact_id_105) + final hashaggregation over (i_manufact_id_105) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id_105) + partial hashaggregation over (i_manufact_id_105) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id_105"]) join (INNER, PARTITIONED): @@ -48,10 +48,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_id_129"]) scan item (pushdown = true) - partial aggregation over (i_manufact_id_222) - final aggregation over (i_manufact_id_222) + partial hashaggregation over (i_manufact_id_222) + final hashaggregation over (i_manufact_id_222) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id_222) + partial hashaggregation over (i_manufact_id_222) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id_222"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.reuse.plan.txt index a4bf9eb22..d58e6be1e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q33.reuse.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_280) + final hashaggregation over (expr_280) local exchange (REPARTITION, HASH, ["expr_280"]) - partial aggregation over (i_manufact_id) - final aggregation over (i_manufact_id) + partial hashaggregation over (i_manufact_id) + final hashaggregation over (i_manufact_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id) + partial hashaggregation over (i_manufact_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id"]) join (INNER, PARTITIONED): @@ -25,10 +25,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_id_17"]) ReuseTableScan item (Consumer) - partial aggregation over (i_manufact_id_105) - final aggregation over (i_manufact_id_105) + partial hashaggregation over (i_manufact_id_105) + final hashaggregation over (i_manufact_id_105) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id_105) + partial hashaggregation over (i_manufact_id_105) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id_105"]) join (INNER, PARTITIONED): @@ -48,10 +48,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_id_129"]) ReuseTableScan item (Consumer) - partial aggregation over (i_manufact_id_222) - final aggregation over (i_manufact_id_222) + partial hashaggregation over (i_manufact_id_222) + final hashaggregation over (i_manufact_id_222) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_manufact_id_222) + partial hashaggregation over (i_manufact_id_222) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_manufact_id_222"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q34.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q34.plan.txt index 580389d9f..778f4252a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q34.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q34.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (ss_customer_sk, ss_ticket_number) + final hashaggregation over (ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_ticket_number"]) - partial aggregation over (ss_customer_sk, ss_ticket_number) + partial hashaggregation over (ss_customer_sk, ss_ticket_number) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q34.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q34.push.plan.txt index 26e4c4eca..56184d7b0 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q34.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q34.push.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (ss_customer_sk, ss_ticket_number) + final hashaggregation over (ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_ticket_number"]) - partial aggregation over (ss_customer_sk, ss_ticket_number) + partial hashaggregation over (ss_customer_sk, ss_ticket_number) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q35.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q35.plan.txt index 2bfeeeb54..c941144d0 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q35.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q35.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_state, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_gender, cd_marital_status) + final hashaggregation over (ca_state, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_gender, cd_marital_status) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "cd_dep_college_count", "cd_dep_count", "cd_dep_employed_count", "cd_gender", "cd_marital_status"]) - partial aggregation over (ca_state, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_gender, cd_marital_status) + partial hashaggregation over (ca_state, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_gender, cd_marital_status) join (LEFT, PARTITIONED): join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["c_customer_sk"]) @@ -17,10 +17,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_address_sk"]) scan customer_address - final aggregation over (ss_customer_sk) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -29,19 +29,19 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cd_demo_sk"]) scan customer_demographics - final aggregation over (ws_bill_customer_sk) + final hashaggregation over (ws_bill_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) - partial aggregation over (ws_bill_customer_sk) + partial hashaggregation over (ws_bill_customer_sk) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - final aggregation over (cs_ship_customer_sk) + final hashaggregation over (cs_ship_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"]) - partial aggregation over (cs_ship_customer_sk) + partial hashaggregation over (cs_ship_customer_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q35.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q35.push.plan.txt index 1f7389e5e..bd64ff87a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q35.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q35.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_state, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_gender, cd_marital_status) + final hashaggregation over (ca_state, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_gender, cd_marital_status) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "cd_dep_college_count", "cd_dep_count", "cd_dep_employed_count", "cd_gender", "cd_marital_status"]) - partial aggregation over (ca_state, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_gender, cd_marital_status) + partial hashaggregation over (ca_state, cd_dep_college_count, cd_dep_count, cd_dep_employed_count, cd_gender, cd_marital_status) join (LEFT, PARTITIONED): join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["c_customer_sk"]) @@ -19,28 +19,28 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_address_sk"]) scan customer_address - final aggregation over (ss_customer_sk) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - final aggregation over (ws_bill_customer_sk) + final hashaggregation over (ws_bill_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) - partial aggregation over (ws_bill_customer_sk) + partial hashaggregation over (ws_bill_customer_sk) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - final aggregation over (cs_ship_customer_sk) + final hashaggregation over (cs_ship_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"]) - partial aggregation over (cs_ship_customer_sk) + partial hashaggregation over (cs_ship_customer_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q36.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q36.plan.txt index 5fab99375..9233c8747 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q36.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q36.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_13", "expr_14"]) - final aggregation over (groupid, i_category$gid, i_class$gid) + final hashaggregation over (groupid, i_category$gid, i_class$gid) local exchange (REPARTITION, HASH, ["groupid", "i_category$gid", "i_class$gid"]) remote exchange (REPARTITION, HASH, ["groupid", "i_category$gid", "i_class$gid"]) - partial aggregation over (groupid, i_category$gid, i_class$gid) + partial hashaggregation over (groupid, i_category$gid, i_class$gid) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q36.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q36.push.plan.txt index 33c46b653..c0ed8d71d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q36.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q36.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_16", "expr_17"]) - final aggregation over (groupid, i_category$gid, i_class$gid) + final hashaggregation over (groupid, i_category$gid, i_class$gid) local exchange (REPARTITION, HASH, ["groupid", "i_category$gid", "i_class$gid"]) remote exchange (REPARTITION, HASH, ["groupid", "i_category$gid", "i_class$gid"]) - partial aggregation over (groupid, i_category$gid, i_class$gid) + partial hashaggregation over (groupid, i_category$gid, i_class$gid) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q37.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q37.plan.txt index e1157d3a5..ebc54d7ac 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q37.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q37.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_current_price, i_item_desc, i_item_id) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q37.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q37.push.plan.txt index da239d371..aef7ed669 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q37.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q37.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_current_price, i_item_desc, i_item_id) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q38.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q38.plan.txt index 22d7dcf9a..1ec59f3d2 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q38.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q38.plan.txt @@ -1,14 +1,14 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_first_name_114, c_last_name_113, d_date_115) + partial hashaggregation over () + final hashaggregation over (c_first_name_114, c_last_name_113, d_date_115) local exchange (REPARTITION, HASH, ["c_first_name_114", "c_last_name_113", "d_date_115"]) - partial aggregation over (c_first_name, c_last_name, d_date) - final aggregation over (c_first_name, c_last_name, d_date) + partial hashaggregation over (c_first_name, c_last_name, d_date) + final hashaggregation over (c_first_name, c_last_name, d_date) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "d_date"]) - partial aggregation over (c_first_name, c_last_name, d_date) + partial hashaggregation over (c_first_name, c_last_name, d_date) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -19,11 +19,11 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer - partial aggregation over (c_first_name_42, c_last_name_43, d_date_8) - final aggregation over (c_first_name_42, c_last_name_43, d_date_8) + partial hashaggregation over (c_first_name_42, c_last_name_43, d_date_8) + final hashaggregation over (c_first_name_42, c_last_name_43, d_date_8) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_42", "c_last_name_43", "d_date_8"]) - partial aggregation over (c_first_name_42, c_last_name_43, d_date_8) + partial hashaggregation over (c_first_name_42, c_last_name_43, d_date_8) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) join (INNER, REPLICATED): @@ -34,11 +34,11 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_34"]) scan customer - partial aggregation over (c_first_name_97, c_last_name_98, d_date_63) - final aggregation over (c_first_name_97, c_last_name_98, d_date_63) + partial hashaggregation over (c_first_name_97, c_last_name_98, d_date_63) + final hashaggregation over (c_first_name_97, c_last_name_98, d_date_63) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_97", "c_last_name_98", "d_date_63"]) - partial aggregation over (c_first_name_97, c_last_name_98, d_date_63) + partial hashaggregation over (c_first_name_97, c_last_name_98, d_date_63) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q38.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q38.push.plan.txt index 302ee0fb4..a416e74b0 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q38.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q38.push.plan.txt @@ -1,14 +1,14 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (c_first_name_122, c_last_name_121, d_date_123) + partial hashaggregation over () + final hashaggregation over (c_first_name_122, c_last_name_121, d_date_123) local exchange (REPARTITION, HASH, ["c_first_name_122", "c_last_name_121", "d_date_123"]) - partial aggregation over (c_first_name, c_last_name, d_date) - final aggregation over (c_first_name, c_last_name, d_date) + partial hashaggregation over (c_first_name, c_last_name, d_date) + final hashaggregation over (c_first_name, c_last_name, d_date) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "d_date"]) - partial aggregation over (c_first_name, c_last_name, d_date) + partial hashaggregation over (c_first_name, c_last_name, d_date) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -19,11 +19,11 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer - partial aggregation over (c_first_name_46, c_last_name_47, d_date_11) - final aggregation over (c_first_name_46, c_last_name_47, d_date_11) + partial hashaggregation over (c_first_name_46, c_last_name_47, d_date_11) + final hashaggregation over (c_first_name_46, c_last_name_47, d_date_11) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_46", "c_last_name_47", "d_date_11"]) - partial aggregation over (c_first_name_46, c_last_name_47, d_date_11) + partial hashaggregation over (c_first_name_46, c_last_name_47, d_date_11) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) join (INNER, REPLICATED): @@ -34,11 +34,11 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_38"]) scan customer - partial aggregation over (c_first_name_104, c_last_name_105, d_date_69) - final aggregation over (c_first_name_104, c_last_name_105, d_date_69) + partial hashaggregation over (c_first_name_104, c_last_name_105, d_date_69) + final hashaggregation over (c_first_name_104, c_last_name_105, d_date_69) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_104", "c_last_name_105", "d_date_69"]) - partial aggregation over (c_first_name_104, c_last_name_105, d_date_69) + partial hashaggregation over (c_first_name_104, c_last_name_105, d_date_69) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.cte.plan.txt index 5324faa0b..a62372f78 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.cte.plan.txt @@ -7,10 +7,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["avg", "d_moy", "expr_33", "inv_item_sk", "inv_warehouse_sk", "stddev_samp", "w_warehouse_name"]) cte inv Filter - final aggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) + final hashaggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "inv_item_sk", "inv_warehouse_sk", "w_warehouse_name"]) - partial aggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) + partial hashaggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -32,10 +32,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["avg_141", "d_moy_110", "expr_172", "inv_item_sk_63", "inv_warehouse_sk_64", "stddev_samp_140", "w_warehouse_name_90"]) cte inv Filter - final aggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) + final hashaggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_110", "inv_item_sk_63", "inv_warehouse_sk_64", "w_warehouse_name_90"]) - partial aggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) + partial hashaggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.plan.txt index 54aae1efe..ce6c21fe7 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["inv_item_sk", "inv_warehouse_sk"]) - final aggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) + final hashaggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "inv_item_sk", "inv_warehouse_sk", "w_warehouse_name"]) - partial aggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) + partial hashaggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -22,10 +22,10 @@ remote exchange (GATHER, SINGLE, []) scan warehouse local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["inv_item_sk_63", "inv_warehouse_sk_64"]) - final aggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) + final hashaggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_110", "inv_item_sk_63", "inv_warehouse_sk_64", "w_warehouse_name_90"]) - partial aggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) + partial hashaggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.push.plan.txt index c81e0935d..f00bbb8cb 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_1.push.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk", "w_warehouse_sk"]) - final aggregation over (d_moy, i_item_sk, w_warehouse_name, w_warehouse_sk) + final hashaggregation over (d_moy, i_item_sk, w_warehouse_name, w_warehouse_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "i_item_sk", "w_warehouse_name", "w_warehouse_sk"]) - partial aggregation over (d_moy, i_item_sk, w_warehouse_name, w_warehouse_sk) + partial hashaggregation over (d_moy, i_item_sk, w_warehouse_name, w_warehouse_sk) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -22,10 +22,10 @@ remote exchange (GATHER, SINGLE, []) scan warehouse local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_70", "w_warehouse_sk_93"]) - final aggregation over (d_moy_116, i_item_sk_70, w_warehouse_name_95, w_warehouse_sk_93) + final hashaggregation over (d_moy_116, i_item_sk_70, w_warehouse_name_95, w_warehouse_sk_93) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_116", "i_item_sk_70", "w_warehouse_name_95", "w_warehouse_sk_93"]) - partial aggregation over (d_moy_116, i_item_sk_70, w_warehouse_name_95, w_warehouse_sk_93) + partial hashaggregation over (d_moy_116, i_item_sk_70, w_warehouse_name_95, w_warehouse_sk_93) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.cte.plan.txt index 21bc58990..af2aa33d7 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.cte.plan.txt @@ -4,10 +4,10 @@ remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["inv_item_sk", "inv_warehouse_sk"]) Filter - final aggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) + final hashaggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "inv_item_sk", "inv_warehouse_sk", "w_warehouse_name"]) - partial aggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) + partial hashaggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -28,10 +28,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["inv_item_sk_63", "inv_warehouse_sk_64"]) Filter - final aggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) + final hashaggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_110", "inv_item_sk_63", "inv_warehouse_sk_64", "w_warehouse_name_90"]) - partial aggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) + partial hashaggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.plan.txt index 54aae1efe..ce6c21fe7 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["inv_item_sk", "inv_warehouse_sk"]) - final aggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) + final hashaggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "inv_item_sk", "inv_warehouse_sk", "w_warehouse_name"]) - partial aggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) + partial hashaggregation over (d_moy, inv_item_sk, inv_warehouse_sk, w_warehouse_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -22,10 +22,10 @@ remote exchange (GATHER, SINGLE, []) scan warehouse local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["inv_item_sk_63", "inv_warehouse_sk_64"]) - final aggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) + final hashaggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_110", "inv_item_sk_63", "inv_warehouse_sk_64", "w_warehouse_name_90"]) - partial aggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) + partial hashaggregation over (d_moy_110, inv_item_sk_63, inv_warehouse_sk_64, w_warehouse_name_90) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.push.plan.txt index c81e0935d..f00bbb8cb 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q39_2.push.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk", "w_warehouse_sk"]) - final aggregation over (d_moy, i_item_sk, w_warehouse_name, w_warehouse_sk) + final hashaggregation over (d_moy, i_item_sk, w_warehouse_name, w_warehouse_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "i_item_sk", "w_warehouse_name", "w_warehouse_sk"]) - partial aggregation over (d_moy, i_item_sk, w_warehouse_name, w_warehouse_sk) + partial hashaggregation over (d_moy, i_item_sk, w_warehouse_name, w_warehouse_sk) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -22,10 +22,10 @@ remote exchange (GATHER, SINGLE, []) scan warehouse local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk_70", "w_warehouse_sk_93"]) - final aggregation over (d_moy_116, i_item_sk_70, w_warehouse_name_95, w_warehouse_sk_93) + final hashaggregation over (d_moy_116, i_item_sk_70, w_warehouse_name_95, w_warehouse_sk_93) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_116", "i_item_sk_70", "w_warehouse_name_95", "w_warehouse_sk_93"]) - partial aggregation over (d_moy_116, i_item_sk_70, w_warehouse_name_95, w_warehouse_sk_93) + partial hashaggregation over (d_moy_116, i_item_sk_70, w_warehouse_name_95, w_warehouse_sk_93) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q40.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q40.plan.txt index 266142fc4..5af562ff9 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q40.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q40.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_id, w_state) + final hashaggregation over (i_item_id, w_state) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id", "w_state"]) - partial aggregation over (i_item_id, w_state) + partial hashaggregation over (i_item_id, w_state) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q40.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q40.push.plan.txt index 42e273039..4d903e82c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q40.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q40.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_item_id, w_state) + final hashaggregation over (i_item_id, w_state) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id", "w_state"]) - partial aggregation over (i_item_id, w_state) + partial hashaggregation over (i_item_id, w_state) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q41.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q41.plan.txt index 6dcbeb51b..52fe6fc18 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q41.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q41.plan.txt @@ -1,20 +1,20 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_product_name) + final hashaggregation over (i_product_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_product_name"]) - partial aggregation over (i_product_name) + partial hashaggregation over (i_product_name) cross join: join (LEFT, REPLICATED): scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (i_manufact_14) + final hashaggregation over (i_manufact_14) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_14"]) - partial aggregation over (i_manufact_14) + partial hashaggregation over (i_manufact_14) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q41.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q41.push.plan.txt index e3ee34620..4978dafe6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q41.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q41.push.plan.txt @@ -1,20 +1,20 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_product_name) + final hashaggregation over (i_product_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_product_name"]) - partial aggregation over (i_product_name) + partial hashaggregation over (i_product_name) cross join: join (LEFT, REPLICATED): scan item (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (i_manufact_14) + final hashaggregation over (i_manufact_14) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_14"]) - partial aggregation over (i_manufact_14) + partial hashaggregation over (i_manufact_14) scan item (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q42.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q42.plan.txt index 87792b40c..10d0229ce 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q42.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q42.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_year, i_category, i_category_id) + final hashaggregation over (d_year, i_category, i_category_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "i_category", "i_category_id"]) - partial aggregation over (d_year, i_category, i_category_id) + partial hashaggregation over (d_year, i_category, i_category_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q42.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q42.push.plan.txt index 1352be388..f9fe04193 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q42.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q42.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_year, i_category, i_category_id) + final hashaggregation over (d_year, i_category, i_category_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "i_category", "i_category_id"]) - partial aggregation over (d_year, i_category, i_category_id) + partial hashaggregation over (d_year, i_category, i_category_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q43.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q43.plan.txt index 001dbca10..60b6612a1 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q43.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q43.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (s_store_id, s_store_name) + final hashaggregation over (s_store_id, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id", "s_store_name"]) - partial aggregation over (s_store_id, s_store_name) + partial hashaggregation over (s_store_id, s_store_name) join (INNER, REPLICATED): scan date_dim local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q43.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q43.push.plan.txt index 998b8bd8d..4c4d9e922 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q43.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q43.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (s_store_id, s_store_name) + final hashaggregation over (s_store_id, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id", "s_store_name"]) - partial aggregation over (s_store_id, s_store_name) + partial hashaggregation over (s_store_id, s_store_name) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.plan.txt index d7f796253..06d8f616f 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.plan.txt @@ -9,38 +9,38 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cross join: - final aggregation over (ss_item_sk) + final hashaggregation over (ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - partial aggregation over (ss_item_sk) + partial hashaggregation over (ss_item_sk) scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_store_sk_13) + final hashaggregation over (ss_store_sk_13) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk_13"]) - partial aggregation over (ss_store_sk_13) + partial hashaggregation over (ss_store_sk_13) scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["rank_131"]) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) cross join: - final aggregation over (ss_item_sk_61) + final hashaggregation over (ss_item_sk_61) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk_61"]) - partial aggregation over (ss_item_sk_61) + partial hashaggregation over (ss_item_sk_61) scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_store_sk_98) + final hashaggregation over (ss_store_sk_98) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk_98"]) - partial aggregation over (ss_store_sk_98) + partial hashaggregation over (ss_store_sk_98) scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.push.plan.txt index 52f56a5f2..fca967d63 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.push.plan.txt @@ -9,34 +9,34 @@ local exchange (GATHER, SINGLE, []) cross join: local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_store_sk_13) + final hashaggregation over (ss_store_sk_13) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk_13"]) - partial aggregation over (ss_store_sk_13) + partial hashaggregation over (ss_store_sk_13) scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_item_sk) + final hashaggregation over (ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - partial aggregation over (ss_item_sk) + partial hashaggregation over (ss_item_sk) scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["rank_134"]) cross join: local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_store_sk_100) + final hashaggregation over (ss_store_sk_100) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk_100"]) - partial aggregation over (ss_store_sk_100) + partial hashaggregation over (ss_store_sk_100) scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_item_sk_62) + final hashaggregation over (ss_item_sk_62) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk_62"]) - partial aggregation over (ss_item_sk_62) + partial hashaggregation over (ss_item_sk_62) scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.reuse.plan.txt index be1671e86..73bbbd030 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q44.reuse.plan.txt @@ -9,34 +9,34 @@ local exchange (GATHER, SINGLE, []) cross join: local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_store_sk_13) + final hashaggregation over (ss_store_sk_13) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk_13"]) - partial aggregation over (ss_store_sk_13) + partial hashaggregation over (ss_store_sk_13) scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_item_sk) + final hashaggregation over (ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - partial aggregation over (ss_item_sk) + partial hashaggregation over (ss_item_sk) ReuseTableScan store_sales (Consumer) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["rank_134"]) cross join: local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_store_sk_100) + final hashaggregation over (ss_store_sk_100) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk_100"]) - partial aggregation over (ss_store_sk_100) + partial hashaggregation over (ss_store_sk_100) scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_item_sk_62) + final hashaggregation over (ss_item_sk_62) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk_62"]) - partial aggregation over (ss_item_sk_62) + partial hashaggregation over (ss_item_sk_62) ReuseTableScan store_sales (Producer) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q45.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q45.plan.txt index 6af761393..9b394e847 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q45.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q45.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_city, ca_zip) + final hashaggregation over (ca_city, ca_zip) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_city", "ca_zip"]) - partial aggregation over (ca_city, ca_zip) + partial hashaggregation over (ca_city, ca_zip) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q45.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q45.push.plan.txt index 0533aaba7..e080f5c83 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q45.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q45.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ca_city, ca_zip) + final hashaggregation over (ca_city, ca_zip) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_city", "ca_zip"]) - partial aggregation over (ca_city, ca_zip) + partial hashaggregation over (ca_city, ca_zip) semijoin (REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q46.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q46.plan.txt index cfaebe1d1..8299d1024 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q46.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q46.plan.txt @@ -2,9 +2,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + final hashaggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + partial hashaggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q46.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q46.push.plan.txt index e75f7e31f..1c165c16a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q46.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q46.push.plan.txt @@ -2,9 +2,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + final hashaggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + partial hashaggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.cte.plan.txt index 284f47961..a82f6f310 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.cte.plan.txt @@ -7,10 +7,10 @@ local exchange (GATHER, SINGLE, []) cte v1 local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_73", "i_category_77", "s_company_name_155", "s_store_name_143"]) - final aggregation over (d_moy_118, d_year_116, i_brand_73, i_category_77, s_company_name_155, s_store_name_143) + final hashaggregation over (d_moy_118, d_year_116, i_brand_73, i_category_77, s_company_name_155, s_store_name_143) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_118", "d_year_116", "i_brand_73", "i_category_77", "s_company_name_155", "s_store_name_143"]) - partial aggregation over (d_moy_118, d_year_116, i_brand_73, i_category_77, s_company_name_155, s_store_name_143) + partial hashaggregation over (d_moy_118, d_year_116, i_brand_73, i_category_77, s_company_name_155, s_store_name_143) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -33,10 +33,10 @@ local exchange (GATHER, SINGLE, []) cte v1 local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_category", "s_company_name", "s_store_name"]) - final aggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) + final hashaggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "d_year", "i_brand", "i_category", "s_company_name", "s_store_name"]) - partial aggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) + partial hashaggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -58,10 +58,10 @@ local exchange (GATHER, SINGLE, []) cte v1 local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_250", "i_category_254", "s_company_name_332", "s_store_name_320"]) - final aggregation over (d_moy_295, d_year_293, i_brand_250, i_category_254, s_company_name_332, s_store_name_320) + final hashaggregation over (d_moy_295, d_year_293, i_brand_250, i_category_254, s_company_name_332, s_store_name_320) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_295", "d_year_293", "i_brand_250", "i_category_254", "s_company_name_332", "s_store_name_320"]) - partial aggregation over (d_moy_295, d_year_293, i_brand_250, i_category_254, s_company_name_332, s_store_name_320) + partial hashaggregation over (d_moy_295, d_year_293, i_brand_250, i_category_254, s_company_name_332, s_store_name_320) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.plan.txt index 52a068317..a9c054530 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.plan.txt @@ -4,10 +4,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_category", "s_company_name", "s_store_name"]) - final aggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) + final hashaggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "d_year", "i_brand", "i_category", "s_company_name", "s_store_name"]) - partial aggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) + partial hashaggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -23,10 +23,10 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_73", "i_category_77", "s_company_name_155", "s_store_name_143"]) - final aggregation over (d_moy_118, d_year_116, i_brand_73, i_category_77, s_company_name_155, s_store_name_143) + final hashaggregation over (d_moy_118, d_year_116, i_brand_73, i_category_77, s_company_name_155, s_store_name_143) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_118", "d_year_116", "i_brand_73", "i_category_77", "s_company_name_155", "s_store_name_143"]) - partial aggregation over (d_moy_118, d_year_116, i_brand_73, i_category_77, s_company_name_155, s_store_name_143) + partial hashaggregation over (d_moy_118, d_year_116, i_brand_73, i_category_77, s_company_name_155, s_store_name_143) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -42,10 +42,10 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_250", "i_category_254", "s_company_name_332", "s_store_name_320"]) - final aggregation over (d_moy_295, d_year_293, i_brand_250, i_category_254, s_company_name_332, s_store_name_320) + final hashaggregation over (d_moy_295, d_year_293, i_brand_250, i_category_254, s_company_name_332, s_store_name_320) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_295", "d_year_293", "i_brand_250", "i_category_254", "s_company_name_332", "s_store_name_320"]) - partial aggregation over (d_moy_295, d_year_293, i_brand_250, i_category_254, s_company_name_332, s_store_name_320) + partial hashaggregation over (d_moy_295, d_year_293, i_brand_250, i_category_254, s_company_name_332, s_store_name_320) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.push.plan.txt index 053784a29..d6c5cc78e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q47.push.plan.txt @@ -4,10 +4,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_category", "s_company_name", "s_store_name"]) - final aggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) + final hashaggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "d_year", "i_brand", "i_category", "s_company_name", "s_store_name"]) - partial aggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) + partial hashaggregation over (d_moy, d_year, i_brand, i_category, s_company_name, s_store_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -23,10 +23,10 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_76", "i_category_80", "s_company_name_161", "s_store_name_149"]) - final aggregation over (d_moy_123, d_year_121, i_brand_76, i_category_80, s_company_name_161, s_store_name_149) + final hashaggregation over (d_moy_123, d_year_121, i_brand_76, i_category_80, s_company_name_161, s_store_name_149) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_123", "d_year_121", "i_brand_76", "i_category_80", "s_company_name_161", "s_store_name_149"]) - partial aggregation over (d_moy_123, d_year_121, i_brand_76, i_category_80, s_company_name_161, s_store_name_149) + partial hashaggregation over (d_moy_123, d_year_121, i_brand_76, i_category_80, s_company_name_161, s_store_name_149) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -42,10 +42,10 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_257", "i_category_261", "s_company_name_342", "s_store_name_330"]) - final aggregation over (d_moy_304, d_year_302, i_brand_257, i_category_261, s_company_name_342, s_store_name_330) + final hashaggregation over (d_moy_304, d_year_302, i_brand_257, i_category_261, s_company_name_342, s_store_name_330) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy_304", "d_year_302", "i_brand_257", "i_category_261", "s_company_name_342", "s_store_name_330"]) - partial aggregation over (d_moy_304, d_year_302, i_brand_257, i_category_261, s_company_name_342, s_store_name_330) + partial hashaggregation over (d_moy_304, d_year_302, i_brand_257, i_category_261, s_company_name_342, s_store_name_330) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q48.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q48.plan.txt index a9e080182..d782af839 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q48.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q48.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q48.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q48.push.plan.txt index 360ad118d..00982ad59 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q48.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q48.push.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan customer_demographics local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q49.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q49.plan.txt index 3b696df4b..e2cfbd010 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q49.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q49.plan.txt @@ -1,15 +1,15 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_244, expr_245, expr_246, expr_247, expr_248) + final hashaggregation over (expr_244, expr_245, expr_246, expr_247, expr_248) local exchange (REPARTITION, HASH, ["expr_244", "expr_245", "expr_246", "expr_247", "expr_248"]) remote exchange (REPARTITION, HASH, ["expr_12", "expr_53", "rank", "rank_23", "wr_item_sk"]) - partial aggregation over (expr_12, expr_53, rank, rank_23, wr_item_sk) + partial hashaggregation over (expr_12, expr_53, rank, rank_23, wr_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (wr_item_sk) + final hashaggregation over (wr_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["wr_item_sk"]) - partial aggregation over (wr_item_sk) + partial hashaggregation over (wr_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"]) scan web_returns @@ -21,13 +21,13 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim remote exchange (REPARTITION, HASH, ["cr_item_sk", "expr_101", "expr_136", "rank_113", "rank_115"]) - partial aggregation over (cr_item_sk, expr_101, expr_136, rank_113, rank_115) + partial hashaggregation over (cr_item_sk, expr_101, expr_136, rank_113, rank_115) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (cr_item_sk) + final hashaggregation over (cr_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cr_item_sk"]) - partial aggregation over (cr_item_sk) + partial hashaggregation over (cr_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"]) scan catalog_returns @@ -39,13 +39,13 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim remote exchange (REPARTITION, HASH, ["expr_194", "expr_239", "rank_206", "rank_208", "sr_item_sk"]) - partial aggregation over (expr_194, expr_239, rank_206, rank_208, sr_item_sk) + partial hashaggregation over (expr_194, expr_239, rank_206, rank_208, sr_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (sr_item_sk) + final hashaggregation over (sr_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_item_sk"]) - partial aggregation over (sr_item_sk) + partial hashaggregation over (sr_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"]) scan store_returns diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q49.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q49.push.plan.txt index 1175aaff8..973e0c6e6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q49.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q49.push.plan.txt @@ -1,15 +1,15 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_252, expr_253, expr_254, expr_255, expr_256) + final hashaggregation over (expr_252, expr_253, expr_254, expr_255, expr_256) local exchange (REPARTITION, HASH, ["expr_252", "expr_253", "expr_254", "expr_255", "expr_256"]) remote exchange (REPARTITION, HASH, ["expr_14", "expr_55", "rank", "rank_25", "ws_item_sk"]) - partial aggregation over (expr_14, expr_55, rank, rank_25, ws_item_sk) + partial hashaggregation over (expr_14, expr_55, rank, rank_25, ws_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ws_item_sk) + final hashaggregation over (ws_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_item_sk"]) - partial aggregation over (ws_item_sk) + partial hashaggregation over (ws_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"]) scan web_returns (pushdown = true) @@ -21,13 +21,13 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) remote exchange (REPARTITION, HASH, ["cs_item_sk", "expr_106", "expr_141", "rank_118", "rank_120"]) - partial aggregation over (cs_item_sk, expr_106, expr_141, rank_118, rank_120) + partial hashaggregation over (cs_item_sk, expr_106, expr_141, rank_118, rank_120) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (cs_item_sk) + final hashaggregation over (cs_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk"]) - partial aggregation over (cs_item_sk) + partial hashaggregation over (cs_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"]) scan catalog_returns (pushdown = true) @@ -39,13 +39,13 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) remote exchange (REPARTITION, HASH, ["expr_202", "expr_247", "rank_214", "rank_216", "ss_item_sk"]) - partial aggregation over (expr_202, expr_247, rank_214, rank_216, ss_item_sk) + partial hashaggregation over (expr_202, expr_247, rank_214, rank_216, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_item_sk) + final hashaggregation over (ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - partial aggregation over (ss_item_sk) + partial hashaggregation over (ss_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"]) scan store_returns (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q50.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q50.plan.txt index c2a9d481b..396c1e929 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q50.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q50.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (s_city, s_company_id, s_county, s_state, s_store_name, s_street_name, s_street_number, s_street_type, s_suite_number, s_zip) + final hashaggregation over (s_city, s_company_id, s_county, s_state, s_store_name, s_street_name, s_street_number, s_street_type, s_suite_number, s_zip) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_city", "s_company_id", "s_county", "s_state", "s_store_name", "s_street_name", "s_street_number", "s_street_type", "s_suite_number", "s_zip"]) - partial aggregation over (s_city, s_company_id, s_county, s_state, s_store_name, s_street_name, s_street_number, s_street_type, s_suite_number, s_zip) + partial hashaggregation over (s_city, s_company_id, s_county, s_state, s_store_name, s_street_name, s_street_number, s_street_type, s_suite_number, s_zip) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q50.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q50.push.plan.txt index 7dbb3f5cb..224b82e07 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q50.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q50.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (s_city, s_company_id, s_county, s_state, s_store_name, s_street_name, s_street_number, s_street_type, s_suite_number, s_zip) + final hashaggregation over (s_city, s_company_id, s_county, s_state, s_store_name, s_street_name, s_street_number, s_street_type, s_suite_number, s_zip) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_city", "s_company_id", "s_county", "s_state", "s_store_name", "s_street_name", "s_street_number", "s_street_type", "s_suite_number", "s_zip"]) - partial aggregation over (s_city, s_company_id, s_county, s_state, s_store_name, s_street_name, s_street_number, s_street_type, s_suite_number, s_zip) + partial hashaggregation over (s_city, s_company_id, s_county, s_state, s_store_name, s_street_name, s_street_number, s_street_type, s_suite_number, s_zip) join (INNER, REPLICATED): join (INNER, REPLICATED): scan date_dim diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q51.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q51.plan.txt index cd5486126..c903d491a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q51.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q51.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (FULL, PARTITIONED): local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_item_sk"]) - final aggregation over (d_date, ws_item_sk) + final hashaggregation over (d_date, ws_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date", "ws_item_sk"]) - partial aggregation over (d_date, ws_item_sk) + partial hashaggregation over (d_date, ws_item_sk) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) @@ -16,10 +16,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - final aggregation over (d_date_23, ss_item_sk) + final hashaggregation over (d_date_23, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_23", "ss_item_sk"]) - partial aggregation over (d_date_23, ss_item_sk) + partial hashaggregation over (d_date_23, ss_item_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q51.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q51.push.plan.txt index 7348f52c4..d8c6ae3b0 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q51.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q51.push.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (FULL, PARTITIONED): local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk"]) - final aggregation over (d_date_25, ss_item_sk) + final hashaggregation over (d_date_25, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_25", "ss_item_sk"]) - partial aggregation over (d_date_25, ss_item_sk) + partial hashaggregation over (d_date_25, ss_item_sk) join (INNER, REPLICATED): scan store_sales (pushdown = true) local exchange (GATHER, SINGLE, []) @@ -16,10 +16,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_item_sk"]) - final aggregation over (d_date, ws_item_sk) + final hashaggregation over (d_date, ws_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date", "ws_item_sk"]) - partial aggregation over (d_date, ws_item_sk) + partial hashaggregation over (d_date, ws_item_sk) join (INNER, REPLICATED): scan web_sales (pushdown = true) local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q52.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q52.plan.txt index 33752e693..3afc210a8 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q52.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q52.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_year, i_brand, i_brand_id) + final hashaggregation over (d_year, i_brand, i_brand_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "i_brand", "i_brand_id"]) - partial aggregation over (d_year, i_brand, i_brand_id) + partial hashaggregation over (d_year, i_brand, i_brand_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q52.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q52.push.plan.txt index 1d6db415b..aa2f6e8d0 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q52.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q52.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_year, i_brand, i_brand_id) + final hashaggregation over (d_year, i_brand, i_brand_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "i_brand", "i_brand_id"]) - partial aggregation over (d_year, i_brand, i_brand_id) + partial hashaggregation over (d_year, i_brand, i_brand_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q53.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q53.plan.txt index cd10ab369..1dab5b47d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q53.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q53.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_id"]) - final aggregation over (d_qoy, i_manufact_id) + final hashaggregation over (d_qoy, i_manufact_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_qoy", "i_manufact_id"]) - partial aggregation over (d_qoy, i_manufact_id) + partial hashaggregation over (d_qoy, i_manufact_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q53.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q53.push.plan.txt index abb65cced..09d820c16 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q53.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q53.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manufact_id"]) - final aggregation over (d_qoy, i_manufact_id) + final hashaggregation over (d_qoy, i_manufact_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_qoy", "i_manufact_id"]) - partial aggregation over (d_qoy, i_manufact_id) + partial hashaggregation over (d_qoy, i_manufact_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_sold_date_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q54.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q54.plan.txt index 539f98035..7837fe442 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q54.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q54.plan.txt @@ -1,13 +1,13 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_134) + final hashaggregation over (expr_134) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_134"]) - partial aggregation over (expr_134) - final aggregation over (ss_customer_sk) + partial hashaggregation over (expr_134) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) cross join: cross join: join (INNER, REPLICATED): @@ -20,10 +20,10 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (c_current_addr_sk, c_customer_sk) + final hashaggregation over (c_current_addr_sk, c_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_current_addr_sk", "c_customer_sk"]) - partial aggregation over (c_current_addr_sk, c_customer_sk) + partial hashaggregation over (c_current_addr_sk, c_customer_sk) join (INNER, REPLICATED): scan customer local exchange (GATHER, SINGLE, []) @@ -49,17 +49,17 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_86) + final hashaggregation over (expr_86) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_86"]) - partial aggregation over (expr_86) + partial hashaggregation over (expr_86) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_118) + final hashaggregation over (expr_118) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_118"]) - partial aggregation over (expr_118) + partial hashaggregation over (expr_118) scan date_dim diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q54.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q54.push.plan.txt index 854eb8ceb..be78bab61 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q54.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q54.push.plan.txt @@ -1,13 +1,13 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_144) + final hashaggregation over (expr_144) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_144"]) - partial aggregation over (expr_144) - final aggregation over (c_customer_sk) + partial hashaggregation over (expr_144) + final hashaggregation over (c_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) - partial aggregation over (c_customer_sk) + partial hashaggregation over (c_customer_sk) cross join: cross join: join (INNER, REPLICATED): @@ -19,10 +19,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) join (INNER, REPLICATED): - final aggregation over (c_current_addr_sk, c_customer_sk) + final hashaggregation over (c_current_addr_sk, c_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_current_addr_sk", "c_customer_sk"]) - partial aggregation over (c_current_addr_sk, c_customer_sk) + partial hashaggregation over (c_current_addr_sk, c_customer_sk) join (INNER, REPLICATED): scan customer local exchange (GATHER, SINGLE, []) @@ -50,17 +50,17 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_95) + final hashaggregation over (expr_95) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_95"]) - partial aggregation over (expr_95) + partial hashaggregation over (expr_95) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_128) + final hashaggregation over (expr_128) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_128"]) - partial aggregation over (expr_128) + partial hashaggregation over (expr_128) scan date_dim (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q55.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q55.plan.txt index 0322599f0..c4f4315c3 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q55.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q55.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_brand, i_brand_id) + final hashaggregation over (i_brand, i_brand_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_brand_id"]) - partial aggregation over (i_brand, i_brand_id) + partial hashaggregation over (i_brand, i_brand_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q55.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q55.push.plan.txt index 49c5a3040..9f2d846d2 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q55.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q55.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_brand, i_brand_id) + final hashaggregation over (i_brand, i_brand_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_brand_id"]) - partial aggregation over (i_brand, i_brand_id) + partial hashaggregation over (i_brand, i_brand_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.plan.txt index 05da2df47..ba8b58d87 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_266) + final hashaggregation over (expr_266) local exchange (REPARTITION, HASH, ["expr_266"]) - partial aggregation over (i_item_id) - final aggregation over (i_item_id) + partial hashaggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id"]) join (INNER, REPLICATED): @@ -24,10 +24,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_2"]) scan item - partial aggregation over (i_item_id_86) - final aggregation over (i_item_id_86) + partial hashaggregation over (i_item_id_86) + final hashaggregation over (i_item_id_86) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_86) + partial hashaggregation over (i_item_id_86) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_86"]) join (INNER, REPLICATED): @@ -46,10 +46,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_109"]) scan item - partial aggregation over (i_item_id_198) - final aggregation over (i_item_id_198) + partial hashaggregation over (i_item_id_198) + final hashaggregation over (i_item_id_198) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_198) + partial hashaggregation over (i_item_id_198) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_198"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.push.plan.txt index 8658dcf1e..10169ff65 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.push.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_280) + final hashaggregation over (expr_280) local exchange (REPARTITION, HASH, ["expr_280"]) - partial aggregation over (i_item_id) - final aggregation over (i_item_id) + partial hashaggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id"]) join (INNER, PARTITIONED): @@ -25,10 +25,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_5"]) scan item (pushdown = true) - partial aggregation over (i_item_id_93) - final aggregation over (i_item_id_93) + partial hashaggregation over (i_item_id_93) + final hashaggregation over (i_item_id_93) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_93) + partial hashaggregation over (i_item_id_93) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_93"]) join (INNER, REPLICATED): @@ -47,10 +47,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_117"]) scan item (pushdown = true) - partial aggregation over (i_item_id_210) - final aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) + final hashaggregation over (i_item_id_210) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_210"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.reuse.plan.txt index a201d6610..db88a2ae8 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q56.reuse.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_280) + final hashaggregation over (expr_280) local exchange (REPARTITION, HASH, ["expr_280"]) - partial aggregation over (i_item_id) - final aggregation over (i_item_id) + partial hashaggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id"]) join (INNER, PARTITIONED): @@ -25,10 +25,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_5"]) scan item - partial aggregation over (i_item_id_93) - final aggregation over (i_item_id_93) + partial hashaggregation over (i_item_id_93) + final hashaggregation over (i_item_id_93) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_93) + partial hashaggregation over (i_item_id_93) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_93"]) join (INNER, REPLICATED): @@ -47,10 +47,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_117"]) scan item - partial aggregation over (i_item_id_210) - final aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) + final hashaggregation over (i_item_id_210) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_210"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.cte.plan.txt index 83f0aaf85..bd3ceddb5 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.cte.plan.txt @@ -7,10 +7,10 @@ local exchange (GATHER, SINGLE, []) cte v1 local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_147", "i_brand_65", "i_category_69"]) - final aggregation over (cc_name_147, d_moy_121, d_year_119, i_brand_65, i_category_69) + final hashaggregation over (cc_name_147, d_moy_121, d_year_119, i_brand_65, i_category_69) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_147", "d_moy_121", "d_year_119", "i_brand_65", "i_category_69"]) - partial aggregation over (cc_name_147, d_moy_121, d_year_119, i_brand_65, i_category_69) + partial hashaggregation over (cc_name_147, d_moy_121, d_year_119, i_brand_65, i_category_69) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -33,10 +33,10 @@ local exchange (GATHER, SINGLE, []) cte v1 local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name", "i_brand", "i_category"]) - final aggregation over (cc_name, d_moy, d_year, i_brand, i_category) + final hashaggregation over (cc_name, d_moy, d_year, i_brand, i_category) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name", "d_moy", "d_year", "i_brand", "i_category"]) - partial aggregation over (cc_name, d_moy, d_year, i_brand, i_category) + partial hashaggregation over (cc_name, d_moy, d_year, i_brand, i_category) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -58,10 +58,10 @@ local exchange (GATHER, SINGLE, []) cte v1 local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_328", "i_brand_246", "i_category_250"]) - final aggregation over (cc_name_328, d_moy_302, d_year_300, i_brand_246, i_category_250) + final hashaggregation over (cc_name_328, d_moy_302, d_year_300, i_brand_246, i_category_250) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_328", "d_moy_302", "d_year_300", "i_brand_246", "i_category_250"]) - partial aggregation over (cc_name_328, d_moy_302, d_year_300, i_brand_246, i_category_250) + partial hashaggregation over (cc_name_328, d_moy_302, d_year_300, i_brand_246, i_category_250) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.plan.txt index 22d2cb70c..ff65d9a66 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.plan.txt @@ -4,10 +4,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name", "i_brand", "i_category"]) - final aggregation over (cc_name, d_moy, d_year, i_brand, i_category) + final hashaggregation over (cc_name, d_moy, d_year, i_brand, i_category) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name", "d_moy", "d_year", "i_brand", "i_category"]) - partial aggregation over (cc_name, d_moy, d_year, i_brand, i_category) + partial hashaggregation over (cc_name, d_moy, d_year, i_brand, i_category) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -23,10 +23,10 @@ local exchange (GATHER, SINGLE, []) scan call_center local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_147", "i_brand_65", "i_category_69"]) - final aggregation over (cc_name_147, d_moy_121, d_year_119, i_brand_65, i_category_69) + final hashaggregation over (cc_name_147, d_moy_121, d_year_119, i_brand_65, i_category_69) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_147", "d_moy_121", "d_year_119", "i_brand_65", "i_category_69"]) - partial aggregation over (cc_name_147, d_moy_121, d_year_119, i_brand_65, i_category_69) + partial hashaggregation over (cc_name_147, d_moy_121, d_year_119, i_brand_65, i_category_69) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -42,10 +42,10 @@ local exchange (GATHER, SINGLE, []) scan call_center local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_328", "i_brand_246", "i_category_250"]) - final aggregation over (cc_name_328, d_moy_302, d_year_300, i_brand_246, i_category_250) + final hashaggregation over (cc_name_328, d_moy_302, d_year_300, i_brand_246, i_category_250) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_328", "d_moy_302", "d_year_300", "i_brand_246", "i_category_250"]) - partial aggregation over (cc_name_328, d_moy_302, d_year_300, i_brand_246, i_category_250) + partial hashaggregation over (cc_name_328, d_moy_302, d_year_300, i_brand_246, i_category_250) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.push.plan.txt index adfca610e..072f43eb5 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q57.push.plan.txt @@ -4,10 +4,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name", "i_brand", "i_category"]) - final aggregation over (cc_name, d_moy, d_year, i_brand, i_category) + final hashaggregation over (cc_name, d_moy, d_year, i_brand, i_category) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name", "d_moy", "d_year", "i_brand", "i_category"]) - partial aggregation over (cc_name, d_moy, d_year, i_brand, i_category) + partial hashaggregation over (cc_name, d_moy, d_year, i_brand, i_category) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, REPLICATED): @@ -24,10 +24,10 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_153", "i_brand_68", "i_category_72"]) - final aggregation over (cc_name_153, d_moy_126, d_year_124, i_brand_68, i_category_72) + final hashaggregation over (cc_name_153, d_moy_126, d_year_124, i_brand_68, i_category_72) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_153", "d_moy_126", "d_year_124", "i_brand_68", "i_category_72"]) - partial aggregation over (cc_name_153, d_moy_126, d_year_124, i_brand_68, i_category_72) + partial hashaggregation over (cc_name_153, d_moy_126, d_year_124, i_brand_68, i_category_72) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_98"]) join (INNER, REPLICATED): @@ -44,10 +44,10 @@ local exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_338", "i_brand_253", "i_category_257"]) - final aggregation over (cc_name_338, d_moy_311, d_year_309, i_brand_253, i_category_257) + final hashaggregation over (cc_name_338, d_moy_311, d_year_309, i_brand_253, i_category_257) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name_338", "d_moy_311", "d_year_309", "i_brand_253", "i_category_257"]) - partial aggregation over (cc_name_338, d_moy_311, d_year_309, i_brand_253, i_category_257) + partial hashaggregation over (cc_name_338, d_moy_311, d_year_309, i_brand_253, i_category_257) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_283"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.plan.txt index b918ac3d2..d930a1870 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): join (INNER, PARTITIONED): - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -25,10 +25,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) scan date_dim - final aggregation over (i_item_id_79) + final hashaggregation over (i_item_id_79) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_79"]) - partial aggregation over (i_item_id_79) + partial hashaggregation over (i_item_id_79) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -48,10 +48,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) scan date_dim - final aggregation over (i_item_id_210) + final hashaggregation over (i_item_id_210) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_210"]) - partial aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.push.plan.txt index b7d056463..f12fedd66 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): join (INNER, PARTITIONED): - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, PARTITIONED): @@ -26,10 +26,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) - final aggregation over (i_item_id_220) + final hashaggregation over (i_item_id_220) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_220"]) - partial aggregation over (i_item_id_220) + partial hashaggregation over (i_item_id_220) semijoin (REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk"]) @@ -51,10 +51,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) - final aggregation over (i_item_id_84) + final hashaggregation over (i_item_id_84) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_84"]) - partial aggregation over (i_item_id_84) + partial hashaggregation over (i_item_id_84) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.reuse.plan.txt index 9e7c6f524..f08cf55bb 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q58.reuse.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): join (INNER, PARTITIONED): - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, PARTITIONED): @@ -26,10 +26,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) ReuseTableScan date_dim (Consumer) - final aggregation over (i_item_id_220) + final hashaggregation over (i_item_id_220) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_220"]) - partial aggregation over (i_item_id_220) + partial hashaggregation over (i_item_id_220) semijoin (REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk"]) @@ -51,10 +51,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) ReuseTableScan date_dim (Consumer) - final aggregation over (i_item_id_84) + final hashaggregation over (i_item_id_84) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_84"]) - partial aggregation over (i_item_id_84) + partial hashaggregation over (i_item_id_84) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.cte.plan.txt index f9c361dfb..b57c39f08 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.cte.plan.txt @@ -6,10 +6,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, REPLICATED): remote exchange (REPARTITION, HASH, ["d_week_seq", "ss_store_sk", "sum", "sum_10", "sum_11", "sum_12", "sum_13", "sum_8", "sum_9"]) cte wss - final aggregation over (d_week_seq, ss_store_sk) + final hashaggregation over (d_week_seq, ss_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq", "ss_store_sk"]) - partial aggregation over (d_week_seq, ss_store_sk) + partial hashaggregation over (d_week_seq, ss_store_sk) join (INNER, REPLICATED): Filter scan store_sales @@ -31,10 +31,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, REPLICATED): remote exchange (REPARTITION, HASH, ["d_week_seq_147", "ss_store_sk_127", "sum_182", "sum_183", "sum_184", "sum_185", "sum_186", "sum_187", "sum_188"]) cte wss - final aggregation over (d_week_seq_147, ss_store_sk_127) + final hashaggregation over (d_week_seq_147, ss_store_sk_127) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq_147", "ss_store_sk_127"]) - partial aggregation over (d_week_seq_147, ss_store_sk_127) + partial hashaggregation over (d_week_seq_147, ss_store_sk_127) join (INNER, REPLICATED): Filter scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.plan.txt index 9a949024a..17ea87981 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.plan.txt @@ -4,10 +4,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq", "s_store_id"]) join (INNER, REPLICATED): join (INNER, REPLICATED): - final aggregation over (d_week_seq, ss_store_sk) + final hashaggregation over (d_week_seq, ss_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq", "ss_store_sk"]) - partial aggregation over (d_week_seq, ss_store_sk) + partial hashaggregation over (d_week_seq, ss_store_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -23,10 +23,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id_235", "subtract"]) join (INNER, REPLICATED): join (INNER, REPLICATED): - final aggregation over (d_week_seq_147, ss_store_sk_127) + final hashaggregation over (d_week_seq_147, ss_store_sk_127) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq_147", "ss_store_sk_127"]) - partial aggregation over (d_week_seq_147, ss_store_sk_127) + partial hashaggregation over (d_week_seq_147, ss_store_sk_127) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.push.plan.txt index d8eb45a58..4ae8d25e9 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q59.push.plan.txt @@ -4,10 +4,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq", "s_store_id"]) join (INNER, REPLICATED): join (INNER, REPLICATED): - final aggregation over (d_week_seq, ss_store_sk) + final hashaggregation over (d_week_seq, ss_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq", "ss_store_sk"]) - partial aggregation over (d_week_seq, ss_store_sk) + partial hashaggregation over (d_week_seq, ss_store_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_sold_date_sk"]) scan store_sales @@ -24,10 +24,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id_240", "subtract"]) join (INNER, REPLICATED): join (INNER, REPLICATED): - final aggregation over (d_week_seq_151, ss_store_sk_130) + final hashaggregation over (d_week_seq_151, ss_store_sk_130) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq_151", "ss_store_sk_130"]) - partial aggregation over (d_week_seq_151, ss_store_sk_130) + partial hashaggregation over (d_week_seq_151, ss_store_sk_130) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_sold_date_sk_123"]) scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.plan.txt index 05da2df47..ba8b58d87 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_266) + final hashaggregation over (expr_266) local exchange (REPARTITION, HASH, ["expr_266"]) - partial aggregation over (i_item_id) - final aggregation over (i_item_id) + partial hashaggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id"]) join (INNER, REPLICATED): @@ -24,10 +24,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_2"]) scan item - partial aggregation over (i_item_id_86) - final aggregation over (i_item_id_86) + partial hashaggregation over (i_item_id_86) + final hashaggregation over (i_item_id_86) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_86) + partial hashaggregation over (i_item_id_86) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_86"]) join (INNER, REPLICATED): @@ -46,10 +46,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_109"]) scan item - partial aggregation over (i_item_id_198) - final aggregation over (i_item_id_198) + partial hashaggregation over (i_item_id_198) + final hashaggregation over (i_item_id_198) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_198) + partial hashaggregation over (i_item_id_198) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_198"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.push.plan.txt index 8658dcf1e..10169ff65 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.push.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_280) + final hashaggregation over (expr_280) local exchange (REPARTITION, HASH, ["expr_280"]) - partial aggregation over (i_item_id) - final aggregation over (i_item_id) + partial hashaggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id"]) join (INNER, PARTITIONED): @@ -25,10 +25,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_5"]) scan item (pushdown = true) - partial aggregation over (i_item_id_93) - final aggregation over (i_item_id_93) + partial hashaggregation over (i_item_id_93) + final hashaggregation over (i_item_id_93) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_93) + partial hashaggregation over (i_item_id_93) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_93"]) join (INNER, REPLICATED): @@ -47,10 +47,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_117"]) scan item (pushdown = true) - partial aggregation over (i_item_id_210) - final aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) + final hashaggregation over (i_item_id_210) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_210"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.reuse.plan.txt index 1fdaf4272..3be4d89c8 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q60.reuse.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (expr_280) + final hashaggregation over (expr_280) local exchange (REPARTITION, HASH, ["expr_280"]) - partial aggregation over (i_item_id) - final aggregation over (i_item_id) + partial hashaggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id"]) join (INNER, PARTITIONED): @@ -25,10 +25,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_5"]) ReuseTableScan item (Consumer) - partial aggregation over (i_item_id_93) - final aggregation over (i_item_id_93) + partial hashaggregation over (i_item_id_93) + final hashaggregation over (i_item_id_93) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_93) + partial hashaggregation over (i_item_id_93) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_93"]) join (INNER, REPLICATED): @@ -47,10 +47,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_117"]) ReuseTableScan item (Consumer) - partial aggregation over (i_item_id_210) - final aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) + final hashaggregation over (i_item_id_210) local exchange (GATHER, SINGLE, []) - partial aggregation over (i_item_id_210) + partial hashaggregation over (i_item_id_210) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_id_210"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.plan.txt index f9f0b7686..40c54d686 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.plan.txt @@ -1,8 +1,8 @@ cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan item local exchange (GATHER, SINGLE, []) @@ -29,10 +29,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer_address - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan item local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.push.plan.txt index c584824da..d7a389b8a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.push.plan.txt @@ -1,8 +1,8 @@ cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_13"]) join (INNER, REPLICATED): @@ -26,10 +26,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_address_sk_112"]) scan customer_address (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.reuse.plan.txt index 0839ff5a4..650242a54 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q61.reuse.plan.txt @@ -1,8 +1,8 @@ cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_13"]) join (INNER, REPLICATED): @@ -26,10 +26,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_address_sk_112"]) ReuseTableScan customer_address (Consumer) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q62.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q62.plan.txt index c91381b40..22bf0d388 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q62.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q62.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (sm_type, substr, web_name) + final hashaggregation over (sm_type, substr, web_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sm_type", "substr", "web_name"]) - partial aggregation over (sm_type, substr, web_name) + partial hashaggregation over (sm_type, substr, web_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q62.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q62.push.plan.txt index 0be5d6410..8dd339468 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q62.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q62.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (sm_type, substr, web_name) + final hashaggregation over (sm_type, substr, web_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sm_type", "substr", "web_name"]) - partial aggregation over (sm_type, substr, web_name) + partial hashaggregation over (sm_type, substr, web_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q63.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q63.plan.txt index 23e28eddc..0b96d6a3b 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q63.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q63.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manager_id"]) - final aggregation over (d_moy, i_manager_id) + final hashaggregation over (d_moy, i_manager_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "i_manager_id"]) - partial aggregation over (d_moy, i_manager_id) + partial hashaggregation over (d_moy, i_manager_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q63.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q63.push.plan.txt index 1b7bddbe6..92fd1f0f2 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q63.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q63.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_manager_id"]) - final aggregation over (d_moy, i_manager_id) + final hashaggregation over (d_moy, i_manager_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "i_manager_id"]) - partial aggregation over (d_moy, i_manager_id) + partial hashaggregation over (d_moy, i_manager_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_sold_date_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.cte.plan.txt index e980b1b2c..8b8b1c1b8 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.cte.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["s_store_name", "s_zip", "ss_item_sk"]) - final aggregation over (ca_city, ca_city_98, ca_street_name, ca_street_name_95, ca_street_number, ca_street_number_94, ca_zip, ca_zip_101, d_year, d_year_28, d_year_56, i_product_name, s_store_name, s_zip, ss_item_sk) + final hashaggregation over (ca_city, ca_city_98, ca_street_name, ca_street_name_95, ca_street_number, ca_street_number_94, ca_zip, ca_zip_101, d_year, d_year_28, d_year_56, i_product_name, s_store_name, s_zip, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_city", "ca_city_98", "ca_street_name", "ca_street_name_95", "ca_street_number", "ca_street_number_94", "ca_zip", "ca_zip_101", "d_year", "d_year_28", "d_year_56", "i_product_name", "s_store_name", "s_zip", "ss_item_sk"]) - partial aggregation over (ca_city, ca_city_98, ca_street_name, ca_street_name_95, ca_street_number, ca_street_number_94, ca_zip, ca_zip_101, d_year, d_year_28, d_year_56, i_product_name, s_store_name, s_zip, ss_item_sk) + partial hashaggregation over (ca_city, ca_city_98, ca_street_name, ca_street_name_95, ca_street_number, ca_street_number_94, ca_zip, ca_zip_101, d_year, d_year_28, d_year_56, i_product_name, s_store_name, s_zip, ss_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) join (INNER, PARTITIONED): @@ -52,10 +52,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk", "sum_5", "sum_6"]) cte cs_ui Filter - final aggregation over (cs_item_sk) + final hashaggregation over (cs_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk"]) - partial aggregation over (cs_item_sk) + partial hashaggregation over (cs_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"]) Filter @@ -115,10 +115,10 @@ remote exchange (GATHER, SINGLE, []) scan item local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_name_452", "s_zip_472", "ss_item_sk_236"]) - final aggregation over (ca_city_547, ca_city_560, ca_street_name_544, ca_street_name_557, ca_street_number_543, ca_street_number_556, ca_zip_550, ca_zip_563, d_year_369, d_year_397, d_year_425, i_product_name_594, s_store_name_452, s_zip_472, ss_item_sk_236) + final hashaggregation over (ca_city_547, ca_city_560, ca_street_name_544, ca_street_name_557, ca_street_number_543, ca_street_number_556, ca_zip_550, ca_zip_563, d_year_369, d_year_397, d_year_425, i_product_name_594, s_store_name_452, s_zip_472, ss_item_sk_236) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_city_547", "ca_city_560", "ca_street_name_544", "ca_street_name_557", "ca_street_number_543", "ca_street_number_556", "ca_zip_550", "ca_zip_563", "d_year_369", "d_year_397", "d_year_425", "i_product_name_594", "s_store_name_452", "s_zip_472", "ss_item_sk_236"]) - partial aggregation over (ca_city_547, ca_city_560, ca_street_name_544, ca_street_name_557, ca_street_number_543, ca_street_number_556, ca_zip_550, ca_zip_563, d_year_369, d_year_397, d_year_425, i_product_name_594, s_store_name_452, s_zip_472, ss_item_sk_236) + partial hashaggregation over (ca_city_547, ca_city_560, ca_street_name_544, ca_street_name_557, ca_street_number_543, ca_street_number_556, ca_zip_550, ca_zip_563, d_year_369, d_year_397, d_year_425, i_product_name_594, s_store_name_452, s_zip_472, ss_item_sk_236) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_236"]) join (INNER, PARTITIONED): @@ -164,10 +164,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk_292", "sum_346", "sum_347"]) cte cs_ui Filter - final aggregation over (cs_item_sk_292) + final hashaggregation over (cs_item_sk_292) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk_292"]) - partial aggregation over (cs_item_sk_292) + partial hashaggregation over (cs_item_sk_292) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_292", "cs_order_number_294"]) Filter diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.plan.txt index bb9a033a5..fe6dc3f40 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.plan.txt @@ -2,9 +2,9 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): - final aggregation over (ca_city, ca_city_98, ca_street_name, ca_street_name_95, ca_street_number, ca_street_number_94, ca_zip, ca_zip_101, cs_item_sk, d_year, d_year_28, d_year_56, i_product_name, s_store_name, s_zip) + final hashaggregation over (ca_city, ca_city_98, ca_street_name, ca_street_name_95, ca_street_number, ca_street_number_94, ca_zip, ca_zip_101, cs_item_sk, d_year, d_year_28, d_year_56, i_product_name, s_store_name, s_zip) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_city, ca_city_98, ca_street_name, ca_street_name_95, ca_street_number, ca_street_number_94, ca_zip, ca_zip_101, cs_item_sk, d_year, d_year_28, d_year_56, i_product_name, s_store_name, s_zip) + partial hashaggregation over (ca_city, ca_city_98, ca_street_name, ca_street_name_95, ca_street_number, ca_street_number_94, ca_zip, ca_zip_101, cs_item_sk, d_year, d_year_28, d_year_56, i_product_name, s_store_name, s_zip) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, PARTITIONED): @@ -43,10 +43,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"]) scan store_returns - final aggregation over (cs_item_sk) + final hashaggregation over (cs_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk"]) - partial aggregation over (cs_item_sk) + partial hashaggregation over (cs_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"]) scan catalog_sales @@ -98,9 +98,9 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk"]) scan item - final aggregation over (ca_city_547, ca_city_560, ca_street_name_544, ca_street_name_557, ca_street_number_543, ca_street_number_556, ca_zip_550, ca_zip_563, cs_item_sk_292, d_year_369, d_year_397, d_year_425, i_product_name_594, s_store_name_452, s_zip_472) + final hashaggregation over (ca_city_547, ca_city_560, ca_street_name_544, ca_street_name_557, ca_street_number_543, ca_street_number_556, ca_zip_550, ca_zip_563, cs_item_sk_292, d_year_369, d_year_397, d_year_425, i_product_name_594, s_store_name_452, s_zip_472) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_city_547, ca_city_560, ca_street_name_544, ca_street_name_557, ca_street_number_543, ca_street_number_556, ca_zip_550, ca_zip_563, cs_item_sk_292, d_year_369, d_year_397, d_year_425, i_product_name_594, s_store_name_452, s_zip_472) + partial hashaggregation over (ca_city_547, ca_city_560, ca_street_name_544, ca_street_name_557, ca_street_number_543, ca_street_number_556, ca_zip_550, ca_zip_563, cs_item_sk_292, d_year_369, d_year_397, d_year_425, i_product_name_594, s_store_name_452, s_zip_472) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_292"]) join (INNER, PARTITIONED): @@ -139,10 +139,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_item_sk_259", "sr_ticket_number_266"]) scan store_returns - final aggregation over (cs_item_sk_292) + final hashaggregation over (cs_item_sk_292) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk_292"]) - partial aggregation over (cs_item_sk_292) + partial hashaggregation over (cs_item_sk_292) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_292", "cs_order_number_294"]) scan catalog_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.push.plan.txt index 4de7a38c4..d7cca6ba5 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q64.push.plan.txt @@ -2,9 +2,9 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): - final aggregation over (ca_city, ca_city_112, ca_street_name, ca_street_name_109, ca_street_number, ca_street_number_108, ca_zip, ca_zip_115, d_year, d_year_32, d_year_61, i_item_sk, i_product_name, s_store_name, s_zip) + final hashaggregation over (ca_city, ca_city_112, ca_street_name, ca_street_name_109, ca_street_number, ca_street_number_108, ca_zip, ca_zip_115, d_year, d_year_32, d_year_61, i_item_sk, i_product_name, s_store_name, s_zip) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_city, ca_city_112, ca_street_name, ca_street_name_109, ca_street_number, ca_street_number_108, ca_zip, ca_zip_115, d_year, d_year_32, d_year_61, i_item_sk, i_product_name, s_store_name, s_zip) + partial hashaggregation over (ca_city, ca_city_112, ca_street_name, ca_street_name_109, ca_street_number, ca_street_number_108, ca_zip, ca_zip_115, d_year, d_year_32, d_year_61, i_item_sk, i_product_name, s_store_name, s_zip) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk"]) join (INNER, PARTITIONED): @@ -42,10 +42,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store_returns - final aggregation over (cs_item_sk) + final hashaggregation over (cs_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk"]) - partial aggregation over (cs_item_sk) + partial hashaggregation over (cs_item_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"]) scan catalog_sales @@ -97,9 +97,9 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk"]) scan item (pushdown = true) - final aggregation over (ca_city_579, ca_city_593, ca_street_name_576, ca_street_name_590, ca_street_number_575, ca_street_number_589, ca_zip_582, ca_zip_596, d_year_391, d_year_420, d_year_449, i_item_sk_609, i_product_name_630, s_store_name_477, s_zip_497) + final hashaggregation over (ca_city_579, ca_city_593, ca_street_name_576, ca_street_name_590, ca_street_number_575, ca_street_number_589, ca_zip_582, ca_zip_596, d_year_391, d_year_420, d_year_449, i_item_sk_609, i_product_name_630, s_store_name_477, s_zip_497) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_city_579, ca_city_593, ca_street_name_576, ca_street_name_590, ca_street_number_575, ca_street_number_589, ca_zip_582, ca_zip_596, d_year_391, d_year_420, d_year_449, i_item_sk_609, i_product_name_630, s_store_name_477, s_zip_497) + partial hashaggregation over (ca_city_579, ca_city_593, ca_street_name_576, ca_street_name_590, ca_street_number_575, ca_street_number_589, ca_zip_582, ca_zip_596, d_year_391, d_year_420, d_year_449, i_item_sk_609, i_product_name_630, s_store_name_477, s_zip_497) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_312"]) join (INNER, PARTITIONED): @@ -137,10 +137,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store_returns - final aggregation over (cs_item_sk_312) + final hashaggregation over (cs_item_sk_312) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_item_sk_312"]) - partial aggregation over (cs_item_sk_312) + partial hashaggregation over (cs_item_sk_312) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_312", "cs_order_number_314"]) scan catalog_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q65.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q65.plan.txt index f09082ea7..271038263 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q65.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q65.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, REPLICATED): join (INNER, REPLICATED): - final aggregation over (ss_item_sk_26, ss_store_sk_31) + final hashaggregation over (ss_item_sk_26, ss_store_sk_31) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk_26", "ss_store_sk_31"]) - partial aggregation over (ss_item_sk_26, ss_store_sk_31) + partial hashaggregation over (ss_item_sk_26, ss_store_sk_31) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -16,14 +16,14 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["s_store_sk"]) scan store - final aggregation over (ss_store_sk) + final hashaggregation over (ss_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk"]) - partial aggregation over (ss_store_sk) - final aggregation over (ss_item_sk, ss_store_sk) + partial hashaggregation over (ss_store_sk) + final hashaggregation over (ss_item_sk, ss_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"]) - partial aggregation over (ss_item_sk, ss_store_sk) + partial hashaggregation over (ss_item_sk, ss_store_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q65.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q65.push.plan.txt index 473b19677..a60b2c062 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q65.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q65.push.plan.txt @@ -6,10 +6,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk_29"]) join (INNER, REPLICATED): - final aggregation over (ss_item_sk_29, ss_store_sk_34) + final hashaggregation over (ss_item_sk_29, ss_store_sk_34) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk_29", "ss_store_sk_34"]) - partial aggregation over (ss_item_sk_29, ss_store_sk_34) + partial hashaggregation over (ss_item_sk_29, ss_store_sk_34) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -18,14 +18,14 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) join (INNER, PARTITIONED): - final aggregation over (ss_store_sk) + final hashaggregation over (ss_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk"]) - partial aggregation over (ss_store_sk) - final aggregation over (ss_item_sk, ss_store_sk) + partial hashaggregation over (ss_store_sk) + final hashaggregation over (ss_item_sk, ss_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"]) - partial aggregation over (ss_item_sk, ss_store_sk) + partial hashaggregation over (ss_item_sk, ss_store_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.plan.txt index 667e5d5ad..9122a6c57 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.plan.txt @@ -1,12 +1,12 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (concat_306, d_year_307, w_city_302, w_country_305, w_county_303, w_state_304, w_warehouse_name_300, w_warehouse_sq_ft_301) + final hashaggregation over (concat_306, d_year_307, w_city_302, w_country_305, w_county_303, w_state_304, w_warehouse_name_300, w_warehouse_sq_ft_301) local exchange (REPARTITION, HASH, ["concat_306", "d_year_307", "w_city_302", "w_country_305", "w_county_303", "w_state_304", "w_warehouse_name_300", "w_warehouse_sq_ft_301"]) - partial aggregation over (concat_603, d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) - final aggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + partial hashaggregation over (concat_603, d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + final hashaggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "w_city", "w_country", "w_county", "w_state", "w_warehouse_name", "w_warehouse_sq_ft"]) - partial aggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + partial hashaggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -24,11 +24,11 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan warehouse - partial aggregation over (concat_646, d_year_136, w_city_124, w_country_128, w_county_125, w_state_126, w_warehouse_name_118, w_warehouse_sq_ft_119) - final aggregation over (d_year_136, w_city_124, w_country_128, w_county_125, w_state_126, w_warehouse_name_118, w_warehouse_sq_ft_119) + partial hashaggregation over (concat_646, d_year_136, w_city_124, w_country_128, w_county_125, w_state_126, w_warehouse_name_118, w_warehouse_sq_ft_119) + final hashaggregation over (d_year_136, w_city_124, w_country_128, w_county_125, w_state_126, w_warehouse_name_118, w_warehouse_sq_ft_119) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year_136", "w_city_124", "w_country_128", "w_county_125", "w_state_126", "w_warehouse_name_118", "w_warehouse_sq_ft_119"]) - partial aggregation over (d_year_136, w_city_124, w_country_128, w_county_125, w_state_126, w_warehouse_name_118, w_warehouse_sq_ft_119) + partial hashaggregation over (d_year_136, w_city_124, w_country_128, w_county_125, w_state_126, w_warehouse_name_118, w_warehouse_sq_ft_119) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.push.plan.txt index 10be9370c..f63f201ed 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.push.plan.txt @@ -1,12 +1,12 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (concat_315, d_year_316, w_city_311, w_country_314, w_county_312, w_state_313, w_warehouse_name_309, w_warehouse_sq_ft_310) + final hashaggregation over (concat_315, d_year_316, w_city_311, w_country_314, w_county_312, w_state_313, w_warehouse_name_309, w_warehouse_sq_ft_310) local exchange (REPARTITION, HASH, ["concat_315", "d_year_316", "w_city_311", "w_country_314", "w_county_312", "w_state_313", "w_warehouse_name_309", "w_warehouse_sq_ft_310"]) - partial aggregation over (concat_612, d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) - final aggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + partial hashaggregation over (concat_612, d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + final hashaggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "w_city", "w_country", "w_county", "w_state", "w_warehouse_name", "w_warehouse_sq_ft"]) - partial aggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + partial hashaggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["t_time_sk"]) @@ -26,11 +26,11 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan warehouse - partial aggregation over (concat_655, d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) - final aggregation over (d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) + partial hashaggregation over (concat_655, d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) + final hashaggregation over (d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year_142", "w_city_129", "w_country_133", "w_county_130", "w_state_131", "w_warehouse_name_123", "w_warehouse_sq_ft_124"]) - partial aggregation over (d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) + partial hashaggregation over (d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["t_time_sk_165"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.reuse.plan.txt index 0f60ce42d..2b582c245 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q66.reuse.plan.txt @@ -1,12 +1,12 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (concat_315, d_year_316, w_city_311, w_country_314, w_county_312, w_state_313, w_warehouse_name_309, w_warehouse_sq_ft_310) + final hashaggregation over (concat_315, d_year_316, w_city_311, w_country_314, w_county_312, w_state_313, w_warehouse_name_309, w_warehouse_sq_ft_310) local exchange (REPARTITION, HASH, ["concat_315", "d_year_316", "w_city_311", "w_country_314", "w_county_312", "w_state_313", "w_warehouse_name_309", "w_warehouse_sq_ft_310"]) - partial aggregation over (concat_612, d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) - final aggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + partial hashaggregation over (concat_612, d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + final hashaggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "w_city", "w_country", "w_county", "w_state", "w_warehouse_name", "w_warehouse_sq_ft"]) - partial aggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) + partial hashaggregation over (d_year, w_city, w_country, w_county, w_state, w_warehouse_name, w_warehouse_sq_ft) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["t_time_sk"]) @@ -26,11 +26,11 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan warehouse - partial aggregation over (concat_655, d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) - final aggregation over (d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) + partial hashaggregation over (concat_655, d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) + final hashaggregation over (d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year_142", "w_city_129", "w_country_133", "w_county_130", "w_state_131", "w_warehouse_name_123", "w_warehouse_sq_ft_124"]) - partial aggregation over (d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) + partial hashaggregation over (d_year_142, w_city_129, w_country_133, w_county_130, w_state_131, w_warehouse_name_123, w_warehouse_sq_ft_124) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["t_time_sk_165"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q67.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q67.plan.txt index 60f46f2fc..0d3f17406 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q67.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q67.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category$gid"]) - final aggregation over (d_moy$gid, d_qoy$gid, d_year$gid, groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid, s_store_id$gid) + final hashaggregation over (d_moy$gid, d_qoy$gid, d_year$gid, groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid, s_store_id$gid) local exchange (REPARTITION, HASH, ["d_moy$gid", "d_qoy$gid", "d_year$gid", "groupid", "i_brand$gid", "i_category$gid", "i_class$gid", "i_product_name$gid", "s_store_id$gid"]) remote exchange (REPARTITION, HASH, ["d_moy$gid", "d_qoy$gid", "d_year$gid", "groupid", "i_brand$gid", "i_category$gid", "i_class$gid", "i_product_name$gid", "s_store_id$gid"]) - partial aggregation over (d_moy$gid, d_qoy$gid, d_year$gid, groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid, s_store_id$gid) + partial hashaggregation over (d_moy$gid, d_qoy$gid, d_year$gid, groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid, s_store_id$gid) local exchange (REPARTITION, HASH, ["i_brand", "i_category", "i_class", "i_product_name"]) remote exchange (REPARTITION, HASH, ["i_brand", "i_category", "i_class", "i_product_name"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q67.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q67.push.plan.txt index f41d063f2..2df681bdc 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q67.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q67.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category$gid"]) - final aggregation over (d_moy$gid, d_qoy$gid, d_year$gid, groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid, s_store_id$gid) + final hashaggregation over (d_moy$gid, d_qoy$gid, d_year$gid, groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid, s_store_id$gid) local exchange (REPARTITION, HASH, ["d_moy$gid", "d_qoy$gid", "d_year$gid", "groupid", "i_brand$gid", "i_category$gid", "i_class$gid", "i_product_name$gid", "s_store_id$gid"]) remote exchange (REPARTITION, HASH, ["d_moy$gid", "d_qoy$gid", "d_year$gid", "groupid", "i_brand$gid", "i_category$gid", "i_class$gid", "i_product_name$gid", "s_store_id$gid"]) - partial aggregation over (d_moy$gid, d_qoy$gid, d_year$gid, groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid, s_store_id$gid) + partial hashaggregation over (d_moy$gid, d_qoy$gid, d_year$gid, groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid, s_store_id$gid) local exchange (REPARTITION, HASH, ["i_brand", "i_category", "i_class", "i_product_name"]) remote exchange (REPARTITION, HASH, ["i_brand", "i_category", "i_class", "i_product_name"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q68.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q68.plan.txt index fdd38a8f9..1eb8ef160 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q68.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q68.plan.txt @@ -7,9 +7,9 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number) + final hashaggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number) + partial hashaggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ca_address_sk"]) scan customer_address diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q68.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q68.push.plan.txt index 88c07afbd..b6f9d4689 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q68.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q68.push.plan.txt @@ -2,9 +2,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + final hashaggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + partial hashaggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_addr_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q69.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q69.plan.txt index 898d70616..d37a7b919 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q69.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q69.plan.txt @@ -1,15 +1,15 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (cd_credit_rating, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) + final hashaggregation over (cd_credit_rating, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cd_credit_rating", "cd_education_status", "cd_gender", "cd_marital_status", "cd_purchase_estimate"]) - partial aggregation over (cd_credit_rating, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) + partial hashaggregation over (cd_credit_rating, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) join (LEFT, PARTITIONED): join (RIGHT, PARTITIONED): - final aggregation over (ws_bill_customer_sk) + final hashaggregation over (ws_bill_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) - partial aggregation over (ws_bill_customer_sk) + partial hashaggregation over (ws_bill_customer_sk) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) @@ -23,10 +23,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"]) join (INNER, PARTITIONED): - final aggregation over (ss_customer_sk) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -39,10 +39,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer_address - final aggregation over (cs_ship_customer_sk) + final hashaggregation over (cs_ship_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"]) - partial aggregation over (cs_ship_customer_sk) + partial hashaggregation over (cs_ship_customer_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q69.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q69.push.plan.txt index 58161f745..31d6f457f 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q69.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q69.push.plan.txt @@ -1,15 +1,15 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (cd_credit_rating, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) + final hashaggregation over (cd_credit_rating, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cd_credit_rating", "cd_education_status", "cd_gender", "cd_marital_status", "cd_purchase_estimate"]) - partial aggregation over (cd_credit_rating, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) + partial hashaggregation over (cd_credit_rating, cd_education_status, cd_gender, cd_marital_status, cd_purchase_estimate) join (LEFT, PARTITIONED): join (RIGHT, PARTITIONED): - final aggregation over (ws_bill_customer_sk) + final hashaggregation over (ws_bill_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) - partial aggregation over (ws_bill_customer_sk) + partial hashaggregation over (ws_bill_customer_sk) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) @@ -22,10 +22,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) join (INNER, PARTITIONED): - final aggregation over (ss_customer_sk) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) @@ -38,10 +38,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer_address (pushdown = true) - final aggregation over (cs_ship_customer_sk) + final hashaggregation over (cs_ship_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"]) - partial aggregation over (cs_ship_customer_sk) + partial hashaggregation over (cs_ship_customer_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q70.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q70.plan.txt index 20609c3c2..88ef51dfb 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q70.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q70.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_110", "expr_111"]) - final aggregation over (groupid, s_county$gid, s_state$gid_102) + final hashaggregation over (groupid, s_county$gid, s_state$gid_102) local exchange (REPARTITION, HASH, ["groupid", "s_county$gid", "s_state$gid_102"]) remote exchange (REPARTITION, HASH, ["groupid", "s_county$gid", "s_state$gid_102"]) - partial aggregation over (groupid, s_county$gid, s_state$gid_102) + partial hashaggregation over (groupid, s_county$gid, s_state$gid_102) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["s_state"]) join (INNER, REPLICATED): @@ -19,10 +19,10 @@ local exchange (GATHER, SINGLE, []) scan store local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_state_48"]) - final aggregation over (s_state_48) + final hashaggregation over (s_state_48) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_state_48"]) - partial aggregation over (s_state_48) + partial hashaggregation over (s_state_48) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q70.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q70.push.plan.txt index 3324b0408..27016b6ae 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q70.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q70.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_115", "expr_116"]) - final aggregation over (groupid, s_county$gid, s_state$gid_107) + final hashaggregation over (groupid, s_county$gid, s_state$gid_107) local exchange (REPARTITION, HASH, ["groupid", "s_county$gid", "s_state$gid_107"]) remote exchange (REPARTITION, HASH, ["groupid", "s_county$gid", "s_state$gid_107"]) - partial aggregation over (groupid, s_county$gid, s_state$gid_107) + partial hashaggregation over (groupid, s_county$gid, s_state$gid_107) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["s_state"]) join (INNER, REPLICATED): @@ -19,10 +19,10 @@ local exchange (GATHER, SINGLE, []) scan store local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_state_51"]) - final aggregation over (s_state_51) + final hashaggregation over (s_state_51) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_state_51"]) - partial aggregation over (s_state_51) + partial hashaggregation over (s_state_51) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q71.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q71.plan.txt index 599dd0ab9..a8d6ced68 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q71.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q71.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (i_brand, i_brand_id, t_hour, t_minute) + final hashaggregation over (i_brand, i_brand_id, t_hour, t_minute) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_brand_id", "t_hour", "t_minute"]) - partial aggregation over (i_brand, i_brand_id, t_hour, t_minute) + partial hashaggregation over (i_brand, i_brand_id, t_hour, t_minute) join (INNER, REPLICATED): join (INNER, REPLICATED): remote exchange (REPARTITION, ROUND_ROBIN, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q71.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q71.push.plan.txt index dd25b6811..ae64255fc 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q71.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q71.push.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (i_brand, i_brand_id, t_hour, t_minute) + final hashaggregation over (i_brand, i_brand_id, t_hour, t_minute) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_brand_id", "t_hour", "t_minute"]) - partial aggregation over (i_brand, i_brand_id, t_hour, t_minute) + partial hashaggregation over (i_brand, i_brand_id, t_hour, t_minute) join (INNER, REPLICATED): scan time_dim (pushdown = true) local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q72.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q72.plan.txt index 9ee234095..918b4267c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q72.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q72.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_week_seq_15, i_item_desc, w_warehouse_name) + final hashaggregation over (d_week_seq_15, i_item_desc, w_warehouse_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq_15", "i_item_desc", "w_warehouse_name"]) - partial aggregation over (d_week_seq_15, i_item_desc, w_warehouse_name) + partial hashaggregation over (d_week_seq_15, i_item_desc, w_warehouse_name) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_order_number", "inv_item_sk"]) join (LEFT, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q72.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q72.push.plan.txt index 5b3939f1a..264d22a12 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q72.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q72.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_week_seq, i_item_desc, w_warehouse_name) + final hashaggregation over (d_week_seq, i_item_desc, w_warehouse_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_week_seq", "i_item_desc", "w_warehouse_name"]) - partial aggregation over (d_week_seq, i_item_desc, w_warehouse_name) + partial hashaggregation over (d_week_seq, i_item_desc, w_warehouse_name) join (LEFT, REPLICATED): join (LEFT, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q73.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q73.plan.txt index 9fa2321b1..d8b3a5c1c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q73.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q73.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (ss_customer_sk, ss_ticket_number) + final hashaggregation over (ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_ticket_number"]) - partial aggregation over (ss_customer_sk, ss_ticket_number) + partial hashaggregation over (ss_customer_sk, ss_ticket_number) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q73.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q73.push.plan.txt index 5901e9658..b190a13e0 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q73.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q73.push.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (ss_customer_sk, ss_ticket_number) + final hashaggregation over (ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_ticket_number"]) - partial aggregation over (ss_customer_sk, ss_ticket_number) + partial hashaggregation over (ss_customer_sk, ss_ticket_number) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.cte.plan.txt index 4936b91f7..f1e74d30e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.cte.plan.txt @@ -6,10 +6,10 @@ local exchange (GATHER, SINGLE, []) local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) Filter - final aggregation over (c_customer_id, c_first_name, c_last_name, d_year) + final hashaggregation over (c_customer_id, c_first_name, c_last_name, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id", "c_first_name", "c_last_name", "d_year"]) - partial aggregation over (c_customer_id, c_first_name, c_last_name, d_year) + partial hashaggregation over (c_customer_id, c_first_name, c_last_name, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -24,7 +24,7 @@ local exchange (GATHER, SINGLE, []) Filter scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_17"]) - single aggregation over (c_customer_id_17, c_first_name_24, c_last_name_25, d_year_40) + single hashaggregation over (c_customer_id_17, c_first_name_24, c_last_name_25, d_year_40) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -35,10 +35,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_109"]) - final aggregation over (c_customer_id_109, c_first_name_116, c_last_name_117, d_year_155) + final hashaggregation over (c_customer_id_109, c_first_name_116, c_last_name_117, d_year_155) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_109", "c_first_name_116", "c_last_name_117", "d_year_155"]) - partial aggregation over (c_customer_id_109, c_first_name_116, c_last_name_117, d_year_155) + partial hashaggregation over (c_customer_id_109, c_first_name_116, c_last_name_117, d_year_155) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_129"]) join (INNER, REPLICATED): @@ -53,7 +53,7 @@ local exchange (GATHER, SINGLE, []) Filter scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_200"]) - single aggregation over (c_customer_id_200, c_first_name_207, c_last_name_208, d_year_257) + single hashaggregation over (c_customer_id_200, c_first_name_207, c_last_name_208, d_year_257) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -64,7 +64,7 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_326"]) - single aggregation over (c_customer_id_326, c_first_name_333, c_last_name_334, d_year_372) + single hashaggregation over (c_customer_id_326, c_first_name_333, c_last_name_334, d_year_372) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -75,10 +75,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_417"]) Filter - final aggregation over (c_customer_id_417, c_first_name_424, c_last_name_425, d_year_474) + final hashaggregation over (c_customer_id_417, c_first_name_424, c_last_name_425, d_year_474) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_417", "c_first_name_424", "c_last_name_425", "d_year_474"]) - partial aggregation over (c_customer_id_417, c_first_name_424, c_last_name_425, d_year_474) + partial hashaggregation over (c_customer_id_417, c_first_name_424, c_last_name_425, d_year_474) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_438"]) join (INNER, REPLICATED): @@ -94,7 +94,7 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_543"]) - single aggregation over (c_customer_id_543, c_first_name_550, c_last_name_551, d_year_589) + single hashaggregation over (c_customer_id_543, c_first_name_550, c_last_name_551, d_year_589) join (INNER, REPLICATED): join (INNER, REPLICATED): Filter @@ -104,10 +104,10 @@ local exchange (GATHER, SINGLE, []) Filter values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_634"]) - final aggregation over (c_customer_id_634, c_first_name_641, c_last_name_642, d_year_691) + final hashaggregation over (c_customer_id_634, c_first_name_641, c_last_name_642, d_year_691) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_634", "c_first_name_641", "c_last_name_642", "d_year_691"]) - partial aggregation over (c_customer_id_634, c_first_name_641, c_last_name_642, d_year_691) + partial hashaggregation over (c_customer_id_634, c_first_name_641, c_last_name_642, d_year_691) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_655"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.plan.txt index ed977e30d..d28265606 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_customer_id, c_first_name, c_last_name, d_year) + final hashaggregation over (c_customer_id, c_first_name, c_last_name, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id", "c_first_name", "c_last_name", "d_year"]) - partial aggregation over (c_customer_id, c_first_name, c_last_name, d_year) + partial hashaggregation over (c_customer_id, c_first_name, c_last_name, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -20,7 +20,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_17"]) - single aggregation over (c_customer_id_17, c_first_name_24, c_last_name_25, d_year_40) + single hashaggregation over (c_customer_id_17, c_first_name_24, c_last_name_25, d_year_40) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -28,10 +28,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_109"]) - final aggregation over (c_customer_id_109, c_first_name_116, c_last_name_117, d_year_155) + final hashaggregation over (c_customer_id_109, c_first_name_116, c_last_name_117, d_year_155) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_109", "c_first_name_116", "c_last_name_117", "d_year_155"]) - partial aggregation over (c_customer_id_109, c_first_name_116, c_last_name_117, d_year_155) + partial hashaggregation over (c_customer_id_109, c_first_name_116, c_last_name_117, d_year_155) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_129"]) join (INNER, REPLICATED): @@ -43,7 +43,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_108"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_200"]) - single aggregation over (c_customer_id_200, c_first_name_207, c_last_name_208, d_year_257) + single hashaggregation over (c_customer_id_200, c_first_name_207, c_last_name_208, d_year_257) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -51,17 +51,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_326"]) - single aggregation over (c_customer_id_326, c_first_name_333, c_last_name_334, d_year_372) + single hashaggregation over (c_customer_id_326, c_first_name_333, c_last_name_334, d_year_372) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_417"]) - final aggregation over (c_customer_id_417, c_first_name_424, c_last_name_425, d_year_474) + final hashaggregation over (c_customer_id_417, c_first_name_424, c_last_name_425, d_year_474) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_417", "c_first_name_424", "c_last_name_425", "d_year_474"]) - partial aggregation over (c_customer_id_417, c_first_name_424, c_last_name_425, d_year_474) + partial hashaggregation over (c_customer_id_417, c_first_name_424, c_last_name_425, d_year_474) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_438"]) join (INNER, REPLICATED): @@ -74,17 +74,17 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_543"]) - single aggregation over (c_customer_id_543, c_first_name_550, c_last_name_551, d_year_589) + single hashaggregation over (c_customer_id_543, c_first_name_550, c_last_name_551, d_year_589) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_634"]) - final aggregation over (c_customer_id_634, c_first_name_641, c_last_name_642, d_year_691) + final hashaggregation over (c_customer_id_634, c_first_name_641, c_last_name_642, d_year_691) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_634", "c_first_name_641", "c_last_name_642", "d_year_691"]) - partial aggregation over (c_customer_id_634, c_first_name_641, c_last_name_642, d_year_691) + partial hashaggregation over (c_customer_id_634, c_first_name_641, c_last_name_642, d_year_691) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_655"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.push.plan.txt index 183edd340..b60766f8a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.push.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_customer_id, c_first_name, c_last_name, d_year) + final hashaggregation over (c_customer_id, c_first_name, c_last_name, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id", "c_first_name", "c_last_name", "d_year"]) - partial aggregation over (c_customer_id, c_first_name, c_last_name, d_year) + partial hashaggregation over (c_customer_id, c_first_name, c_last_name, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -20,7 +20,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_19"]) - single aggregation over (c_customer_id_19, c_first_name_26, c_last_name_27, d_year_44) + single hashaggregation over (c_customer_id_19, c_first_name_26, c_last_name_27, d_year_44) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -28,10 +28,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_114"]) - final aggregation over (c_customer_id_114, c_first_name_121, c_last_name_122, d_year_162) + final hashaggregation over (c_customer_id_114, c_first_name_121, c_last_name_122, d_year_162) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_114", "c_first_name_121", "c_last_name_122", "d_year_162"]) - partial aggregation over (c_customer_id_114, c_first_name_121, c_last_name_122, d_year_162) + partial hashaggregation over (c_customer_id_114, c_first_name_121, c_last_name_122, d_year_162) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_135"]) join (INNER, REPLICATED): @@ -43,7 +43,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_113"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_208"]) - single aggregation over (c_customer_id_208, c_first_name_215, c_last_name_216, d_year_267) + single hashaggregation over (c_customer_id_208, c_first_name_215, c_last_name_216, d_year_267) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -51,17 +51,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_337"]) - single aggregation over (c_customer_id_337, c_first_name_344, c_last_name_345, d_year_385) + single hashaggregation over (c_customer_id_337, c_first_name_344, c_last_name_345, d_year_385) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_431"]) - final aggregation over (c_customer_id_431, c_first_name_438, c_last_name_439, d_year_490) + final hashaggregation over (c_customer_id_431, c_first_name_438, c_last_name_439, d_year_490) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_431", "c_first_name_438", "c_last_name_439", "d_year_490"]) - partial aggregation over (c_customer_id_431, c_first_name_438, c_last_name_439, d_year_490) + partial hashaggregation over (c_customer_id_431, c_first_name_438, c_last_name_439, d_year_490) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_453"]) join (INNER, REPLICATED): @@ -74,17 +74,17 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_560"]) - single aggregation over (c_customer_id_560, c_first_name_567, c_last_name_568, d_year_608) + single hashaggregation over (c_customer_id_560, c_first_name_567, c_last_name_568, d_year_608) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_654"]) - final aggregation over (c_customer_id_654, c_first_name_661, c_last_name_662, d_year_713) + final hashaggregation over (c_customer_id_654, c_first_name_661, c_last_name_662, d_year_713) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_654", "c_first_name_661", "c_last_name_662", "d_year_713"]) - partial aggregation over (c_customer_id_654, c_first_name_661, c_last_name_662, d_year_713) + partial hashaggregation over (c_customer_id_654, c_first_name_661, c_last_name_662, d_year_713) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_676"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.reuse.plan.txt index d508b2205..33a1e25f6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q74.reuse.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["c_customer_id"]) - final aggregation over (c_customer_id, c_first_name, c_last_name, d_year) + final hashaggregation over (c_customer_id, c_first_name, c_last_name, d_year) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id", "c_first_name", "c_last_name", "d_year"]) - partial aggregation over (c_customer_id, c_first_name, c_last_name, d_year) + partial hashaggregation over (c_customer_id, c_first_name, c_last_name, d_year) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -20,7 +20,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_19"]) - single aggregation over (c_customer_id_19, c_first_name_26, c_last_name_27, d_year_44) + single hashaggregation over (c_customer_id_19, c_first_name_26, c_last_name_27, d_year_44) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -28,10 +28,10 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_114"]) - final aggregation over (c_customer_id_114, c_first_name_121, c_last_name_122, d_year_162) + final hashaggregation over (c_customer_id_114, c_first_name_121, c_last_name_122, d_year_162) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_114", "c_first_name_121", "c_last_name_122", "d_year_162"]) - partial aggregation over (c_customer_id_114, c_first_name_121, c_last_name_122, d_year_162) + partial hashaggregation over (c_customer_id_114, c_first_name_121, c_last_name_122, d_year_162) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk_135"]) join (INNER, REPLICATED): @@ -43,7 +43,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_113"]) scan customer remote exchange (REPARTITION, HASH, ["c_customer_id_208"]) - single aggregation over (c_customer_id_208, c_first_name_215, c_last_name_216, d_year_267) + single hashaggregation over (c_customer_id_208, c_first_name_215, c_last_name_216, d_year_267) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) @@ -51,17 +51,17 @@ local exchange (GATHER, SINGLE, []) values (0 rows) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_337"]) - single aggregation over (c_customer_id_337, c_first_name_344, c_last_name_345, d_year_385) + single hashaggregation over (c_customer_id_337, c_first_name_344, c_last_name_345, d_year_385) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_431"]) - final aggregation over (c_customer_id_431, c_first_name_438, c_last_name_439, d_year_490) + final hashaggregation over (c_customer_id_431, c_first_name_438, c_last_name_439, d_year_490) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_431", "c_first_name_438", "c_last_name_439", "d_year_490"]) - partial aggregation over (c_customer_id_431, c_first_name_438, c_last_name_439, d_year_490) + partial hashaggregation over (c_customer_id_431, c_first_name_438, c_last_name_439, d_year_490) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_453"]) join (INNER, REPLICATED): @@ -74,17 +74,17 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_560"]) - single aggregation over (c_customer_id_560, c_first_name_567, c_last_name_568, d_year_608) + single hashaggregation over (c_customer_id_560, c_first_name_567, c_last_name_568, d_year_608) join (INNER, REPLICATED): join (INNER, REPLICATED): values (0 rows) values (0 rows) values (0 rows) remote exchange (REPARTITION, HASH, ["c_customer_id_654"]) - final aggregation over (c_customer_id_654, c_first_name_661, c_last_name_662, d_year_713) + final hashaggregation over (c_customer_id_654, c_first_name_661, c_last_name_662, d_year_713) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_id_654", "c_first_name_661", "c_last_name_662", "d_year_713"]) - partial aggregation over (c_customer_id_654, c_first_name_661, c_last_name_662, d_year_713) + partial hashaggregation over (c_customer_id_654, c_first_name_661, c_last_name_662, d_year_713) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_676"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.cte.plan.txt index 6b8b43157..4b1490e7a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.cte.plan.txt @@ -5,11 +5,11 @@ local exchange (GATHER, SINGLE, []) Filter remote exchange (REPARTITION, HASH, ["d_year_172", "i_brand_id_173", "i_category_id_175", "i_class_id_174", "i_manufact_id_176", "sum", "sum_198"]) cte all_sales - single aggregation over (d_year_172, i_brand_id_173, i_category_id_175, i_class_id_174, i_manufact_id_176) - final aggregation over (d_year_172, expr_177, expr_178, i_brand_id_173, i_category_id_175, i_class_id_174, i_manufact_id_176) + single hashaggregation over (d_year_172, i_brand_id_173, i_category_id_175, i_class_id_174, i_manufact_id_176) + final hashaggregation over (d_year_172, expr_177, expr_178, i_brand_id_173, i_category_id_175, i_class_id_174, i_manufact_id_176) local exchange (REPARTITION, HASH, ["d_year_172", "i_brand_id_173", "i_category_id_175", "i_class_id_174", "i_manufact_id_176"]) remote exchange (REPARTITION, HASH, ["d_year", "i_brand_id", "i_category_id", "i_class_id", "i_manufact_id"]) - partial aggregation over (d_year, expr, expr_13, i_brand_id, i_category_id, i_class_id, i_manufact_id) + partial hashaggregation over (d_year, expr, expr_13, i_brand_id, i_category_id, i_class_id, i_manufact_id) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"]) join (INNER, REPLICATED): @@ -28,7 +28,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"]) scan catalog_returns remote exchange (REPARTITION, HASH, ["d_year_51", "i_brand_id_28", "i_category_id_32", "i_class_id_30", "i_manufact_id_34"]) - partial aggregation over (d_year_51, expr_84, expr_85, i_brand_id_28, i_category_id_32, i_class_id_30, i_manufact_id_34) + partial hashaggregation over (d_year_51, expr_84, expr_85, i_brand_id_28, i_category_id_32, i_class_id_30, i_manufact_id_34) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"]) join (INNER, REPLICATED): @@ -47,7 +47,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"]) scan store_returns remote exchange (REPARTITION, HASH, ["d_year_130", "i_brand_id_107", "i_category_id_111", "i_class_id_109", "i_manufact_id_113"]) - partial aggregation over (d_year_130, expr_163, expr_164, i_brand_id_107, i_category_id_111, i_class_id_109, i_manufact_id_113) + partial hashaggregation over (d_year_130, expr_163, expr_164, i_brand_id_107, i_category_id_111, i_class_id_109, i_manufact_id_113) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"]) join (INNER, REPLICATED): @@ -70,11 +70,11 @@ local exchange (GATHER, SINGLE, []) Filter remote exchange (REPARTITION, HASH, ["d_year_619", "i_brand_id_620", "i_category_id_622", "i_class_id_621", "i_manufact_id_623", "sum_652", "sum_653"]) cte all_sales - single aggregation over (d_year_619, i_brand_id_620, i_category_id_622, i_class_id_621, i_manufact_id_623) - final aggregation over (d_year_619, expr_624, expr_625, i_brand_id_620, i_category_id_622, i_class_id_621, i_manufact_id_623) + single hashaggregation over (d_year_619, i_brand_id_620, i_category_id_622, i_class_id_621, i_manufact_id_623) + final hashaggregation over (d_year_619, expr_624, expr_625, i_brand_id_620, i_category_id_622, i_class_id_621, i_manufact_id_623) local exchange (REPARTITION, HASH, ["d_year_619", "i_brand_id_620", "i_category_id_622", "i_class_id_621", "i_manufact_id_623"]) remote exchange (REPARTITION, HASH, ["d_year_298", "i_brand_id_275", "i_category_id_279", "i_class_id_277", "i_manufact_id_281"]) - partial aggregation over (d_year_298, expr_358, expr_359, i_brand_id_275, i_category_id_279, i_class_id_277, i_manufact_id_281) + partial hashaggregation over (d_year_298, expr_358, expr_359, i_brand_id_275, i_category_id_279, i_class_id_277, i_manufact_id_281) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk_249", "cs_order_number_251"]) join (INNER, REPLICATED): @@ -93,7 +93,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cr_item_sk_324", "cr_order_number_338"]) scan catalog_returns remote exchange (REPARTITION, HASH, ["d_year_420", "i_brand_id_397", "i_category_id_401", "i_class_id_399", "i_manufact_id_403"]) - partial aggregation over (d_year_420, expr_473, expr_474, i_brand_id_397, i_category_id_401, i_class_id_399, i_manufact_id_403) + partial hashaggregation over (d_year_420, expr_473, expr_474, i_brand_id_397, i_category_id_401, i_class_id_399, i_manufact_id_403) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk_369", "ss_ticket_number_376"]) join (INNER, REPLICATED): @@ -112,7 +112,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_item_sk_446", "sr_ticket_number_453"]) scan store_returns remote exchange (REPARTITION, HASH, ["d_year_553", "i_brand_id_530", "i_category_id_534", "i_class_id_532", "i_manufact_id_536"]) - partial aggregation over (d_year_553, expr_610, expr_611, i_brand_id_530, i_category_id_534, i_class_id_532, i_manufact_id_536) + partial hashaggregation over (d_year_553, expr_610, expr_611, i_brand_id_530, i_category_id_534, i_class_id_532, i_manufact_id_536) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk_492", "ws_order_number_506"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.plan.txt index b03663532..12ae4cf4d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): - single aggregation over (d_year_172, i_brand_id_173, i_category_id_175, i_class_id_174, i_manufact_id_176) - final aggregation over (d_year_172, expr_177, expr_178, i_brand_id_173, i_category_id_175, i_class_id_174, i_manufact_id_176) + single hashaggregation over (d_year_172, i_brand_id_173, i_category_id_175, i_class_id_174, i_manufact_id_176) + final hashaggregation over (d_year_172, expr_177, expr_178, i_brand_id_173, i_category_id_175, i_class_id_174, i_manufact_id_176) local exchange (REPARTITION, HASH, ["d_year_172", "i_brand_id_173", "i_category_id_175", "i_class_id_174", "i_manufact_id_176"]) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id", "i_manufact_id"]) - partial aggregation over (d_year, expr, expr_13, i_brand_id, i_category_id, i_class_id, i_manufact_id) + partial hashaggregation over (d_year, expr, expr_13, i_brand_id, i_category_id, i_class_id, i_manufact_id) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"]) scan catalog_returns @@ -21,7 +21,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim remote exchange (REPARTITION, HASH, ["i_brand_id_28", "i_category_id_32", "i_class_id_30", "i_manufact_id_34"]) - partial aggregation over (d_year_51, expr_84, expr_85, i_brand_id_28, i_category_id_32, i_class_id_30, i_manufact_id_34) + partial hashaggregation over (d_year_51, expr_84, expr_85, i_brand_id_28, i_category_id_32, i_class_id_30, i_manufact_id_34) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"]) scan store_returns @@ -37,7 +37,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim remote exchange (REPARTITION, HASH, ["i_brand_id_107", "i_category_id_111", "i_class_id_109", "i_manufact_id_113"]) - partial aggregation over (d_year_130, expr_163, expr_164, i_brand_id_107, i_category_id_111, i_class_id_109, i_manufact_id_113) + partial hashaggregation over (d_year_130, expr_163, expr_164, i_brand_id_107, i_category_id_111, i_class_id_109, i_manufact_id_113) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"]) scan web_returns @@ -52,11 +52,11 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - single aggregation over (d_year_619, i_brand_id_620, i_category_id_622, i_class_id_621, i_manufact_id_623) - final aggregation over (d_year_619, expr_624, expr_625, i_brand_id_620, i_category_id_622, i_class_id_621, i_manufact_id_623) + single hashaggregation over (d_year_619, i_brand_id_620, i_category_id_622, i_class_id_621, i_manufact_id_623) + final hashaggregation over (d_year_619, expr_624, expr_625, i_brand_id_620, i_category_id_622, i_class_id_621, i_manufact_id_623) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_275", "i_category_id_279", "i_class_id_277", "i_manufact_id_281"]) - partial aggregation over (d_year_298, expr_358, expr_359, i_brand_id_275, i_category_id_279, i_class_id_277, i_manufact_id_281) + partial hashaggregation over (d_year_298, expr_358, expr_359, i_brand_id_275, i_category_id_279, i_class_id_277, i_manufact_id_281) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk_324", "cr_order_number_338"]) scan catalog_returns @@ -72,7 +72,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim remote exchange (REPARTITION, HASH, ["i_brand_id_397", "i_category_id_401", "i_class_id_399", "i_manufact_id_403"]) - partial aggregation over (d_year_420, expr_473, expr_474, i_brand_id_397, i_category_id_401, i_class_id_399, i_manufact_id_403) + partial hashaggregation over (d_year_420, expr_473, expr_474, i_brand_id_397, i_category_id_401, i_class_id_399, i_manufact_id_403) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk_446", "sr_ticket_number_453"]) scan store_returns @@ -88,7 +88,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim remote exchange (REPARTITION, HASH, ["i_brand_id_530", "i_category_id_534", "i_class_id_532", "i_manufact_id_536"]) - partial aggregation over (d_year_553, expr_610, expr_611, i_brand_id_530, i_category_id_534, i_class_id_532, i_manufact_id_536) + partial hashaggregation over (d_year_553, expr_610, expr_611, i_brand_id_530, i_category_id_534, i_class_id_532, i_manufact_id_536) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_item_sk_579", "wr_order_number_590"]) scan web_returns diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.push.plan.txt index 38ffab238..c5fdc3344 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.push.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): - single aggregation over (d_year_183, i_brand_id_184, i_category_id_186, i_class_id_185, i_manufact_id_187) - final aggregation over (d_year_183, expr_188, expr_189, i_brand_id_184, i_category_id_186, i_class_id_185, i_manufact_id_187) + single hashaggregation over (d_year_183, i_brand_id_184, i_category_id_186, i_class_id_185, i_manufact_id_187) + final hashaggregation over (d_year_183, expr_188, expr_189, i_brand_id_184, i_category_id_186, i_class_id_185, i_manufact_id_187) local exchange (REPARTITION, HASH, ["d_year_183", "i_brand_id_184", "i_category_id_186", "i_class_id_185", "i_manufact_id_187"]) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id", "i_manufact_id"]) - partial aggregation over (d_year, expr, expr_16, i_brand_id, i_category_id, i_class_id, i_manufact_id) + partial hashaggregation over (d_year, expr, expr_16, i_brand_id, i_category_id, i_class_id, i_manufact_id) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"]) scan catalog_returns @@ -21,7 +21,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) remote exchange (REPARTITION, HASH, ["i_brand_id_32", "i_category_id_36", "i_class_id_34", "i_manufact_id_38"]) - partial aggregation over (d_year_56, expr_91, expr_92, i_brand_id_32, i_category_id_36, i_class_id_34, i_manufact_id_38) + partial hashaggregation over (d_year_56, expr_91, expr_92, i_brand_id_32, i_category_id_36, i_class_id_34, i_manufact_id_38) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"]) scan store_returns @@ -37,7 +37,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) remote exchange (REPARTITION, HASH, ["i_brand_id_115", "i_category_id_119", "i_class_id_117", "i_manufact_id_121"]) - partial aggregation over (d_year_139, expr_174, expr_175, i_brand_id_115, i_category_id_119, i_class_id_117, i_manufact_id_121) + partial hashaggregation over (d_year_139, expr_174, expr_175, i_brand_id_115, i_category_id_119, i_class_id_117, i_manufact_id_121) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"]) scan web_returns @@ -52,11 +52,11 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - single aggregation over (d_year_642, i_brand_id_643, i_category_id_645, i_class_id_644, i_manufact_id_646) - final aggregation over (d_year_642, expr_647, expr_648, i_brand_id_643, i_category_id_645, i_class_id_644, i_manufact_id_646) + single hashaggregation over (d_year_642, i_brand_id_643, i_category_id_645, i_class_id_644, i_manufact_id_646) + final hashaggregation over (d_year_642, expr_647, expr_648, i_brand_id_643, i_category_id_645, i_class_id_644, i_manufact_id_646) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_287", "i_category_id_291", "i_class_id_289", "i_manufact_id_293"]) - partial aggregation over (d_year_311, expr_373, expr_374, i_brand_id_287, i_category_id_291, i_class_id_289, i_manufact_id_293) + partial hashaggregation over (d_year_311, expr_373, expr_374, i_brand_id_287, i_category_id_291, i_class_id_289, i_manufact_id_293) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk_338", "cr_order_number_352"]) scan catalog_returns @@ -72,7 +72,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) remote exchange (REPARTITION, HASH, ["i_brand_id_413", "i_category_id_417", "i_class_id_415", "i_manufact_id_419"]) - partial aggregation over (d_year_437, expr_492, expr_493, i_brand_id_413, i_category_id_417, i_class_id_415, i_manufact_id_419) + partial hashaggregation over (d_year_437, expr_492, expr_493, i_brand_id_413, i_category_id_417, i_class_id_415, i_manufact_id_419) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk_464", "sr_ticket_number_471"]) scan store_returns @@ -88,7 +88,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) remote exchange (REPARTITION, HASH, ["i_brand_id_550", "i_category_id_554", "i_class_id_552", "i_manufact_id_556"]) - partial aggregation over (d_year_574, expr_633, expr_634, i_brand_id_550, i_category_id_554, i_class_id_552, i_manufact_id_556) + partial hashaggregation over (d_year_574, expr_633, expr_634, i_brand_id_550, i_category_id_554, i_class_id_552, i_manufact_id_556) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_item_sk_601", "wr_order_number_612"]) scan web_returns diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.reuse.plan.txt index 2ee3e4b1b..f00506b69 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q75.reuse.plan.txt @@ -1,11 +1,11 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): - single aggregation over (d_year_183, i_brand_id_184, i_category_id_186, i_class_id_185, i_manufact_id_187) - final aggregation over (d_year_183, expr_188, expr_189, i_brand_id_184, i_category_id_186, i_class_id_185, i_manufact_id_187) + single hashaggregation over (d_year_183, i_brand_id_184, i_category_id_186, i_class_id_185, i_manufact_id_187) + final hashaggregation over (d_year_183, expr_188, expr_189, i_brand_id_184, i_category_id_186, i_class_id_185, i_manufact_id_187) local exchange (REPARTITION, HASH, ["d_year_183", "i_brand_id_184", "i_category_id_186", "i_class_id_185", "i_manufact_id_187"]) remote exchange (REPARTITION, HASH, ["i_brand_id", "i_category_id", "i_class_id", "i_manufact_id"]) - partial aggregation over (d_year, expr, expr_16, i_brand_id, i_category_id, i_class_id, i_manufact_id) + partial hashaggregation over (d_year, expr, expr_16, i_brand_id, i_category_id, i_class_id, i_manufact_id) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"]) scan catalog_returns @@ -21,7 +21,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) ReuseTableScan date_dim (Consumer) remote exchange (REPARTITION, HASH, ["i_brand_id_32", "i_category_id_36", "i_class_id_34", "i_manufact_id_38"]) - partial aggregation over (d_year_56, expr_91, expr_92, i_brand_id_32, i_category_id_36, i_class_id_34, i_manufact_id_38) + partial hashaggregation over (d_year_56, expr_91, expr_92, i_brand_id_32, i_category_id_36, i_class_id_34, i_manufact_id_38) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"]) scan store_returns @@ -37,7 +37,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) ReuseTableScan date_dim (Consumer) remote exchange (REPARTITION, HASH, ["i_brand_id_115", "i_category_id_119", "i_class_id_117", "i_manufact_id_121"]) - partial aggregation over (d_year_139, expr_174, expr_175, i_brand_id_115, i_category_id_119, i_class_id_117, i_manufact_id_121) + partial hashaggregation over (d_year_139, expr_174, expr_175, i_brand_id_115, i_category_id_119, i_class_id_117, i_manufact_id_121) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"]) scan web_returns @@ -52,11 +52,11 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) ReuseTableScan date_dim (Producer) - single aggregation over (d_year_642, i_brand_id_643, i_category_id_645, i_class_id_644, i_manufact_id_646) - final aggregation over (d_year_642, expr_647, expr_648, i_brand_id_643, i_category_id_645, i_class_id_644, i_manufact_id_646) + single hashaggregation over (d_year_642, i_brand_id_643, i_category_id_645, i_class_id_644, i_manufact_id_646) + final hashaggregation over (d_year_642, expr_647, expr_648, i_brand_id_643, i_category_id_645, i_class_id_644, i_manufact_id_646) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand_id_287", "i_category_id_291", "i_class_id_289", "i_manufact_id_293"]) - partial aggregation over (d_year_311, expr_373, expr_374, i_brand_id_287, i_category_id_291, i_class_id_289, i_manufact_id_293) + partial hashaggregation over (d_year_311, expr_373, expr_374, i_brand_id_287, i_category_id_291, i_class_id_289, i_manufact_id_293) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk_338", "cr_order_number_352"]) scan catalog_returns @@ -72,7 +72,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) ReuseTableScan date_dim (Consumer) remote exchange (REPARTITION, HASH, ["i_brand_id_413", "i_category_id_417", "i_class_id_415", "i_manufact_id_419"]) - partial aggregation over (d_year_437, expr_492, expr_493, i_brand_id_413, i_category_id_417, i_class_id_415, i_manufact_id_419) + partial hashaggregation over (d_year_437, expr_492, expr_493, i_brand_id_413, i_category_id_417, i_class_id_415, i_manufact_id_419) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk_464", "sr_ticket_number_471"]) scan store_returns @@ -88,7 +88,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) ReuseTableScan date_dim (Consumer) remote exchange (REPARTITION, HASH, ["i_brand_id_550", "i_category_id_554", "i_class_id_552", "i_manufact_id_556"]) - partial aggregation over (d_year_574, expr_633, expr_634, i_brand_id_550, i_category_id_554, i_class_id_552, i_manufact_id_556) + partial hashaggregation over (d_year_574, expr_633, expr_634, i_brand_id_550, i_category_id_554, i_class_id_552, i_manufact_id_556) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_item_sk_601", "wr_order_number_612"]) scan web_returns diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q76.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q76.plan.txt index dbf5ad8ab..22d407884 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q76.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q76.plan.txt @@ -1,10 +1,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_qoy_168, d_year_167, expr_165, expr_166, i_category_169) + final hashaggregation over (d_qoy_168, d_year_167, expr_165, expr_166, i_category_169) local exchange (REPARTITION, HASH, ["d_qoy_168", "d_year_167", "expr_165", "expr_166", "i_category_169"]) local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["cast", "d_qoy", "d_year", "expr_217", "i_category"]) - partial aggregation over (cast, d_qoy, d_year, expr_217, i_category) + partial hashaggregation over (cast, d_qoy, d_year, expr_217, i_category) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -15,7 +15,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim remote exchange (REPARTITION, HASH, ["cast_222", "d_qoy_49", "d_year_45", "expr_223", "i_category_29"]) - partial aggregation over (cast_222, d_qoy_49, d_year_45, expr_223, i_category_29) + partial hashaggregation over (cast_222, d_qoy_49, d_year_45, expr_223, i_category_29) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_sold_date_sk"]) join (INNER, PARTITIONED): @@ -28,7 +28,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_date_sk_39"]) scan date_dim remote exchange (REPARTITION, HASH, ["d_qoy_129", "d_year_125", "expr_147", "expr_160", "i_category_109"]) - partial aggregation over (d_qoy_129, d_year_125, expr_147, expr_160, i_category_109) + partial hashaggregation over (d_qoy_129, d_year_125, expr_147, expr_160, i_category_109) join (INNER, REPLICATED): join (INNER, REPLICATED): scan catalog_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q76.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q76.push.plan.txt index b525e3c03..a9b913c9e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q76.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q76.push.plan.txt @@ -1,10 +1,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (d_qoy_176, d_year_175, expr_173, expr_174, i_category_177) + final hashaggregation over (d_qoy_176, d_year_175, expr_173, expr_174, i_category_177) local exchange (REPARTITION, HASH, ["d_qoy_176", "d_year_175", "expr_173", "expr_174", "i_category_177"]) local exchange (REPARTITION, ROUND_ROBIN, []) remote exchange (REPARTITION, HASH, ["cast", "d_qoy", "d_year", "expr_225", "i_category"]) - partial aggregation over (cast, d_qoy, d_year, expr_225, i_category) + partial hashaggregation over (cast, d_qoy, d_year, expr_225, i_category) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk"]) join (INNER, PARTITIONED): @@ -17,7 +17,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_sk"]) scan item remote exchange (REPARTITION, HASH, ["cast_230", "d_qoy_53", "d_year_49", "expr_231", "i_category_32"]) - partial aggregation over (cast_230, d_qoy_53, d_year_49, expr_231, i_category_32) + partial hashaggregation over (cast_230, d_qoy_53, d_year_49, expr_231, i_category_32) join (INNER, REPLICATED): scan item local exchange (GATHER, SINGLE, []) @@ -28,7 +28,7 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan web_sales (pushdown = true) remote exchange (REPARTITION, HASH, ["d_qoy_136", "d_year_132", "expr_155", "expr_168", "i_category_115"]) - partial aggregation over (d_qoy_136, d_year_132, expr_155, expr_168, i_category_115) + partial hashaggregation over (d_qoy_136, d_year_132, expr_155, expr_168, i_category_115) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk_103"]) scan item diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q77.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q77.plan.txt index f5f8b7b62..68c2f23fc 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q77.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q77.plan.txt @@ -1,15 +1,15 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, id$gid) + final hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) - partial aggregation over (channel$gid, groupid, id$gid) + partial hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, ROUND_ROBIN, []) join (LEFT, PARTITIONED): - final aggregation over (ss_store_sk) + final hashaggregation over (ss_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_store_sk"]) - partial aggregation over (ss_store_sk) + partial hashaggregation over (ss_store_sk) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -19,10 +19,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store - final aggregation over (sr_store_sk) + final hashaggregation over (sr_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["sr_store_sk"]) - partial aggregation over (sr_store_sk) + partial hashaggregation over (sr_store_sk) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_returns @@ -33,10 +33,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store cross join: - final aggregation over (cs_call_center_sk) + final hashaggregation over (cs_call_center_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_call_center_sk"]) - partial aggregation over (cs_call_center_sk) + partial hashaggregation over (cs_call_center_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) @@ -44,20 +44,20 @@ local exchange (GATHER, SINGLE, []) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (cr_call_center_sk) + final hashaggregation over (cr_call_center_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cr_call_center_sk"]) - partial aggregation over (cr_call_center_sk) + partial hashaggregation over (cr_call_center_sk) join (INNER, REPLICATED): scan catalog_returns local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim join (LEFT, PARTITIONED): - final aggregation over (ws_web_page_sk) + final hashaggregation over (ws_web_page_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_web_page_sk"]) - partial aggregation over (ws_web_page_sk) + partial hashaggregation over (ws_web_page_sk) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales @@ -67,10 +67,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan web_page - final aggregation over (wr_web_page_sk) + final hashaggregation over (wr_web_page_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["wr_web_page_sk"]) - partial aggregation over (wr_web_page_sk) + partial hashaggregation over (wr_web_page_sk) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_returns diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q77.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q77.push.plan.txt index d55948eee..3fb6fd24c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q77.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q77.push.plan.txt @@ -1,15 +1,15 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, id$gid) + final hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) - partial aggregation over (channel$gid, groupid, id$gid) + partial hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, ROUND_ROBIN, []) join (LEFT, PARTITIONED): - final aggregation over (s_store_sk) + final hashaggregation over (s_store_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_sk"]) - partial aggregation over (s_store_sk) + partial hashaggregation over (s_store_sk) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales @@ -19,10 +19,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store - final aggregation over (s_store_sk_50) + final hashaggregation over (s_store_sk_50) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_sk_50"]) - partial aggregation over (s_store_sk_50) + partial hashaggregation over (s_store_sk_50) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_returns @@ -33,10 +33,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store cross join: - final aggregation over (cs_call_center_sk) + final hashaggregation over (cs_call_center_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_call_center_sk"]) - partial aggregation over (cs_call_center_sk) + partial hashaggregation over (cs_call_center_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) @@ -44,20 +44,20 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (cr_call_center_sk) + final hashaggregation over (cr_call_center_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cr_call_center_sk"]) - partial aggregation over (cr_call_center_sk) + partial hashaggregation over (cr_call_center_sk) join (INNER, REPLICATED): scan catalog_returns local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) join (LEFT, PARTITIONED): - final aggregation over (wp_web_page_sk) + final hashaggregation over (wp_web_page_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["wp_web_page_sk"]) - partial aggregation over (wp_web_page_sk) + partial hashaggregation over (wp_web_page_sk) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales @@ -67,10 +67,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan web_page - final aggregation over (wp_web_page_sk_312) + final hashaggregation over (wp_web_page_sk_312) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["wp_web_page_sk_312"]) - partial aggregation over (wp_web_page_sk_312) + partial hashaggregation over (wp_web_page_sk_312) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_returns diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.plan.txt index 1dd0b42c7..21460b50a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.plan.txt @@ -3,10 +3,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, PARTITIONED): - final aggregation over (d_year, ss_customer_sk, ss_item_sk) + final hashaggregation over (d_year, ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "ss_customer_sk", "ss_item_sk"]) - partial aggregation over (d_year, ss_customer_sk, ss_item_sk) + partial hashaggregation over (d_year, ss_customer_sk, ss_item_sk) join (INNER, REPLICATED): join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"]) @@ -17,10 +17,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - final aggregation over (d_year_53, ws_bill_customer_sk, ws_item_sk) + final hashaggregation over (d_year_53, ws_bill_customer_sk, ws_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year_53", "ws_bill_customer_sk", "ws_item_sk"]) - partial aggregation over (d_year_53, ws_bill_customer_sk, ws_item_sk) + partial hashaggregation over (d_year_53, ws_bill_customer_sk, ws_item_sk) join (INNER, REPLICATED): join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"]) @@ -33,10 +33,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) - final aggregation over (cs_bill_customer_sk, cs_item_sk, d_year_130) + final hashaggregation over (cs_bill_customer_sk, cs_item_sk, d_year_130) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk", "d_year_130"]) - partial aggregation over (cs_bill_customer_sk, cs_item_sk, d_year_130) + partial hashaggregation over (cs_bill_customer_sk, cs_item_sk, d_year_130) join (INNER, REPLICATED): join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.push.plan.txt index c9ab7c568..6e4327d4a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.push.plan.txt @@ -3,10 +3,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, PARTITIONED): - final aggregation over (d_year, ss_customer_sk, ss_item_sk) + final hashaggregation over (d_year, ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "ss_customer_sk", "ss_item_sk"]) - partial aggregation over (d_year, ss_customer_sk, ss_item_sk) + partial hashaggregation over (d_year, ss_customer_sk, ss_item_sk) join (INNER, REPLICATED): join (LEFT, REPLICATED): scan store_sales @@ -16,10 +16,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - final aggregation over (d_year_57, ws_bill_customer_sk, ws_item_sk) + final hashaggregation over (d_year_57, ws_bill_customer_sk, ws_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year_57", "ws_bill_customer_sk", "ws_item_sk"]) - partial aggregation over (d_year_57, ws_bill_customer_sk, ws_item_sk) + partial hashaggregation over (d_year_57, ws_bill_customer_sk, ws_item_sk) join (INNER, REPLICATED): join (LEFT, REPLICATED): scan web_sales @@ -31,10 +31,10 @@ local exchange (GATHER, SINGLE, []) scan date_dim (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) - final aggregation over (cs_bill_customer_sk, cs_item_sk, d_year_137) + final hashaggregation over (cs_bill_customer_sk, cs_item_sk, d_year_137) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk", "d_year_137"]) - partial aggregation over (cs_bill_customer_sk, cs_item_sk, d_year_137) + partial hashaggregation over (cs_bill_customer_sk, cs_item_sk, d_year_137) join (INNER, REPLICATED): join (LEFT, REPLICATED): scan catalog_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.reuse.plan.txt index 7d48da9d4..5c02b39dc 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q78.reuse.plan.txt @@ -3,10 +3,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, PARTITIONED): - final aggregation over (d_year, ss_customer_sk, ss_item_sk) + final hashaggregation over (d_year, ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year", "ss_customer_sk", "ss_item_sk"]) - partial aggregation over (d_year, ss_customer_sk, ss_item_sk) + partial hashaggregation over (d_year, ss_customer_sk, ss_item_sk) join (INNER, REPLICATED): join (LEFT, REPLICATED): scan store_sales @@ -16,10 +16,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) ReuseTableScan date_dim (Consumer) - final aggregation over (d_year_57, ws_bill_customer_sk, ws_item_sk) + final hashaggregation over (d_year_57, ws_bill_customer_sk, ws_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_year_57", "ws_bill_customer_sk", "ws_item_sk"]) - partial aggregation over (d_year_57, ws_bill_customer_sk, ws_item_sk) + partial hashaggregation over (d_year_57, ws_bill_customer_sk, ws_item_sk) join (INNER, REPLICATED): join (LEFT, REPLICATED): scan web_sales @@ -31,10 +31,10 @@ local exchange (GATHER, SINGLE, []) ReuseTableScan date_dim (Consumer) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) - final aggregation over (cs_bill_customer_sk, cs_item_sk, d_year_137) + final hashaggregation over (cs_bill_customer_sk, cs_item_sk, d_year_137) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk", "d_year_137"]) - partial aggregation over (cs_bill_customer_sk, cs_item_sk, d_year_137) + partial hashaggregation over (cs_bill_customer_sk, cs_item_sk, d_year_137) join (INNER, REPLICATED): join (LEFT, REPLICATED): scan catalog_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q79.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q79.plan.txt index 5efde1d3d..a60f1872c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q79.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q79.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (s_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + final hashaggregation over (s_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_city", "ss_addr_sk", "ss_customer_sk", "ss_ticket_number"]) - partial aggregation over (s_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + partial hashaggregation over (s_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q79.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q79.push.plan.txt index b3b4bfa5a..71a10f725 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q79.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q79.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - final aggregation over (s_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + final hashaggregation over (s_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_city", "ss_addr_sk", "ss_customer_sk", "ss_ticket_number"]) - partial aggregation over (s_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) + partial hashaggregation over (s_city, ss_addr_sk, ss_customer_sk, ss_ticket_number) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.plan.txt index a4b2da9fd..8023d7e89 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.plan.txt @@ -1,14 +1,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, id$gid) + final hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) - partial aggregation over (channel$gid, groupid, id$gid) + partial hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (s_store_id) + final hashaggregation over (s_store_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id"]) - partial aggregation over (s_store_id) + partial hashaggregation over (s_store_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -31,10 +31,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store - final aggregation over (cp_catalog_page_id) + final hashaggregation over (cp_catalog_page_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cp_catalog_page_id"]) - partial aggregation over (cp_catalog_page_id) + partial hashaggregation over (cp_catalog_page_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -57,10 +57,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan catalog_page - final aggregation over (web_site_id) + final hashaggregation over (web_site_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["web_site_id"]) - partial aggregation over (web_site_id) + partial hashaggregation over (web_site_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.push.plan.txt index 74b1b08b7..54ab80084 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.push.plan.txt @@ -1,14 +1,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, id$gid) + final hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) - partial aggregation over (channel$gid, groupid, id$gid) + partial hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (s_store_id) + final hashaggregation over (s_store_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id"]) - partial aggregation over (s_store_id) + partial hashaggregation over (s_store_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -30,10 +30,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store - final aggregation over (cp_catalog_page_id) + final hashaggregation over (cp_catalog_page_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cp_catalog_page_id"]) - partial aggregation over (cp_catalog_page_id) + partial hashaggregation over (cp_catalog_page_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cp_catalog_page_sk"]) scan catalog_page @@ -56,10 +56,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan promotion (pushdown = true) - final aggregation over (web_site_id) + final hashaggregation over (web_site_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["web_site_id"]) - partial aggregation over (web_site_id) + partial hashaggregation over (web_site_id) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.reuse.plan.txt index c95cb74b9..63c060fcd 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q80.reuse.plan.txt @@ -1,14 +1,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (channel$gid, groupid, id$gid) + final hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) remote exchange (REPARTITION, HASH, ["channel$gid", "groupid", "id$gid"]) - partial aggregation over (channel$gid, groupid, id$gid) + partial hashaggregation over (channel$gid, groupid, id$gid) local exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (s_store_id) + final hashaggregation over (s_store_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["s_store_id"]) - partial aggregation over (s_store_id) + partial hashaggregation over (s_store_id) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -30,10 +30,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan store - final aggregation over (cp_catalog_page_id) + final hashaggregation over (cp_catalog_page_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cp_catalog_page_id"]) - partial aggregation over (cp_catalog_page_id) + partial hashaggregation over (cp_catalog_page_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cp_catalog_page_sk"]) scan catalog_page @@ -56,10 +56,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) ReuseTableScan promotion (Consumer) - final aggregation over (web_site_id) + final hashaggregation over (web_site_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["web_site_id"]) - partial aggregation over (web_site_id) + partial hashaggregation over (web_site_id) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.cte.plan.txt index 52b44cf7f..3da7f24da 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.cte.plan.txt @@ -6,10 +6,10 @@ local exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"]) cte customer_total_return - final aggregation over (ca_state, cr_returning_customer_sk) + final hashaggregation over (ca_state, cr_returning_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "cr_returning_customer_sk"]) - partial aggregation over (ca_state, cr_returning_customer_sk) + partial hashaggregation over (ca_state, cr_returning_customer_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"]) join (INNER, REPLICATED): @@ -33,16 +33,16 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (ca_state_93) + final hashaggregation over (ca_state_93) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_93"]) - partial aggregation over (ca_state_93) + partial hashaggregation over (ca_state_93) remote exchange (REPARTITION, HASH, ["ca_state_93", "cr_returning_customer_sk_37", "sum_103"]) cte customer_total_return - final aggregation over (ca_state_93, cr_returning_customer_sk_37) + final hashaggregation over (ca_state_93, cr_returning_customer_sk_37) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_93", "cr_returning_customer_sk_37"]) - partial aggregation over (ca_state_93, cr_returning_customer_sk_37) + partial hashaggregation over (ca_state_93, cr_returning_customer_sk_37) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_40"]) join (INNER, REPLICATED): @@ -57,5 +57,5 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.plan.txt index 803688229..80f41e19d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.plan.txt @@ -4,10 +4,10 @@ local exchange (GATHER, SINGLE, []) join (LEFT, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"]) - final aggregation over (ca_state, cr_returning_customer_sk) + final hashaggregation over (ca_state, cr_returning_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "cr_returning_customer_sk"]) - partial aggregation over (ca_state, cr_returning_customer_sk) + partial hashaggregation over (ca_state, cr_returning_customer_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"]) join (INNER, REPLICATED): @@ -27,14 +27,14 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over (ca_state_93) + final hashaggregation over (ca_state_93) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_93"]) - partial aggregation over (ca_state_93) - final aggregation over (ca_state_93, cr_returning_customer_sk_37) + partial hashaggregation over (ca_state_93) + final hashaggregation over (ca_state_93, cr_returning_customer_sk_37) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_93", "cr_returning_customer_sk_37"]) - partial aggregation over (ca_state_93, cr_returning_customer_sk_37) + partial hashaggregation over (ca_state_93, cr_returning_customer_sk_37) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_40"]) join (INNER, REPLICATED): @@ -47,5 +47,5 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.push.plan.txt index f90f0e456..569a7baaf 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.push.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state"]) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"]) - final aggregation over (ca_state, cr_returning_customer_sk) + final hashaggregation over (ca_state, cr_returning_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "cr_returning_customer_sk"]) - partial aggregation over (ca_state, cr_returning_customer_sk) + partial hashaggregation over (ca_state, cr_returning_customer_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"]) join (INNER, REPLICATED): @@ -26,14 +26,14 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer_address (pushdown = true) - final aggregation over (ca_state_99) + final hashaggregation over (ca_state_99) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_99"]) - partial aggregation over (ca_state_99) - final aggregation over (ca_state_99, cr_returning_customer_sk_41) + partial hashaggregation over (ca_state_99) + final hashaggregation over (ca_state_99, cr_returning_customer_sk_41) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_99", "cr_returning_customer_sk_41"]) - partial aggregation over (ca_state_99, cr_returning_customer_sk_41) + partial hashaggregation over (ca_state_99, cr_returning_customer_sk_41) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_44"]) join (INNER, REPLICATED): @@ -46,5 +46,5 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.reuse.plan.txt index a999e8c33..21cdf6a2b 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q81.reuse.plan.txt @@ -5,10 +5,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state"]) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"]) - final aggregation over (ca_state, cr_returning_customer_sk) + final hashaggregation over (ca_state, cr_returning_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state", "cr_returning_customer_sk"]) - partial aggregation over (ca_state, cr_returning_customer_sk) + partial hashaggregation over (ca_state, cr_returning_customer_sk) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"]) join (INNER, REPLICATED): @@ -26,14 +26,14 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan customer_address - final aggregation over (ca_state_99) + final hashaggregation over (ca_state_99) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_99"]) - partial aggregation over (ca_state_99) - final aggregation over (ca_state_99, cr_returning_customer_sk_41) + partial hashaggregation over (ca_state_99) + final hashaggregation over (ca_state_99, cr_returning_customer_sk_41) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ca_state_99", "cr_returning_customer_sk_41"]) - partial aggregation over (ca_state_99, cr_returning_customer_sk_41) + partial hashaggregation over (ca_state_99, cr_returning_customer_sk_41) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_44"]) join (INNER, REPLICATED): @@ -46,5 +46,5 @@ local exchange (GATHER, SINGLE, []) scan customer_address local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q82.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q82.plan.txt index 0c8eb3bf4..a9f09754b 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q82.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q82.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_current_price, i_item_desc, i_item_id) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q82.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q82.push.plan.txt index 5b9503563..73b16a9ec 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q82.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q82.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_current_price, i_item_desc, i_item_id) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q83.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q83.plan.txt index 8dbec1ac0..669ad507a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q83.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q83.plan.txt @@ -1,10 +1,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -23,10 +23,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim join (INNER, PARTITIONED): - final aggregation over (i_item_id_82) + final hashaggregation over (i_item_id_82) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_82"]) - partial aggregation over (i_item_id_82) + partial hashaggregation over (i_item_id_82) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -44,10 +44,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - final aggregation over (i_item_id_216) + final hashaggregation over (i_item_id_216) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_216"]) - partial aggregation over (i_item_id_216) + partial hashaggregation over (i_item_id_216) semijoin (REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q83.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q83.push.plan.txt index 68dead287..a44303262 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q83.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q83.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) join (INNER, PARTITIONED): join (INNER, PARTITIONED): - final aggregation over (i_item_id_87) + final hashaggregation over (i_item_id_87) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_87"]) - partial aggregation over (i_item_id_87) + partial hashaggregation over (i_item_id_87) semijoin (REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cr_item_sk"]) @@ -25,10 +25,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - final aggregation over (i_item_id_226) + final hashaggregation over (i_item_id_226) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id_226"]) - partial aggregation over (i_item_id_226) + partial hashaggregation over (i_item_id_226) semijoin (REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk_225"]) @@ -47,10 +47,10 @@ local exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - final aggregation over (i_item_id) + final hashaggregation over (i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_item_id"]) - partial aggregation over (i_item_id) + partial hashaggregation over (i_item_id) semijoin (REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["sr_item_sk"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q85.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q85.plan.txt index 209c0a446..4221a49ca 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q85.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q85.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (r_reason_desc) + final hashaggregation over (r_reason_desc) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["r_reason_desc"]) - partial aggregation over (r_reason_desc) + partial hashaggregation over (r_reason_desc) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q85.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q85.push.plan.txt index 68e18feb1..6187f9a11 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q85.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q85.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (r_reason_desc) + final hashaggregation over (r_reason_desc) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["r_reason_desc"]) - partial aggregation over (r_reason_desc) + partial hashaggregation over (r_reason_desc) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_reason_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q86.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q86.plan.txt index 5f7832a4e..9918e017c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q86.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q86.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_10", "expr_9"]) - final aggregation over (groupid, i_category$gid, i_class$gid) + final hashaggregation over (groupid, i_category$gid, i_class$gid) local exchange (REPARTITION, HASH, ["groupid", "i_category$gid", "i_class$gid"]) remote exchange (REPARTITION, HASH, ["groupid", "i_category$gid", "i_class$gid"]) - partial aggregation over (groupid, i_category$gid, i_class$gid) + partial hashaggregation over (groupid, i_category$gid, i_class$gid) join (INNER, REPLICATED): join (INNER, REPLICATED): scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q86.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q86.push.plan.txt index dcd47a125..ad86060d7 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q86.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q86.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_11", "expr_12"]) - final aggregation over (groupid, i_category$gid, i_class$gid) + final hashaggregation over (groupid, i_category$gid, i_class$gid) local exchange (REPARTITION, HASH, ["groupid", "i_category$gid", "i_class$gid"]) remote exchange (REPARTITION, HASH, ["groupid", "i_category$gid", "i_class$gid"]) - partial aggregation over (groupid, i_category$gid, i_class$gid) + partial hashaggregation over (groupid, i_category$gid, i_class$gid) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_item_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q87.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q87.plan.txt index a751eb3b3..a5ea0e48e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q87.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q87.plan.txt @@ -1,14 +1,14 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (expr_130, expr_131, expr_132) + partial hashaggregation over () + final hashaggregation over (expr_130, expr_131, expr_132) local exchange (REPARTITION, HASH, ["expr_130", "expr_131", "expr_132"]) - partial aggregation over (c_first_name, c_last_name, d_date) - final aggregation over (c_first_name, c_last_name, d_date) + partial hashaggregation over (c_first_name, c_last_name, d_date) + final hashaggregation over (c_first_name, c_last_name, d_date) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "d_date"]) - partial aggregation over (c_first_name, c_last_name, d_date) + partial hashaggregation over (c_first_name, c_last_name, d_date) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -19,11 +19,11 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer - partial aggregation over (c_first_name_47, c_last_name_48, d_date_13) - final aggregation over (c_first_name_47, c_last_name_48, d_date_13) + partial hashaggregation over (c_first_name_47, c_last_name_48, d_date_13) + final hashaggregation over (c_first_name_47, c_last_name_48, d_date_13) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_47", "c_last_name_48", "d_date_13"]) - partial aggregation over (c_first_name_47, c_last_name_48, d_date_13) + partial hashaggregation over (c_first_name_47, c_last_name_48, d_date_13) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) join (INNER, REPLICATED): @@ -34,11 +34,11 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_39"]) scan customer - partial aggregation over (c_first_name_108, c_last_name_109, d_date_74) - final aggregation over (c_first_name_108, c_last_name_109, d_date_74) + partial hashaggregation over (c_first_name_108, c_last_name_109, d_date_74) + final hashaggregation over (c_first_name_108, c_last_name_109, d_date_74) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_108", "c_last_name_109", "d_date_74"]) - partial aggregation over (c_first_name_108, c_last_name_109, d_date_74) + partial hashaggregation over (c_first_name_108, c_last_name_109, d_date_74) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q87.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q87.push.plan.txt index cb618308c..29abd26f3 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q87.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q87.push.plan.txt @@ -1,14 +1,14 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (expr_138, expr_139, expr_140) + partial hashaggregation over () + final hashaggregation over (expr_138, expr_139, expr_140) local exchange (REPARTITION, HASH, ["expr_138", "expr_139", "expr_140"]) - partial aggregation over (c_first_name, c_last_name, d_date) - final aggregation over (c_first_name, c_last_name, d_date) + partial hashaggregation over (c_first_name, c_last_name, d_date) + final hashaggregation over (c_first_name, c_last_name, d_date) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name", "c_last_name", "d_date"]) - partial aggregation over (c_first_name, c_last_name, d_date) + partial hashaggregation over (c_first_name, c_last_name, d_date) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) join (INNER, REPLICATED): @@ -19,11 +19,11 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk"]) scan customer - partial aggregation over (c_first_name_51, c_last_name_52, d_date_16) - final aggregation over (c_first_name_51, c_last_name_52, d_date_16) + partial hashaggregation over (c_first_name_51, c_last_name_52, d_date_16) + final hashaggregation over (c_first_name_51, c_last_name_52, d_date_16) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_51", "c_last_name_52", "d_date_16"]) - partial aggregation over (c_first_name_51, c_last_name_52, d_date_16) + partial hashaggregation over (c_first_name_51, c_last_name_52, d_date_16) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"]) join (INNER, REPLICATED): @@ -34,11 +34,11 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_customer_sk_43"]) scan customer - partial aggregation over (c_first_name_115, c_last_name_116, d_date_80) - final aggregation over (c_first_name_115, c_last_name_116, d_date_80) + partial hashaggregation over (c_first_name_115, c_last_name_116, d_date_80) + final hashaggregation over (c_first_name_115, c_last_name_116, d_date_80) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["c_first_name_115", "c_last_name_116", "d_date_80"]) - partial aggregation over (c_first_name_115, c_last_name_116, d_date_80) + partial hashaggregation over (c_first_name_115, c_last_name_116, d_date_80) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.plan.txt index 6e297c60e..180bfebce 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.plan.txt @@ -5,10 +5,10 @@ cross join: cross join: cross join: cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -22,10 +22,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -39,10 +39,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -56,10 +56,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -73,10 +73,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -90,10 +90,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -107,10 +107,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -124,10 +124,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.push.plan.txt index f85ba246f..971dff94f 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.push.plan.txt @@ -5,10 +5,10 @@ cross join: cross join: cross join: cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_11"]) join (INNER, REPLICATED): @@ -23,10 +23,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_30"]) scan household_demographics (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk"]) join (INNER, REPLICATED): @@ -41,10 +41,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk"]) scan household_demographics (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_87"]) join (INNER, REPLICATED): @@ -59,10 +59,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_106"]) scan household_demographics (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_163"]) join (INNER, REPLICATED): @@ -77,10 +77,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_182"]) scan household_demographics (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_239"]) join (INNER, REPLICATED): @@ -95,10 +95,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_258"]) scan household_demographics (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_315"]) join (INNER, REPLICATED): @@ -113,10 +113,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_334"]) scan household_demographics (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_391"]) join (INNER, REPLICATED): @@ -131,10 +131,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_410"]) scan household_demographics (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_467"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.reuse.plan.txt index c8e68f267..77d42c108 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q88.reuse.plan.txt @@ -5,10 +5,10 @@ cross join: cross join: cross join: cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_11"]) join (INNER, REPLICATED): @@ -23,10 +23,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_30"]) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk"]) join (INNER, REPLICATED): @@ -41,10 +41,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk"]) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_87"]) join (INNER, REPLICATED): @@ -59,10 +59,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_106"]) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_163"]) join (INNER, REPLICATED): @@ -77,10 +77,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_182"]) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_239"]) join (INNER, REPLICATED): @@ -95,10 +95,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_258"]) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_315"]) join (INNER, REPLICATED): @@ -113,10 +113,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_334"]) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_391"]) join (INNER, REPLICATED): @@ -131,10 +131,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["hd_demo_sk_410"]) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_hdemo_sk_467"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q89.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q89.plan.txt index 396d705bb..2e03e5c31 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q89.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q89.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_category", "s_company_name", "s_store_name"]) - final aggregation over (d_moy, i_brand, i_category, i_class, s_company_name, s_store_name) + final hashaggregation over (d_moy, i_brand, i_category, i_class, s_company_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "i_brand", "i_category", "i_class", "s_company_name", "s_store_name"]) - partial aggregation over (d_moy, i_brand, i_category, i_class, s_company_name, s_store_name) + partial hashaggregation over (d_moy, i_brand, i_category, i_class, s_company_name, s_store_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q89.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q89.push.plan.txt index 180441dd5..5ae6817d8 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q89.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q89.push.plan.txt @@ -2,10 +2,10 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_brand", "i_category", "s_company_name", "s_store_name"]) - final aggregation over (d_moy, i_brand, i_category, i_class, s_company_name, s_store_name) + final hashaggregation over (d_moy, i_brand, i_category, i_class, s_company_name, s_store_name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["d_moy", "i_brand", "i_category", "i_class", "s_company_name", "s_store_name"]) - partial aggregation over (d_moy, i_brand, i_category, i_class, s_company_name, s_store_name) + partial hashaggregation over (d_moy, i_brand, i_category, i_class, s_company_name, s_store_name) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.plan.txt index 0ddf21aa5..17ba06f19 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.plan.txt @@ -1,8 +1,8 @@ cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): @@ -16,10 +16,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan household_demographics - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.push.plan.txt index ac7d71bfd..924f14bdd 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.push.plan.txt @@ -1,8 +1,8 @@ cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan time_dim (pushdown = true) local exchange (GATHER, SINGLE, []) @@ -16,10 +16,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan web_page (pushdown = true) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan time_dim (pushdown = true) local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.reuse.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.reuse.plan.txt index cd8a2bda6..c27feff55 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.reuse.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q90.reuse.plan.txt @@ -1,8 +1,8 @@ cross join: - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan time_dim local exchange (GATHER, SINGLE, []) @@ -16,10 +16,10 @@ cross join: local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan web_page - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan time_dim local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q91.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q91.plan.txt index a8367e55c..7c8eb4d35 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q91.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q91.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (cc_call_center_id, cc_manager, cc_name, cd_education_status, cd_marital_status) + final hashaggregation over (cc_call_center_id, cc_manager, cc_name, cd_education_status, cd_marital_status) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_call_center_id", "cc_manager", "cc_name", "cd_education_status", "cd_marital_status"]) - partial aggregation over (cc_call_center_id, cc_manager, cc_name, cd_education_status, cd_marital_status) + partial hashaggregation over (cc_call_center_id, cc_manager, cc_name, cd_education_status, cd_marital_status) join (INNER, REPLICATED): scan call_center local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q91.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q91.push.plan.txt index 708f3eaa6..8a1637215 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q91.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q91.push.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (cc_call_center_id, cc_manager, cc_name, cd_education_status, cd_marital_status) + final hashaggregation over (cc_call_center_id, cc_manager, cc_name, cd_education_status, cd_marital_status) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_call_center_id", "cc_manager", "cc_name", "cd_education_status", "cd_marital_status"]) - partial aggregation over (cc_call_center_id, cc_manager, cc_name, cd_education_status, cd_marital_status) + partial hashaggregation over (cc_call_center_id, cc_manager, cc_name, cd_education_status, cd_marital_status) join (INNER, REPLICATED): join (INNER, REPLICATED): scan customer_demographics (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q92.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q92.plan.txt index fe73a232a..104e8890b 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q92.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q92.plan.txt @@ -1,13 +1,13 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () cross join: join (RIGHT, PARTITIONED): - final aggregation over (ws_item_sk_3) + final hashaggregation over (ws_item_sk_3) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_item_sk_3"]) - partial aggregation over (ws_item_sk_3) + partial hashaggregation over (ws_item_sk_3) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) @@ -26,5 +26,5 @@ final aggregation over () scan date_dim local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q92.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q92.push.plan.txt index 6e8dfcae4..5407a14c3 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q92.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q92.push.plan.txt @@ -1,13 +1,13 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () cross join: join (RIGHT, PARTITIONED): - final aggregation over (ws_item_sk_5) + final hashaggregation over (ws_item_sk_5) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_item_sk_5"]) - partial aggregation over (ws_item_sk_5) + partial hashaggregation over (ws_item_sk_5) join (INNER, REPLICATED): scan web_sales local exchange (GATHER, SINGLE, []) @@ -27,5 +27,5 @@ final aggregation over () scan item (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q93.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q93.plan.txt index ca9dc7543..f8140f04d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q93.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q93.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) join (INNER, REPLICATED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q93.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q93.push.plan.txt index e251c8f16..eef4f107e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q93.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q93.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (ss_customer_sk) + final hashaggregation over (ss_customer_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk"]) - partial aggregation over (ss_customer_sk) + partial hashaggregation over (ss_customer_sk) join (INNER, REPLICATED): join (LEFT, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q94.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q94.plan.txt index c13424065..8b12db7f4 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q94.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q94.plan.txt @@ -1,11 +1,11 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (LEFT, PARTITIONED): - final aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk) + final hashaggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk) + partial hashaggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_order_number_17"]) scan web_sales @@ -24,8 +24,8 @@ final aggregation over () local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan web_site - final aggregation over (wr_order_number) + final hashaggregation over (wr_order_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["wr_order_number"]) - partial aggregation over (wr_order_number) + partial hashaggregation over (wr_order_number) scan web_returns diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q94.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q94.push.plan.txt index 29b60e35e..1d4b57bf3 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q94.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q94.push.plan.txt @@ -1,17 +1,17 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) join (RIGHT, PARTITIONED): - final aggregation over (wr_order_number) + final hashaggregation over (wr_order_number) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["wr_order_number"]) - partial aggregation over (wr_order_number) + partial hashaggregation over (wr_order_number) scan web_returns - final aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk) + final hashaggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk) local exchange (GATHER, SINGLE, []) - partial aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk) + partial hashaggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk) join (RIGHT, PARTITIONED): remote exchange (REPARTITION, HASH, ["ws_order_number_20"]) scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.cte.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.cte.plan.txt index 36ef7eb99..a0e7581a1 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.cte.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.cte.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) Filter semijoin (PARTITIONED): @@ -29,7 +29,7 @@ final aggregation over () remote exchange (REPARTITION, HASH, ["ws_order_number_17"]) cte ws_wh Filter - single aggregation over (ws_order_number_17) + single hashaggregation over (ws_order_number_17) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_order_number_17"]) scan web_sales @@ -43,7 +43,7 @@ final aggregation over () remote exchange (REPARTITION, HASH, ["ws_order_number_107"]) cte ws_wh Filter - single aggregation over (ws_order_number_107) + single hashaggregation over (ws_order_number_107) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_order_number_107"]) scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.plan.txt index dc52d3900..d21dd5230 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) semijoin (PARTITIONED): semijoin (PARTITIONED): @@ -21,7 +21,7 @@ final aggregation over () scan web_site local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_order_number_17"]) - single aggregation over (ws_order_number_17) + single hashaggregation over (ws_order_number_17) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_order_number_17"]) scan web_sales @@ -30,7 +30,7 @@ final aggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_order_number"]) scan web_returns - single aggregation over (ws_order_number_107) + single hashaggregation over (ws_order_number_107) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_order_number_107"]) scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.push.plan.txt index 0800fecf4..606f17652 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q95.push.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () local exchange (GATHER, SINGLE, []) semijoin (PARTITIONED): semijoin (PARTITIONED): @@ -21,7 +21,7 @@ final aggregation over () scan web_site (pushdown = true) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_order_number_20"]) - single aggregation over (ws_order_number_20) + single hashaggregation over (ws_order_number_20) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_order_number_20"]) scan web_sales @@ -30,7 +30,7 @@ final aggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["wr_order_number"]) scan web_returns - single aggregation over (ws_order_number_113) + single hashaggregation over (ws_order_number_113) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ws_order_number_113"]) scan web_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q96.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q96.plan.txt index 6ac294895..e769237e6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q96.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q96.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q96.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q96.push.plan.txt index 74dea0203..94ee17678 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q96.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q96.push.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["ss_sold_time_sk"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q97.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q97.plan.txt index 28b301c99..70f6e3a6f 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q97.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q97.plan.txt @@ -1,21 +1,21 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (FULL, PARTITIONED): - final aggregation over (ss_customer_sk, ss_item_sk) + final hashaggregation over (ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"]) - partial aggregation over (ss_customer_sk, ss_item_sk) + partial hashaggregation over (ss_customer_sk, ss_item_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim - final aggregation over (cs_bill_customer_sk, cs_item_sk) + final hashaggregation over (cs_bill_customer_sk, cs_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"]) - partial aggregation over (cs_bill_customer_sk, cs_item_sk) + partial hashaggregation over (cs_bill_customer_sk, cs_item_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q97.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q97.push.plan.txt index 6c2762a5e..cf3a1c79c 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q97.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q97.push.plan.txt @@ -1,21 +1,21 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (FULL, PARTITIONED): - final aggregation over (ss_customer_sk, ss_item_sk) + final hashaggregation over (ss_customer_sk, ss_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"]) - partial aggregation over (ss_customer_sk, ss_item_sk) + partial hashaggregation over (ss_customer_sk, ss_item_sk) join (INNER, REPLICATED): scan store_sales local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) scan date_dim (pushdown = true) - final aggregation over (cs_bill_customer_sk, cs_item_sk) + final hashaggregation over (cs_bill_customer_sk, cs_item_sk) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"]) - partial aggregation over (cs_bill_customer_sk, cs_item_sk) + partial hashaggregation over (cs_bill_customer_sk, cs_item_sk) join (INNER, REPLICATED): scan catalog_sales local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q98.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q98.plan.txt index 9775b6c51..5f5b83652 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q98.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q98.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_class"]) - final aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category", "i_class", "i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) join (INNER, REPLICATED): join (INNER, REPLICATED): scan store_sales diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q98.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q98.push.plan.txt index c84c4f049..6b0d5730a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q98.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q98.push.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_class"]) - final aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + final hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["i_category", "i_class", "i_current_price", "i_item_desc", "i_item_id"]) - partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) + partial hashaggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["i_item_sk"]) scan item (pushdown = true) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q99.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q99.plan.txt index e077b55ea..841e49a8d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q99.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q99.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (cc_name, sm_type, substr) + final hashaggregation over (cc_name, sm_type, substr) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name", "sm_type", "substr"]) - partial aggregation over (cc_name, sm_type, substr) + partial hashaggregation over (cc_name, sm_type, substr) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q99.push.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q99.push.plan.txt index 9169e7704..e2906f752 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q99.push.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q99.push.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (cc_name, sm_type, substr) + final hashaggregation over (cc_name, sm_type, substr) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["cc_name", "sm_type", "substr"]) - partial aggregation over (cc_name, sm_type, substr) + partial hashaggregation over (cc_name, sm_type, substr) join (INNER, REPLICATED): join (INNER, REPLICATED): join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q01.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q01.plan.txt index d632b41b3..403c0cb7f 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q01.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q01.plan.txt @@ -1,8 +1,8 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (linestatus, returnflag) + final hashaggregation over (linestatus, returnflag) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["linestatus", "returnflag"]) - partial aggregation over (linestatus, returnflag) + partial hashaggregation over (linestatus, returnflag) scan lineitem diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q02.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q02.plan.txt index 32cc2e53a..83993dacb 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q02.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q02.plan.txt @@ -3,10 +3,10 @@ remote exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, ROUND_ROBIN, []) cross join: join (RIGHT, PARTITIONED): - final aggregation over (partkey_15) + final hashaggregation over (partkey_15) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["partkey_15"]) - partial aggregation over (partkey_15) + partial hashaggregation over (partkey_15) join (INNER, REPLICATED): scan partsupp local exchange (GATHER, SINGLE, []) @@ -43,5 +43,5 @@ remote exchange (GATHER, SINGLE, []) scan region local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q03.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q03.plan.txt index f6bfb5d9b..3eb0bec64 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q03.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q03.plan.txt @@ -1,8 +1,8 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (orderdate, orderkey_3, shippriority) + final hashaggregation over (orderdate, orderkey_3, shippriority) local exchange (GATHER, SINGLE, []) - partial aggregation over (orderdate, orderkey_3, shippriority) + partial hashaggregation over (orderdate, orderkey_3, shippriority) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["orderkey_3"]) scan lineitem diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q04.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q04.plan.txt index f1a033c8f..f5a8ba87b 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q04.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q04.plan.txt @@ -1,15 +1,15 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (orderpriority) + final hashaggregation over (orderpriority) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["orderpriority"]) - partial aggregation over (orderpriority) + partial hashaggregation over (orderpriority) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["orderkey"]) scan orders - final aggregation over (orderkey_0) + final hashaggregation over (orderkey_0) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["orderkey_0"]) - partial aggregation over (orderkey_0) + partial hashaggregation over (orderkey_0) scan lineitem diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q05.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q05.plan.txt index 3aa3464df..72ced3c52 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q05.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q05.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (name_15) + final hashaggregation over (name_15) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["name_15"]) - partial aggregation over (name_15) + partial hashaggregation over (name_15) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["nationkey", "suppkey"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q06.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q06.plan.txt index e11a487cf..c0e792197 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q06.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q06.plan.txt @@ -1,5 +1,5 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan lineitem diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q07.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q07.plan.txt index 36565536c..fd28f3818 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q07.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q07.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (expr_24, name_15, name_19) + final hashaggregation over (expr_24, name_15, name_19) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_24", "name_15", "name_19"]) - partial aggregation over (expr_24, name_15, name_19) + partial hashaggregation over (expr_24, name_15, name_19) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["orderkey"]) join (INNER, REPLICATED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q08.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q08.plan.txt index 7b70c7f13..1e09087d7 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q08.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q08.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (expr) + final hashaggregation over (expr) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr"]) - partial aggregation over (expr) + partial hashaggregation over (expr) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["suppkey_4"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q09.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q09.plan.txt index 1dc7e9047..035457170 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q09.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q09.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (expr_18, name_15) + final hashaggregation over (expr_18, name_15) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["expr_18", "name_15"]) - partial aggregation over (expr_18, name_15) + partial hashaggregation over (expr_18, name_15) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["nationkey"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q10.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q10.plan.txt index 0c3e0cb63..82f620533 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q10.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q10.plan.txt @@ -1,9 +1,9 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (acctbal, address, comment_4, custkey_3, name, name_7, phone) + final hashaggregation over (acctbal, address, comment_4, custkey_3, name, name_7, phone) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["acctbal", "address", "comment_4", "custkey_3", "name", "name_7", "phone"]) - partial aggregation over (acctbal, address, comment_4, custkey_3, name, name_7, phone) + partial hashaggregation over (acctbal, address, comment_4, custkey_3, name, name_7, phone) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["orderkey"]) scan lineitem diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q11.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q11.plan.txt index bfc5af4b5..0cedbf80f 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q11.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q11.plan.txt @@ -2,10 +2,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) cross join: - final aggregation over (partkey) + final hashaggregation over (partkey) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["partkey"]) - partial aggregation over (partkey) + partial hashaggregation over (partkey) join (INNER, REPLICATED): scan partsupp local exchange (GATHER, SINGLE, []) @@ -17,10 +17,10 @@ remote exchange (GATHER, SINGLE, []) scan nation local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan partsupp local exchange (GATHER, SINGLE, []) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q12.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q12.plan.txt index 7fb5b836d..00595dc3e 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q12.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q12.plan.txt @@ -1,10 +1,10 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (shipmode) + final hashaggregation over (shipmode) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["shipmode"]) - partial aggregation over (shipmode) + partial hashaggregation over (shipmode) join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["orderkey"]) scan orders diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q13.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q13.plan.txt index 96af9081b..7bac7b700 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q13.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q13.plan.txt @@ -1,13 +1,13 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (count) + final hashaggregation over (count) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["count"]) - partial aggregation over (count) - final aggregation over (custkey) + partial hashaggregation over (count) + final hashaggregation over (custkey) local exchange (GATHER, SINGLE, []) - partial aggregation over (custkey) + partial hashaggregation over (custkey) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["custkey"]) scan customer diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q14.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q14.plan.txt index e46c0418a..d1e2b7c84 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q14.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q14.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["partkey_0"]) scan part diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q15.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q15.plan.txt index d9e6bfe4e..c468e25c6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q15.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q15.plan.txt @@ -6,19 +6,19 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) join (INNER, REPLICATED): - final aggregation over (suppkey_0) + final hashaggregation over (suppkey_0) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["suppkey_0"]) - partial aggregation over (suppkey_0) + partial hashaggregation over (suppkey_0) scan lineitem local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () - final aggregation over (suppkey_16) + partial hashaggregation over () + final hashaggregation over (suppkey_16) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["suppkey_16"]) - partial aggregation over (suppkey_16) + partial hashaggregation over (suppkey_16) scan lineitem diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q16.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q16.plan.txt index ef581b90d..ca735558d 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q16.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q16.plan.txt @@ -1,13 +1,13 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (brand, size, type) + final hashaggregation over (brand, size, type) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["brand", "size", "type"]) - partial aggregation over (brand, size, type) - final aggregation over (brand, size, suppkey, type) + partial hashaggregation over (brand, size, type) + final hashaggregation over (brand, size, suppkey, type) local exchange (GATHER, SINGLE, []) - partial aggregation over (brand, size, suppkey, type) + partial hashaggregation over (brand, size, suppkey, type) semijoin (PARTITIONED): remote exchange (REPARTITION, HASH, ["suppkey"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q17_1.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q17_1.plan.txt index bbcdb95d9..27a084f58 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q17_1.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q17_1.plan.txt @@ -1,13 +1,13 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () cross join: join (RIGHT, PARTITIONED): - final aggregation over (partkey_4) + final hashaggregation over (partkey_4) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["partkey_4"]) - partial aggregation over (partkey_4) + partial hashaggregation over (partkey_4) scan lineitem local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["partkey"]) @@ -18,5 +18,5 @@ final aggregation over () scan part local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q17_2.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q17_2.plan.txt index 8305531b7..1d3933665 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q17_2.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q17_2.plan.txt @@ -1,16 +1,16 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, REPLICATED): scan lineitem local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) join (INNER, PARTITIONED): - final aggregation over (partkey_4) + final hashaggregation over (partkey_4) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["partkey_4"]) - partial aggregation over (partkey_4) + partial hashaggregation over (partkey_4) scan lineitem local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["partkey_0"]) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q18.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q18.plan.txt index d505c3957..cad8b6eb6 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q18.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q18.plan.txt @@ -1,8 +1,8 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (custkey_0, name, orderdate, orderkey_3, totalprice) + final hashaggregation over (custkey_0, name, orderdate, orderkey_3, totalprice) local exchange (GATHER, SINGLE, []) - partial aggregation over (custkey_0, name, orderdate, orderkey_3, totalprice) + partial hashaggregation over (custkey_0, name, orderdate, orderkey_3, totalprice) semijoin (PARTITIONED): join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["orderkey_3"]) @@ -17,8 +17,8 @@ local exchange (GATHER, SINGLE, []) scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["orderkey_6"]) - final aggregation over (orderkey_6) + final hashaggregation over (orderkey_6) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["orderkey_6"]) - partial aggregation over (orderkey_6) + partial hashaggregation over (orderkey_6) scan lineitem diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q19.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q19.plan.txt index fa0063979..82d11d0e5 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q19.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q19.plan.txt @@ -1,7 +1,7 @@ -final aggregation over () +final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () join (INNER, PARTITIONED): remote exchange (REPARTITION, HASH, ["partkey"]) scan lineitem diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q20.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q20.plan.txt index 70c9c82a6..966fe6083 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q20.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q20.plan.txt @@ -20,12 +20,12 @@ remote exchange (GATHER, SINGLE, []) scan part local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["partkey_18"]) - final aggregation over (partkey_18, suppkey_19) + final hashaggregation over (partkey_18, suppkey_19) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["partkey_18", "suppkey_19"]) - partial aggregation over (partkey_18, suppkey_19) + partial hashaggregation over (partkey_18, suppkey_19) scan lineitem local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - single aggregation over () + single hashaggregation over () values (1 rows) diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q21.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q21.plan.txt index 26c25bcf6..b41f99c02 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q21.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q21.plan.txt @@ -1,14 +1,14 @@ local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - final aggregation over (name) + final hashaggregation over (name) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["name"]) - partial aggregation over (name) - single aggregation over (commitdate, exists, name, name_7, nationkey, orderkey, orderstatus, receiptdate, suppkey, unique) + partial hashaggregation over (name) + single hashaggregation over (commitdate, exists, name, name_7, nationkey, orderkey, orderstatus, receiptdate, suppkey, unique) join (LEFT, PARTITIONED): - final aggregation over (commitdate, name, name_7, nationkey, orderkey, orderstatus, receiptdate, suppkey, unique_189) + final hashaggregation over (commitdate, name, name_7, nationkey, orderkey, orderstatus, receiptdate, suppkey, unique_189) local exchange (GATHER, SINGLE, []) - partial aggregation over (commitdate, name, name_7, nationkey, orderkey, orderstatus, receiptdate, suppkey, unique_189) + partial hashaggregation over (commitdate, name, name_7, nationkey, orderkey, orderstatus, receiptdate, suppkey, unique_189) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["orderkey"]) join (INNER, PARTITIONED): diff --git a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q22.plan.txt b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q22.plan.txt index da536bc1f..7fb111e8a 100644 --- a/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q22.plan.txt +++ b/presto-benchto-benchmarks/src/test/resources/sql/presto/tpch/q22.plan.txt @@ -1,23 +1,23 @@ remote exchange (GATHER, SINGLE, []) local exchange (GATHER, UNKNOWN, []) remote exchange (REPARTITION, ROUND_ROBIN, []) - final aggregation over (substr) + final hashaggregation over (substr) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["substr"]) - partial aggregation over (substr) + partial hashaggregation over (substr) join (LEFT, PARTITIONED): remote exchange (REPARTITION, HASH, ["custkey"]) cross join: scan customer local exchange (GATHER, SINGLE, []) remote exchange (REPLICATE, BROADCAST, []) - final aggregation over () + final hashaggregation over () local exchange (GATHER, SINGLE, []) remote exchange (GATHER, SINGLE, []) - partial aggregation over () + partial hashaggregation over () scan customer - final aggregation over (custkey_13) + final hashaggregation over (custkey_13) local exchange (GATHER, SINGLE, []) remote exchange (REPARTITION, HASH, ["custkey_13"]) - partial aggregation over (custkey_13) + partial hashaggregation over (custkey_13) scan orders diff --git a/presto-main/src/main/java/io/prestosql/sql/planner/planprinter/PlanPrinter.java b/presto-main/src/main/java/io/prestosql/sql/planner/planprinter/PlanPrinter.java index 8e8cdb4f9..dd7e632ac 100644 --- a/presto-main/src/main/java/io/prestosql/sql/planner/planprinter/PlanPrinter.java +++ b/presto-main/src/main/java/io/prestosql/sql/planner/planprinter/PlanPrinter.java @@ -565,7 +565,7 @@ public class PlanPrinter } else { nodeOutput = addNode(node, - format("Aggregate%s%s%s", type, key, formatHash(node.getHashSymbol()))); + format("HashAggregate%s%s%s", type, key, formatHash(node.getHashSymbol()))); } node.getAggregations().forEach((symbol, aggregation) -> nodeOutput.appendDetailsLine("%s := %s", symbol, formatAggregation(aggregation)));