Skip to content

Commit ea17182

Browse files
mbutrovichSteve Vaughan Jr
mbutrovich
authored and
Steve Vaughan Jr
committed
chore: update TPS-DC plans after apache#2429 (apache#2486)
1 parent d4fe928 commit ea17182

File tree

18 files changed

+216
-264
lines changed

18 files changed

+216
-264
lines changed

‎spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q16/explain.txt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
== Physical Plan ==
2-
* HashAggregate (41)
3-
+- * CometColumnarToRow (40)
2+
* CometColumnarToRow (41)
3+
+- CometHashAggregate (40)
44
+- CometColumnarExchange (39)
55
+- * HashAggregate (38)
66
+- * HashAggregate (37)
@@ -225,13 +225,11 @@ Results [3]: [sum#20, sum#21, count#25]
225225
Input [3]: [sum#20, sum#21, count#25]
226226
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
227227

228-
(40) CometColumnarToRow [codegen id : 2]
229-
Input [3]: [sum#20, sum#21, count#25]
230-
231-
(41) HashAggregate [codegen id : 2]
228+
(40) CometHashAggregate
232229
Input [3]: [sum#20, sum#21, count#25]
233230
Keys: []
234231
Functions [3]: [sum(UnscaledValue(cs_ext_ship_cost#6)), sum(UnscaledValue(cs_net_profit#7)), count(distinct cs_order_number#5)]
235-
Aggregate Attributes [3]: [sum(UnscaledValue(cs_ext_ship_cost#6))#22, sum(UnscaledValue(cs_net_profit#7))#23, count(cs_order_number#5)#24]
236-
Results [3]: [count(cs_order_number#5)#24 AS order count #26, MakeDecimal(sum(UnscaledValue(cs_ext_ship_cost#6))#22,17,2) AS total shipping cost #27, MakeDecimal(sum(UnscaledValue(cs_net_profit#7))#23,17,2) AS total net profit #28]
232+
233+
(41) CometColumnarToRow [codegen id : 2]
234+
Input [3]: [order count #26, total shipping cost #27, total net profit #28]
237235

‎spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q16/simplified.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
WholeStageCodegen (2)
2-
HashAggregate [sum,sum,count] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),count(cs_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
3-
CometColumnarToRow
4-
InputAdapter
2+
CometColumnarToRow
3+
InputAdapter
4+
CometHashAggregate [sum,sum,count] [order count ,total shipping cost ,total net profit ,count(cs_order_number),sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit))]
55
CometColumnarExchange #1
66
WholeStageCodegen (1)
77
HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),count(cs_order_number),sum,sum,count,sum,sum,count]

‎spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q28/explain.txt‎

Lines changed: 36 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
: :- * BroadcastNestedLoopJoin Inner BuildRight (50)
55
: : :- * BroadcastNestedLoopJoin Inner BuildRight (37)
66
: : : :- * BroadcastNestedLoopJoin Inner BuildRight (24)
7-
: : : : :- * HashAggregate (11)
8-
: : : : : +- * CometColumnarToRow (10)
7+
: : : : :- * CometColumnarToRow (11)
8+
: : : : : +- CometHashAggregate (10)
99
: : : : : +- CometColumnarExchange (9)
1010
: : : : : +- * HashAggregate (8)
1111
: : : : : +- * HashAggregate (7)
@@ -16,8 +16,8 @@
1616
: : : : : +- CometFilter (2)
1717
: : : : : +- CometScan [native_iceberg_compat] parquet spark_catalog.default.store_sales (1)
1818
: : : : +- BroadcastExchange (23)
19-
: : : : +- * HashAggregate (22)
20-
: : : : +- * CometColumnarToRow (21)
19+
: : : : +- * CometColumnarToRow (22)
20+
: : : : +- CometHashAggregate (21)
2121
: : : : +- CometColumnarExchange (20)
2222
: : : : +- * HashAggregate (19)
2323
: : : : +- * HashAggregate (18)
@@ -28,8 +28,8 @@
2828
: : : : +- CometFilter (13)
2929
: : : : +- CometScan [native_iceberg_compat] parquet spark_catalog.default.store_sales (12)
3030
: : : +- BroadcastExchange (36)
31-
: : : +- * HashAggregate (35)
32-
: : : +- * CometColumnarToRow (34)
31+
: : : +- * CometColumnarToRow (35)
32+
: : : +- CometHashAggregate (34)
3333
: : : +- CometColumnarExchange (33)
3434
: : : +- * HashAggregate (32)
3535
: : : +- * HashAggregate (31)
@@ -40,8 +40,8 @@
4040
: : : +- CometFilter (26)
4141
: : : +- CometScan [native_iceberg_compat] parquet spark_catalog.default.store_sales (25)
4242
: : +- BroadcastExchange (49)
43-
: : +- * HashAggregate (48)
44-
: : +- * CometColumnarToRow (47)
43+
: : +- * CometColumnarToRow (48)
44+
: : +- CometHashAggregate (47)
4545
: : +- CometColumnarExchange (46)
4646
: : +- * HashAggregate (45)
4747
: : +- * HashAggregate (44)
@@ -52,8 +52,8 @@
5252
: : +- CometFilter (39)
5353
: : +- CometScan [native_iceberg_compat] parquet spark_catalog.default.store_sales (38)
5454
: +- BroadcastExchange (62)
55-
: +- * HashAggregate (61)
56-
: +- * CometColumnarToRow (60)
55+
: +- * CometColumnarToRow (61)
56+
: +- CometHashAggregate (60)
5757
: +- CometColumnarExchange (59)
5858
: +- * HashAggregate (58)
5959
: +- * HashAggregate (57)
@@ -64,8 +64,8 @@
6464
: +- CometFilter (52)
6565
: +- CometScan [native_iceberg_compat] parquet spark_catalog.default.store_sales (51)
6666
+- BroadcastExchange (75)
67-
+- * HashAggregate (74)
68-
+- * CometColumnarToRow (73)
67+
+- * CometColumnarToRow (74)
68+
+- CometHashAggregate (73)
6969
+- CometColumnarExchange (72)
7070
+- * HashAggregate (71)
7171
+- * HashAggregate (70)
@@ -122,15 +122,13 @@ Results [4]: [sum#6, count#7, count#8, count#12]
122122
Input [4]: [sum#6, count#7, count#8, count#12]
123123
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
124124

125-
(10) CometColumnarToRow [codegen id : 12]
126-
Input [4]: [sum#6, count#7, count#8, count#12]
127-
128-
(11) HashAggregate [codegen id : 12]
125+
(10) CometHashAggregate
129126
Input [4]: [sum#6, count#7, count#8, count#12]
130127
Keys: []
131128
Functions [3]: [avg(UnscaledValue(ss_list_price#3)), count(ss_list_price#3), count(distinct ss_list_price#3)]
132-
Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#3))#9, count(ss_list_price#3)#10, count(ss_list_price#3)#11]
133-
Results [3]: [cast((avg(UnscaledValue(ss_list_price#3))#9 / 100.0) as decimal(11,6)) AS B1_LP#13, count(ss_list_price#3)#10 AS B1_CNT#14, count(ss_list_price#3)#11 AS B1_CNTD#15]
129+
130+
(11) CometColumnarToRow [codegen id : 12]
131+
Input [3]: [B1_LP#13, B1_CNT#14, B1_CNTD#15]
134132

135133
(12) CometScan [native_iceberg_compat] parquet spark_catalog.default.store_sales
136134
Output [5]: [ss_quantity#16, ss_wholesale_cost#17, ss_list_price#18, ss_coupon_amt#19, ss_sold_date_sk#20]
@@ -177,15 +175,13 @@ Results [4]: [sum#21, count#22, count#23, count#27]
177175
Input [4]: [sum#21, count#22, count#23, count#27]
178176
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
179177

180-
(21) CometColumnarToRow [codegen id : 3]
181-
Input [4]: [sum#21, count#22, count#23, count#27]
182-
183-
(22) HashAggregate [codegen id : 3]
178+
(21) CometHashAggregate
184179
Input [4]: [sum#21, count#22, count#23, count#27]
185180
Keys: []
186181
Functions [3]: [avg(UnscaledValue(ss_list_price#18)), count(ss_list_price#18), count(distinct ss_list_price#18)]
187-
Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#18))#24, count(ss_list_price#18)#25, count(ss_list_price#18)#26]
188-
Results [3]: [cast((avg(UnscaledValue(ss_list_price#18))#24 / 100.0) as decimal(11,6)) AS B2_LP#28, count(ss_list_price#18)#25 AS B2_CNT#29, count(ss_list_price#18)#26 AS B2_CNTD#30]
182+
183+
(22) CometColumnarToRow [codegen id : 3]
184+
Input [3]: [B2_LP#28, B2_CNT#29, B2_CNTD#30]
189185

190186
(23) BroadcastExchange
191187
Input [3]: [B2_LP#28, B2_CNT#29, B2_CNTD#30]
@@ -240,15 +236,13 @@ Results [4]: [sum#36, count#37, count#38, count#42]
240236
Input [4]: [sum#36, count#37, count#38, count#42]
241237
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
242238

243-
(34) CometColumnarToRow [codegen id : 5]
244-
Input [4]: [sum#36, count#37, count#38, count#42]
245-
246-
(35) HashAggregate [codegen id : 5]
239+
(34) CometHashAggregate
247240
Input [4]: [sum#36, count#37, count#38, count#42]
248241
Keys: []
249242
Functions [3]: [avg(UnscaledValue(ss_list_price#33)), count(ss_list_price#33), count(distinct ss_list_price#33)]
250-
Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#33))#39, count(ss_list_price#33)#40, count(ss_list_price#33)#41]
251-
Results [3]: [cast((avg(UnscaledValue(ss_list_price#33))#39 / 100.0) as decimal(11,6)) AS B3_LP#43, count(ss_list_price#33)#40 AS B3_CNT#44, count(ss_list_price#33)#41 AS B3_CNTD#45]
243+
244+
(35) CometColumnarToRow [codegen id : 5]
245+
Input [3]: [B3_LP#43, B3_CNT#44, B3_CNTD#45]
252246

253247
(36) BroadcastExchange
254248
Input [3]: [B3_LP#43, B3_CNT#44, B3_CNTD#45]
@@ -303,15 +297,13 @@ Results [4]: [sum#51, count#52, count#53, count#57]
303297
Input [4]: [sum#51, count#52, count#53, count#57]
304298
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
305299

306-
(47) CometColumnarToRow [codegen id : 7]
307-
Input [4]: [sum#51, count#52, count#53, count#57]
308-
309-
(48) HashAggregate [codegen id : 7]
300+
(47) CometHashAggregate
310301
Input [4]: [sum#51, count#52, count#53, count#57]
311302
Keys: []
312303
Functions [3]: [avg(UnscaledValue(ss_list_price#48)), count(ss_list_price#48), count(distinct ss_list_price#48)]
313-
Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#48))#54, count(ss_list_price#48)#55, count(ss_list_price#48)#56]
314-
Results [3]: [cast((avg(UnscaledValue(ss_list_price#48))#54 / 100.0) as decimal(11,6)) AS B4_LP#58, count(ss_list_price#48)#55 AS B4_CNT#59, count(ss_list_price#48)#56 AS B4_CNTD#60]
304+
305+
(48) CometColumnarToRow [codegen id : 7]
306+
Input [3]: [B4_LP#58, B4_CNT#59, B4_CNTD#60]
315307

316308
(49) BroadcastExchange
317309
Input [3]: [B4_LP#58, B4_CNT#59, B4_CNTD#60]
@@ -366,15 +358,13 @@ Results [4]: [sum#66, count#67, count#68, count#72]
366358
Input [4]: [sum#66, count#67, count#68, count#72]
367359
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
368360

369-
(60) CometColumnarToRow [codegen id : 9]
370-
Input [4]: [sum#66, count#67, count#68, count#72]
371-
372-
(61) HashAggregate [codegen id : 9]
361+
(60) CometHashAggregate
373362
Input [4]: [sum#66, count#67, count#68, count#72]
374363
Keys: []
375364
Functions [3]: [avg(UnscaledValue(ss_list_price#63)), count(ss_list_price#63), count(distinct ss_list_price#63)]
376-
Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#63))#69, count(ss_list_price#63)#70, count(ss_list_price#63)#71]
377-
Results [3]: [cast((avg(UnscaledValue(ss_list_price#63))#69 / 100.0) as decimal(11,6)) AS B5_LP#73, count(ss_list_price#63)#70 AS B5_CNT#74, count(ss_list_price#63)#71 AS B5_CNTD#75]
365+
366+
(61) CometColumnarToRow [codegen id : 9]
367+
Input [3]: [B5_LP#73, B5_CNT#74, B5_CNTD#75]
378368

379369
(62) BroadcastExchange
380370
Input [3]: [B5_LP#73, B5_CNT#74, B5_CNTD#75]
@@ -429,15 +419,13 @@ Results [4]: [sum#81, count#82, count#83, count#87]
429419
Input [4]: [sum#81, count#82, count#83, count#87]
430420
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
431421

432-
(73) CometColumnarToRow [codegen id : 11]
433-
Input [4]: [sum#81, count#82, count#83, count#87]
434-
435-
(74) HashAggregate [codegen id : 11]
422+
(73) CometHashAggregate
436423
Input [4]: [sum#81, count#82, count#83, count#87]
437424
Keys: []
438425
Functions [3]: [avg(UnscaledValue(ss_list_price#78)), count(ss_list_price#78), count(distinct ss_list_price#78)]
439-
Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#78))#84, count(ss_list_price#78)#85, count(ss_list_price#78)#86]
440-
Results [3]: [cast((avg(UnscaledValue(ss_list_price#78))#84 / 100.0) as decimal(11,6)) AS B6_LP#88, count(ss_list_price#78)#85 AS B6_CNT#89, count(ss_list_price#78)#86 AS B6_CNTD#90]
426+
427+
(74) CometColumnarToRow [codegen id : 11]
428+
Input [3]: [B6_LP#88, B6_CNT#89, B6_CNTD#90]
441429

442430
(75) BroadcastExchange
443431
Input [3]: [B6_LP#88, B6_CNT#89, B6_CNTD#90]

‎spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q28/simplified.txt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ WholeStageCodegen (12)
44
BroadcastNestedLoopJoin
55
BroadcastNestedLoopJoin
66
BroadcastNestedLoopJoin
7-
HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B1_LP,B1_CNT,B1_CNTD,sum,count,count,count]
8-
CometColumnarToRow
9-
InputAdapter
7+
CometColumnarToRow
8+
InputAdapter
9+
CometHashAggregate [sum,count,count,count] [B1_LP,B1_CNT,B1_CNTD,avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price)]
1010
CometColumnarExchange #1
1111
WholeStageCodegen (1)
1212
HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
@@ -21,9 +21,9 @@ WholeStageCodegen (12)
2121
InputAdapter
2222
BroadcastExchange #3
2323
WholeStageCodegen (3)
24-
HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B2_LP,B2_CNT,B2_CNTD,sum,count,count,count]
25-
CometColumnarToRow
26-
InputAdapter
24+
CometColumnarToRow
25+
InputAdapter
26+
CometHashAggregate [sum,count,count,count] [B2_LP,B2_CNT,B2_CNTD,avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price)]
2727
CometColumnarExchange #4
2828
WholeStageCodegen (2)
2929
HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
@@ -38,9 +38,9 @@ WholeStageCodegen (12)
3838
InputAdapter
3939
BroadcastExchange #6
4040
WholeStageCodegen (5)
41-
HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B3_LP,B3_CNT,B3_CNTD,sum,count,count,count]
42-
CometColumnarToRow
43-
InputAdapter
41+
CometColumnarToRow
42+
InputAdapter
43+
CometHashAggregate [sum,count,count,count] [B3_LP,B3_CNT,B3_CNTD,avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price)]
4444
CometColumnarExchange #7
4545
WholeStageCodegen (4)
4646
HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
@@ -55,9 +55,9 @@ WholeStageCodegen (12)
5555
InputAdapter
5656
BroadcastExchange #9
5757
WholeStageCodegen (7)
58-
HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B4_LP,B4_CNT,B4_CNTD,sum,count,count,count]
59-
CometColumnarToRow
60-
InputAdapter
58+
CometColumnarToRow
59+
InputAdapter
60+
CometHashAggregate [sum,count,count,count] [B4_LP,B4_CNT,B4_CNTD,avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price)]
6161
CometColumnarExchange #10
6262
WholeStageCodegen (6)
6363
HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
@@ -72,9 +72,9 @@ WholeStageCodegen (12)
7272
InputAdapter
7373
BroadcastExchange #12
7474
WholeStageCodegen (9)
75-
HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B5_LP,B5_CNT,B5_CNTD,sum,count,count,count]
76-
CometColumnarToRow
77-
InputAdapter
75+
CometColumnarToRow
76+
InputAdapter
77+
CometHashAggregate [sum,count,count,count] [B5_LP,B5_CNT,B5_CNTD,avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price)]
7878
CometColumnarExchange #13
7979
WholeStageCodegen (8)
8080
HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
@@ -89,9 +89,9 @@ WholeStageCodegen (12)
8989
InputAdapter
9090
BroadcastExchange #15
9191
WholeStageCodegen (11)
92-
HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B6_LP,B6_CNT,B6_CNTD,sum,count,count,count]
93-
CometColumnarToRow
94-
InputAdapter
92+
CometColumnarToRow
93+
InputAdapter
94+
CometHashAggregate [sum,count,count,count] [B6_LP,B6_CNT,B6_CNTD,avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price)]
9595
CometColumnarExchange #16
9696
WholeStageCodegen (10)
9797
HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]

‎spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q94/explain.txt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
== Physical Plan ==
2-
* HashAggregate (41)
3-
+- * CometColumnarToRow (40)
2+
* CometColumnarToRow (41)
3+
+- CometHashAggregate (40)
44
+- CometColumnarExchange (39)
55
+- * HashAggregate (38)
66
+- * HashAggregate (37)
@@ -225,13 +225,11 @@ Results [3]: [sum#20, sum#21, count#25]
225225
Input [3]: [sum#20, sum#21, count#25]
226226
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
227227

228-
(40) CometColumnarToRow [codegen id : 2]
229-
Input [3]: [sum#20, sum#21, count#25]
230-
231-
(41) HashAggregate [codegen id : 2]
228+
(40) CometHashAggregate
232229
Input [3]: [sum#20, sum#21, count#25]
233230
Keys: []
234231
Functions [3]: [sum(UnscaledValue(ws_ext_ship_cost#6)), sum(UnscaledValue(ws_net_profit#7)), count(distinct ws_order_number#5)]
235-
Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#6))#22, sum(UnscaledValue(ws_net_profit#7))#23, count(ws_order_number#5)#24]
236-
Results [3]: [count(ws_order_number#5)#24 AS order count #26, MakeDecimal(sum(UnscaledValue(ws_ext_ship_cost#6))#22,17,2) AS total shipping cost #27, MakeDecimal(sum(UnscaledValue(ws_net_profit#7))#23,17,2) AS total net profit #28]
232+
233+
(41) CometColumnarToRow [codegen id : 2]
234+
Input [3]: [order count #26, total shipping cost #27, total net profit #28]
237235

‎spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q94/simplified.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
WholeStageCodegen (2)
2-
HashAggregate [sum,sum,count] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
3-
CometColumnarToRow
4-
InputAdapter
2+
CometColumnarToRow
3+
InputAdapter
4+
CometHashAggregate [sum,sum,count] [order count ,total shipping cost ,total net profit ,count(ws_order_number),sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit))]
55
CometColumnarExchange #1
66
WholeStageCodegen (1)
77
HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]

‎spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q95/explain.txt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
== Physical Plan ==
2-
* HashAggregate (54)
3-
+- * CometColumnarToRow (53)
2+
* CometColumnarToRow (54)
3+
+- CometHashAggregate (53)
44
+- CometColumnarExchange (52)
55
+- * HashAggregate (51)
66
+- * HashAggregate (50)
@@ -292,13 +292,11 @@ Results [3]: [sum#25, sum#26, count#30]
292292
Input [3]: [sum#25, sum#26, count#30]
293293
Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
294294

295-
(53) CometColumnarToRow [codegen id : 2]
296-
Input [3]: [sum#25, sum#26, count#30]
297-
298-
(54) HashAggregate [codegen id : 2]
295+
(53) CometHashAggregate
299296
Input [3]: [sum#25, sum#26, count#30]
300297
Keys: []
301298
Functions [3]: [sum(UnscaledValue(ws_ext_ship_cost#5)), sum(UnscaledValue(ws_net_profit#6)), count(distinct ws_order_number#4)]
302-
Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#5))#27, sum(UnscaledValue(ws_net_profit#6))#28, count(ws_order_number#4)#29]
303-
Results [3]: [count(ws_order_number#4)#29 AS order count #31, MakeDecimal(sum(UnscaledValue(ws_ext_ship_cost#5))#27,17,2) AS total shipping cost #32, MakeDecimal(sum(UnscaledValue(ws_net_profit#6))#28,17,2) AS total net profit #33]
299+
300+
(54) CometColumnarToRow [codegen id : 2]
301+
Input [3]: [order count #31, total shipping cost #32, total net profit #33]
304302

‎spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q95/simplified.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
WholeStageCodegen (2)
2-
HashAggregate [sum,sum,count] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
3-
CometColumnarToRow
4-
InputAdapter
2+
CometColumnarToRow
3+
InputAdapter
4+
CometHashAggregate [sum,sum,count] [order count ,total shipping cost ,total net profit ,count(ws_order_number),sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit))]
55
CometColumnarExchange #1
66
WholeStageCodegen (1)
77
HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]

0 commit comments

Comments
 (0)