Skip to content

Commit

Permalink
[fix](test) fix test which conflict between #37219 and #37951 (#38157)
Browse files Browse the repository at this point in the history 
fix test which conflict between #37219 and #37951
  • Loading branch information
@924060929
924060929 authored Jul 19, 2024
1 parent 05b05bd commit 6eb3eac
Show file tree
Hide file tree
Showing 29 changed files with 296 additions and 296 deletions.
8 changes: 4 additions & 4 deletions regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query14.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,16 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
--------------------------------PhysicalDistribute[DistributionSpecHash]
----------------------------------hashAgg[LOCAL]
------------------------------------PhysicalProject
--------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((web_sales.ws_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF17 d_date_sk->[ws_sold_date_sk]
--------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((web_sales.ws_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF18 d_date_sk->[ws_sold_date_sk]
----------------------------------------PhysicalProject
------------------------------------------hashJoin[LEFT_SEMI_JOIN bucketShuffle] hashCondition=((web_sales.ws_item_sk = cross_items.ss_item_sk)) otherCondition=()
------------------------------------------hashJoin[RIGHT_SEMI_JOIN shuffleBucket] hashCondition=((web_sales.ws_item_sk = cross_items.ss_item_sk)) otherCondition=() build RFs:RF17 ws_item_sk->[ss_item_sk]
--------------------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF17
--------------------------------------------PhysicalProject
----------------------------------------------hashJoin[INNER_JOIN shuffleBucket] hashCondition=((web_sales.ws_item_sk = item.i_item_sk)) otherCondition=()
------------------------------------------------PhysicalProject
--------------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF17
--------------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF18
------------------------------------------------PhysicalProject
--------------------------------------------------PhysicalOlapScan[item]
--------------------------------------------PhysicalCteConsumer ( cteId=CTEId#0 )
----------------------------------------PhysicalProject
------------------------------------------filter((date_dim.d_moy = 11) and (date_dim.d_year = 2002))
--------------------------------------------PhysicalOlapScan[date_dim]
Expand Down
18 changes: 9 additions & 9 deletions regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query58.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ PhysicalResultSink
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[item] apply RFs: RF12 RF13
----------------------------PhysicalProject
------------------------------hashJoin[LEFT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF9 d_date->[d_date]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim] apply RFs: RF9
------------------------------hashJoin[RIGHT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=()
--------------------------------PhysicalProject
----------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((date_dim.d_week_seq = date_dim.d_week_seq)) otherCondition=() build RFs:RF8 d_week_seq->[d_week_seq]
------------------------------------PhysicalProject
Expand All @@ -33,6 +31,8 @@ PhysicalResultSink
----------------------------------------PhysicalProject
------------------------------------------filter((date_dim.d_date = '2001-03-24'))
--------------------------------------------PhysicalOlapScan[date_dim]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim]
----------------PhysicalProject
------------------hashAgg[GLOBAL]
--------------------PhysicalDistribute[DistributionSpecHash]
Expand All @@ -46,9 +46,7 @@ PhysicalResultSink
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[item] apply RFs: RF13
----------------------------PhysicalProject
------------------------------hashJoin[LEFT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF5 d_date->[d_date]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim] apply RFs: RF5
------------------------------hashJoin[RIGHT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=()
--------------------------------PhysicalProject
----------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((date_dim.d_week_seq = date_dim.d_week_seq)) otherCondition=() build RFs:RF4 d_week_seq->[d_week_seq]
------------------------------------PhysicalProject
Expand All @@ -58,6 +56,8 @@ PhysicalResultSink
----------------------------------------PhysicalProject
------------------------------------------filter((date_dim.d_date = '2001-03-24'))
--------------------------------------------PhysicalOlapScan[date_dim]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim]
------------PhysicalProject
--------------hashAgg[GLOBAL]
----------------PhysicalDistribute[DistributionSpecHash]
Expand All @@ -71,9 +71,7 @@ PhysicalResultSink
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[item]
------------------------PhysicalProject
--------------------------hashJoin[LEFT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF1 d_date->[d_date]
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[date_dim] apply RFs: RF1
--------------------------hashJoin[RIGHT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=()
----------------------------PhysicalProject
------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((date_dim.d_week_seq = date_dim.d_week_seq)) otherCondition=() build RFs:RF0 d_week_seq->[d_week_seq]
--------------------------------PhysicalProject
Expand All @@ -83,4 +81,6 @@ PhysicalResultSink
------------------------------------PhysicalProject
--------------------------------------filter((date_dim.d_date = '2001-03-24'))
----------------------------------------PhysicalOlapScan[date_dim]
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[date_dim]

28 changes: 14 additions & 14 deletions regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query95.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
----PhysicalProject
------hashJoin[INNER_JOIN shuffle] hashCondition=((ws1.ws_order_number = ws2.ws_order_number)) otherCondition=(( not (ws_warehouse_sk = ws_warehouse_sk))) build RFs:RF0 ws_order_number->[ws_order_number]
--------PhysicalProject
----------PhysicalOlapScan[web_sales] apply RFs: RF0 RF6
----------PhysicalOlapScan[web_sales] apply RFs: RF0 RF7
--------PhysicalProject
----------PhysicalOlapScan[web_sales] apply RFs: RF6
----------PhysicalOlapScan[web_sales] apply RFs: RF7
--PhysicalResultSink
----PhysicalTopN[GATHER_SORT]
------hashAgg[DISTINCT_GLOBAL]
Expand All @@ -16,21 +16,21 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
------------hashAgg[GLOBAL]
--------------hashAgg[LOCAL]
----------------PhysicalProject
------------------hashJoin[INNER_JOIN broadcast] hashCondition=((ws1.ws_web_site_sk = web_site.web_site_sk)) otherCondition=() build RFs:RF5 web_site_sk->[ws_web_site_sk]
------------------hashJoin[INNER_JOIN broadcast] hashCondition=((ws1.ws_web_site_sk = web_site.web_site_sk)) otherCondition=() build RFs:RF6 web_site_sk->[ws_web_site_sk]
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((ws1.ws_ship_addr_sk = customer_address.ca_address_sk)) otherCondition=() build RFs:RF4 ca_address_sk->[ws_ship_addr_sk]
----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((ws1.ws_ship_addr_sk = customer_address.ca_address_sk)) otherCondition=() build RFs:RF5 ca_address_sk->[ws_ship_addr_sk]
------------------------PhysicalProject
--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((ws1.ws_ship_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF3 d_date_sk->[ws_ship_date_sk]
----------------------------hashJoin[LEFT_SEMI_JOIN colocated] hashCondition=((ws1.ws_order_number = web_returns.wr_order_number)) otherCondition=()
------------------------------hashJoin[LEFT_SEMI_JOIN shuffle] hashCondition=((ws1.ws_order_number = ws_wh.ws_order_number)) otherCondition=()
--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((ws1.ws_ship_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF4 d_date_sk->[ws_ship_date_sk]
----------------------------hashJoin[RIGHT_SEMI_JOIN shuffleBucket] hashCondition=((ws1.ws_order_number = ws_wh.ws_order_number)) otherCondition=() build RFs:RF3 ws_order_number->[ws_order_number]
------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF3
------------------------------hashJoin[RIGHT_SEMI_JOIN bucketShuffle] hashCondition=((ws1.ws_order_number = web_returns.wr_order_number)) otherCondition=() build RFs:RF2 ws_order_number->[wr_order_number];RF7 ws_order_number->[ws_order_number,ws_order_number]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[web_sales] apply RFs: RF3 RF4 RF5
--------------------------------PhysicalCteConsumer ( cteId=CTEId#0 )
------------------------------PhysicalProject
--------------------------------hashJoin[INNER_JOIN shuffle] hashCondition=((web_returns.wr_order_number = ws_wh.ws_order_number)) otherCondition=() build RFs:RF6 wr_order_number->[ws_order_number]
----------------------------------PhysicalCteConsumer ( cteId=CTEId#0 )
----------------------------------PhysicalProject
------------------------------------PhysicalOlapScan[web_returns]
----------------------------------hashJoin[INNER_JOIN shuffle] hashCondition=((web_returns.wr_order_number = ws_wh.ws_order_number)) otherCondition=()
------------------------------------PhysicalCteConsumer ( cteId=CTEId#0 )
------------------------------------PhysicalProject
--------------------------------------PhysicalOlapScan[web_returns] apply RFs: RF2
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[web_sales] apply RFs: RF4 RF5 RF6
----------------------------PhysicalProject
------------------------------filter((date_dim.d_date <= '1999-04-02') and (date_dim.d_date >= '1999-02-01'))
--------------------------------PhysicalOlapScan[date_dim]
Expand Down
8 changes: 4 additions & 4 deletions regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query14.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,16 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
--------------------------------PhysicalDistribute[DistributionSpecHash]
----------------------------------hashAgg[LOCAL]
------------------------------------PhysicalProject
--------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((web_sales.ws_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF17 d_date_sk->[ws_sold_date_sk]
--------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((web_sales.ws_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF18 d_date_sk->[ws_sold_date_sk]
----------------------------------------PhysicalProject
------------------------------------------hashJoin[LEFT_SEMI_JOIN bucketShuffle] hashCondition=((web_sales.ws_item_sk = cross_items.ss_item_sk)) otherCondition=()
------------------------------------------hashJoin[RIGHT_SEMI_JOIN shuffleBucket] hashCondition=((web_sales.ws_item_sk = cross_items.ss_item_sk)) otherCondition=() build RFs:RF17 ws_item_sk->[ss_item_sk]
--------------------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF17
--------------------------------------------PhysicalProject
----------------------------------------------hashJoin[INNER_JOIN shuffleBucket] hashCondition=((web_sales.ws_item_sk = item.i_item_sk)) otherCondition=() build RFs:RF16 i_item_sk->[ws_item_sk]
------------------------------------------------PhysicalProject
--------------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF16 RF17
--------------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF16 RF18
------------------------------------------------PhysicalProject
--------------------------------------------------PhysicalOlapScan[item]
--------------------------------------------PhysicalCteConsumer ( cteId=CTEId#0 )
----------------------------------------PhysicalProject
------------------------------------------filter((date_dim.d_moy = 11) and (date_dim.d_year = 2002))
--------------------------------------------PhysicalOlapScan[date_dim]
Expand Down
24 changes: 12 additions & 12 deletions regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query58.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ PhysicalResultSink
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[item] apply RFs: RF12 RF13
----------------------------PhysicalProject
------------------------------hashJoin[LEFT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF9 d_date->[d_date]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim] apply RFs: RF9
------------------------------hashJoin[RIGHT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF9 d_date->[d_date]
--------------------------------PhysicalProject
----------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((date_dim.d_week_seq = date_dim.d_week_seq)) otherCondition=() build RFs:RF8 d_week_seq->[d_week_seq]
------------------------------------PhysicalProject
--------------------------------------PhysicalOlapScan[date_dim] apply RFs: RF8
--------------------------------------PhysicalOlapScan[date_dim] apply RFs: RF8 RF9
------------------------------------PhysicalAssertNumRows
--------------------------------------PhysicalDistribute[DistributionSpecGather]
----------------------------------------PhysicalProject
------------------------------------------filter((date_dim.d_date = '2001-03-24'))
--------------------------------------------PhysicalOlapScan[date_dim]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim]
----------------PhysicalProject
------------------hashAgg[GLOBAL]
--------------------PhysicalDistribute[DistributionSpecHash]
Expand All @@ -46,18 +46,18 @@ PhysicalResultSink
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[item] apply RFs: RF13
----------------------------PhysicalProject
------------------------------hashJoin[LEFT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF5 d_date->[d_date]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim] apply RFs: RF5
------------------------------hashJoin[RIGHT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF5 d_date->[d_date]
--------------------------------PhysicalProject
----------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((date_dim.d_week_seq = date_dim.d_week_seq)) otherCondition=() build RFs:RF4 d_week_seq->[d_week_seq]
------------------------------------PhysicalProject
--------------------------------------PhysicalOlapScan[date_dim] apply RFs: RF4
--------------------------------------PhysicalOlapScan[date_dim] apply RFs: RF4 RF5
------------------------------------PhysicalAssertNumRows
--------------------------------------PhysicalDistribute[DistributionSpecGather]
----------------------------------------PhysicalProject
------------------------------------------filter((date_dim.d_date = '2001-03-24'))
--------------------------------------------PhysicalOlapScan[date_dim]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim]
------------PhysicalProject
--------------hashAgg[GLOBAL]
----------------PhysicalDistribute[DistributionSpecHash]
Expand All @@ -71,16 +71,16 @@ PhysicalResultSink
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[item]
------------------------PhysicalProject
--------------------------hashJoin[LEFT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF1 d_date->[d_date]
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[date_dim] apply RFs: RF1
--------------------------hashJoin[RIGHT_SEMI_JOIN shuffle] hashCondition=((date_dim.d_date = date_dim.d_date)) otherCondition=() build RFs:RF1 d_date->[d_date]
----------------------------PhysicalProject
------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((date_dim.d_week_seq = date_dim.d_week_seq)) otherCondition=() build RFs:RF0 d_week_seq->[d_week_seq]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[date_dim] apply RFs: RF0
----------------------------------PhysicalOlapScan[date_dim] apply RFs: RF0 RF1
--------------------------------PhysicalAssertNumRows
----------------------------------PhysicalDistribute[DistributionSpecGather]
------------------------------------PhysicalProject
--------------------------------------filter((date_dim.d_date = '2001-03-24'))
----------------------------------------PhysicalOlapScan[date_dim]
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[date_dim]

Loading

0 comments on commit 6eb3eac

Please sign in to comment.