Skip to content

Commit 5df1162

Browse files
morrySnowmorrySnow
authored
[test](plan) update tpcds shape check (#59434)
- remove colocate group - change tables' schema
1 parent 53f8002 commit 5df1162

File tree

117 files changed

+1141
-1200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+1141
-1200
lines changed

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query17.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PhysicalResultSink
2121
------------------------------------PhysicalProject
2222
--------------------------------------hashJoin[INNER_JOIN shuffle] hashCondition=((store_returns.sr_customer_sk = catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF3 cs_bill_customer_sk->[sr_customer_sk,ss_customer_sk];RF4 cs_item_sk->[sr_item_sk,ss_item_sk]
2323
----------------------------------------PhysicalProject
24-
------------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((store_sales.ss_customer_sk = store_returns.sr_customer_sk) and (store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
24+
------------------------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((store_sales.ss_customer_sk = store_returns.sr_customer_sk) and (store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
2525
--------------------------------------------PhysicalProject
2626
----------------------------------------------PhysicalOlapScan[store_sales] apply RFs: RF3 RF4 RF6
2727
--------------------------------------------PhysicalProject

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query24.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
1515
------------------------PhysicalProject
1616
--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((store_sales.ss_item_sk = item.i_item_sk)) otherCondition=()
1717
----------------------------PhysicalProject
18-
------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
18+
------------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
1919
--------------------------------PhysicalProject
2020
----------------------------------PhysicalOlapScan[store_sales] apply RFs: RF3 RF6
2121
--------------------------------PhysicalProject

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query25.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PhysicalResultSink
2020
----------------------------------PhysicalProject
2121
------------------------------------hashJoin[INNER_JOIN shuffle] hashCondition=((store_returns.sr_customer_sk = catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF3 cs_bill_customer_sk->[sr_customer_sk,ss_customer_sk];RF4 cs_item_sk->[sr_item_sk,ss_item_sk]
2222
--------------------------------------PhysicalProject
23-
----------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((store_sales.ss_customer_sk = store_returns.sr_customer_sk) and (store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
23+
----------------------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((store_sales.ss_customer_sk = store_returns.sr_customer_sk) and (store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
2424
------------------------------------------PhysicalProject
2525
--------------------------------------------PhysicalOlapScan[store_sales] apply RFs: RF3 RF4 RF6
2626
------------------------------------------PhysicalProject

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query29.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PhysicalResultSink
2020
----------------------------------PhysicalProject
2121
------------------------------------hashJoin[INNER_JOIN shuffle] hashCondition=((store_returns.sr_customer_sk = catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF3 cs_bill_customer_sk->[sr_customer_sk,ss_customer_sk];RF4 cs_item_sk->[sr_item_sk,ss_item_sk]
2222
--------------------------------------PhysicalProject
23-
----------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((store_sales.ss_customer_sk = store_returns.sr_customer_sk) and (store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
23+
----------------------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((store_sales.ss_customer_sk = store_returns.sr_customer_sk) and (store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
2424
------------------------------------------PhysicalProject
2525
--------------------------------------------PhysicalOlapScan[store_sales] apply RFs: RF3 RF4 RF6
2626
------------------------------------------PhysicalProject

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query39.out‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,20 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
55
----PhysicalProject
66
------filter(( not (mean = 0.0)) and ((foo.stdev / foo.mean) > 1.0))
77
--------hashAgg[GLOBAL]
8-
----------PhysicalDistribute[DistributionSpecHash]
9-
------------hashAgg[LOCAL]
8+
----------PhysicalProject
9+
------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF2 d_date_sk->[inv_date_sk]
1010
--------------PhysicalProject
11-
----------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF2 d_date_sk->[inv_date_sk]
11+
----------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=()
1212
------------------PhysicalProject
13-
--------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=()
13+
--------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_item_sk = item.i_item_sk)) otherCondition=()
14+
----------------------PhysicalOlapScan[inventory] apply RFs: RF2
1415
----------------------PhysicalProject
15-
------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_item_sk = item.i_item_sk)) otherCondition=()
16-
--------------------------PhysicalOlapScan[inventory] apply RFs: RF2
17-
--------------------------PhysicalProject
18-
----------------------------PhysicalOlapScan[item]
19-
----------------------PhysicalProject
20-
------------------------PhysicalOlapScan[warehouse]
16+
------------------------PhysicalOlapScan[item]
2117
------------------PhysicalProject
22-
--------------------filter((date_dim.d_year = 1998) and d_moy IN (1, 2))
23-
----------------------PhysicalOlapScan[date_dim]
18+
--------------------PhysicalOlapScan[warehouse]
19+
--------------PhysicalProject
20+
----------------filter((date_dim.d_year = 1998) and d_moy IN (1, 2))
21+
------------------PhysicalOlapScan[date_dim]
2422
--PhysicalResultSink
2523
----PhysicalQuickSort[MERGE_SORT]
2624
------PhysicalDistribute[DistributionSpecGather]

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query40.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PhysicalResultSink
1414
----------------------PhysicalProject
1515
------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=()
1616
--------------------------PhysicalProject
17-
----------------------------hashJoin[LEFT_OUTER_JOIN colocated] hashCondition=((catalog_sales.cs_item_sk = catalog_returns.cr_item_sk) and (catalog_sales.cs_order_number = catalog_returns.cr_order_number)) otherCondition=()
17+
----------------------------hashJoin[LEFT_OUTER_JOIN bucketShuffle] hashCondition=((catalog_sales.cs_item_sk = catalog_returns.cr_item_sk) and (catalog_sales.cs_order_number = catalog_returns.cr_order_number)) otherCondition=()
1818
------------------------------PhysicalProject
1919
--------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF1 RF2
2020
------------------------------PhysicalProject

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query49.out‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PhysicalResultSink
3030
------------------------------------------------------PhysicalProject
3131
--------------------------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((ws.ws_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF2 d_date_sk->[ws_sold_date_sk]
3232
----------------------------------------------------------PhysicalProject
33-
------------------------------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((ws.ws_item_sk = wr.wr_item_sk) and (ws.ws_order_number = wr.wr_order_number)) otherCondition=() build RFs:RF0 wr_order_number->[ws_order_number];RF1 wr_item_sk->[ws_item_sk]
33+
------------------------------------------------------------hashJoin[INNER_JOIN shuffle] hashCondition=((ws.ws_item_sk = wr.wr_item_sk) and (ws.ws_order_number = wr.wr_order_number)) otherCondition=() build RFs:RF0 wr_order_number->[ws_order_number];RF1 wr_item_sk->[ws_item_sk]
3434
--------------------------------------------------------------PhysicalProject
3535
----------------------------------------------------------------filter((ws.ws_net_paid > 0.00) and (ws.ws_net_profit > 1.00) and (ws.ws_quantity > 0))
3636
------------------------------------------------------------------PhysicalOlapScan[web_sales(ws)] apply RFs: RF0 RF1 RF2
@@ -62,7 +62,7 @@ PhysicalResultSink
6262
------------------------------------------------------PhysicalProject
6363
--------------------------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((cs.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF5 d_date_sk->[cs_sold_date_sk]
6464
----------------------------------------------------------PhysicalProject
65-
------------------------------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((cs.cs_item_sk = cr.cr_item_sk) and (cs.cs_order_number = cr.cr_order_number)) otherCondition=() build RFs:RF3 cr_order_number->[cs_order_number];RF4 cr_item_sk->[cs_item_sk]
65+
------------------------------------------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((cs.cs_item_sk = cr.cr_item_sk) and (cs.cs_order_number = cr.cr_order_number)) otherCondition=() build RFs:RF3 cr_order_number->[cs_order_number];RF4 cr_item_sk->[cs_item_sk]
6666
--------------------------------------------------------------PhysicalProject
6767
----------------------------------------------------------------filter((cs.cs_net_paid > 0.00) and (cs.cs_net_profit > 1.00) and (cs.cs_quantity > 0))
6868
------------------------------------------------------------------PhysicalOlapScan[catalog_sales(cs)] apply RFs: RF3 RF4 RF5
@@ -94,7 +94,7 @@ PhysicalResultSink
9494
------------------------------------------------------PhysicalProject
9595
--------------------------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((sts.ss_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF8 d_date_sk->[ss_sold_date_sk]
9696
----------------------------------------------------------PhysicalProject
97-
------------------------------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((sts.ss_item_sk = sr.sr_item_sk) and (sts.ss_ticket_number = sr.sr_ticket_number)) otherCondition=() build RFs:RF6 sr_ticket_number->[ss_ticket_number];RF7 sr_item_sk->[ss_item_sk]
97+
------------------------------------------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((sts.ss_item_sk = sr.sr_item_sk) and (sts.ss_ticket_number = sr.sr_ticket_number)) otherCondition=() build RFs:RF6 sr_ticket_number->[ss_ticket_number];RF7 sr_item_sk->[ss_item_sk]
9898
--------------------------------------------------------------PhysicalProject
9999
----------------------------------------------------------------filter((sts.ss_net_paid > 0.00) and (sts.ss_net_profit > 1.00) and (sts.ss_quantity > 0))
100100
------------------------------------------------------------------PhysicalOlapScan[store_sales(sts)] apply RFs: RF6 RF7 RF8

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query5.out‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,12 @@ PhysicalResultSink
6262
--------------------------------------PhysicalDistribute[DistributionSpecExecutionAny]
6363
----------------------------------------PhysicalProject
6464
------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF6
65-
--------------------------------------PhysicalDistribute[DistributionSpecExecutionAny]
66-
----------------------------------------PhysicalProject
67-
------------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((web_returns.wr_item_sk = web_sales.ws_item_sk) and (web_returns.wr_order_number = web_sales.ws_order_number)) otherCondition=() build RFs:RF4 wr_item_sk->[ws_item_sk];RF5 wr_order_number->[ws_order_number]
68-
--------------------------------------------PhysicalProject
69-
----------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF4 RF5
70-
--------------------------------------------PhysicalProject
71-
----------------------------------------------PhysicalOlapScan[web_returns] apply RFs: RF6
65+
--------------------------------------PhysicalProject
66+
----------------------------------------hashJoin[INNER_JOIN shuffle] hashCondition=((web_returns.wr_item_sk = web_sales.ws_item_sk) and (web_returns.wr_order_number = web_sales.ws_order_number)) otherCondition=() build RFs:RF4 wr_item_sk->[ws_item_sk];RF5 wr_order_number->[ws_order_number]
67+
------------------------------------------PhysicalProject
68+
--------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF4 RF5
69+
------------------------------------------PhysicalProject
70+
--------------------------------------------PhysicalOlapScan[web_returns] apply RFs: RF6
7271
------------------------------------PhysicalProject
7372
--------------------------------------filter((date_dim.d_date <= '2000-09-02') and (date_dim.d_date >= '2000-08-19'))
7473
----------------------------------------PhysicalOlapScan[date_dim]

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query50.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PhysicalResultSink
1414
----------------------PhysicalProject
1515
------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((store_sales.ss_store_sk = store.s_store_sk)) otherCondition=()
1616
--------------------------PhysicalProject
17-
----------------------------hashJoin[INNER_JOIN colocated] hashCondition=((store_sales.ss_customer_sk = store_returns.sr_customer_sk) and (store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=() build RFs:RF0 sr_ticket_number->[ss_ticket_number];RF1 sr_item_sk->[ss_item_sk];RF2 sr_customer_sk->[ss_customer_sk]
17+
----------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((store_sales.ss_customer_sk = store_returns.sr_customer_sk) and (store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=() build RFs:RF0 sr_ticket_number->[ss_ticket_number];RF1 sr_item_sk->[ss_item_sk];RF2 sr_customer_sk->[ss_customer_sk]
1818
------------------------------PhysicalProject
1919
--------------------------------PhysicalOlapScan[store_sales] apply RFs: RF0 RF1 RF2
2020
------------------------------PhysicalProject

‎regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query64.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ PhysicalCteAnchor ( cteId=CTEId#1 )
3939
------------------------------------------------------------------------PhysicalProject
4040
--------------------------------------------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((store_sales.ss_item_sk = cs_ui.cs_item_sk)) otherCondition=() build RFs:RF4 cs_item_sk->[sr_item_sk,ss_item_sk]
4141
----------------------------------------------------------------------------PhysicalProject
42-
------------------------------------------------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
42+
------------------------------------------------------------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((store_sales.ss_item_sk = store_returns.sr_item_sk) and (store_sales.ss_ticket_number = store_returns.sr_ticket_number)) otherCondition=()
4343
--------------------------------------------------------------------------------PhysicalProject
4444
----------------------------------------------------------------------------------PhysicalOlapScan[store_sales] apply RFs: RF4 RF8 RF19
4545
--------------------------------------------------------------------------------PhysicalProject
@@ -50,7 +50,7 @@ PhysicalCteAnchor ( cteId=CTEId#1 )
5050
----------------------------------------------------------------------------------PhysicalDistribute[DistributionSpecHash]
5151
------------------------------------------------------------------------------------hashAgg[LOCAL]
5252
--------------------------------------------------------------------------------------PhysicalProject
53-
----------------------------------------------------------------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((catalog_sales.cs_item_sk = catalog_returns.cr_item_sk) and (catalog_sales.cs_order_number = catalog_returns.cr_order_number)) otherCondition=()
53+
----------------------------------------------------------------------------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((catalog_sales.cs_item_sk = catalog_returns.cr_item_sk) and (catalog_sales.cs_order_number = catalog_returns.cr_order_number)) otherCondition=()
5454
------------------------------------------------------------------------------------------PhysicalProject
5555
--------------------------------------------------------------------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF19
5656
------------------------------------------------------------------------------------------PhysicalProject

0 commit comments

Comments
 (0)