Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@englefly
englefly committed Nov 16, 2023
1 parent 375abe4 commit 1632871
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 50 deletions.
4 changes: 2 additions & 2 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q1.1.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ PhysicalResultSink
----PhysicalDistribute
------hashAgg[LOCAL]
--------PhysicalProject
----------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF0 d_datekey->[lo_orderdate]
------------PhysicalProject
--------------filter((lineorder.lo_discount <= 3) and (lineorder.lo_discount >= 1) and (lineorder.lo_quantity < 25))
----------------PhysicalOlapScan[lineorder]
----------------PhysicalOlapScan[lineorder] apply RFs: RF0
------------PhysicalDistribute
--------------PhysicalProject
----------------filter((dates.d_year = 1993))
Expand Down
4 changes: 2 additions & 2 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q1.2.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ PhysicalResultSink
----PhysicalDistribute
------hashAgg[LOCAL]
--------PhysicalProject
----------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF0 d_datekey->[lo_orderdate]
------------PhysicalProject
--------------filter((lineorder.lo_discount <= 6) and (lineorder.lo_discount >= 4) and (lineorder.lo_quantity <= 35) and (lineorder.lo_quantity >= 26))
----------------PhysicalOlapScan[lineorder]
----------------PhysicalOlapScan[lineorder] apply RFs: RF0
------------PhysicalDistribute
--------------PhysicalProject
----------------filter((dates.d_yearmonth = 'Jan1994'))
Expand Down
4 changes: 2 additions & 2 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q1.3.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ PhysicalResultSink
----PhysicalDistribute
------hashAgg[LOCAL]
--------PhysicalProject
----------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF0 d_datekey->[lo_orderdate]
------------PhysicalProject
--------------filter((lineorder.lo_discount <= 7) and (lineorder.lo_discount >= 5) and (lineorder.lo_quantity <= 35) and (lineorder.lo_quantity >= 26))
----------------PhysicalOlapScan[lineorder]
----------------PhysicalOlapScan[lineorder] apply RFs: RF0
------------PhysicalDistribute
--------------PhysicalProject
----------------filter((dates.d_weeknuminyear = 6) and (dates.d_year = 1994))
Expand Down
8 changes: 4 additions & 4 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.1.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF2 d_datekey->[lo_orderdate]
------------------PhysicalProject
--------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey))otherCondition=()
--------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF1 s_suppkey->[lo_suppkey]
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey)) otherCondition=() build RFs:RF0 p_partkey->[lo_partkey]
------------------------PhysicalProject
--------------------------PhysicalOlapScan[lineorder]
--------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2
------------------------PhysicalDistribute
--------------------------PhysicalProject
----------------------------filter((part.p_category = 'MFGR#12'))
Expand Down
8 changes: 4 additions & 4 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.2.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF2 d_datekey->[lo_orderdate]
------------------PhysicalDistribute
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF1 s_suppkey->[lo_suppkey]
------------------------PhysicalDistribute
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey))otherCondition=()
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey)) otherCondition=() build RFs:RF0 p_partkey->[lo_partkey]
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[lineorder]
------------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2
----------------------------PhysicalDistribute
------------------------------PhysicalProject
--------------------------------filter((part.p_brand <= 'MFGR#2228') and (part.p_brand >= 'MFGR#2221'))
Expand Down
8 changes: 4 additions & 4 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.3.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF2 d_datekey->[lo_orderdate]
------------------PhysicalDistribute
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF1 s_suppkey->[lo_suppkey]
------------------------PhysicalDistribute
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey))otherCondition=()
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey)) otherCondition=() build RFs:RF0 p_partkey->[lo_partkey]
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[lineorder]
------------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2
----------------------------PhysicalDistribute
------------------------------PhysicalProject
--------------------------------filter((part.p_brand = 'MFGR#2239'))
Expand Down
8 changes: 4 additions & 4 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.1.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF2 d_datekey->[lo_orderdate]
------------------PhysicalProject
--------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey))otherCondition=()
--------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey)) otherCondition=() build RFs:RF1 c_custkey->[lo_custkey]
----------------------PhysicalDistribute
------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF0 s_suppkey->[lo_suppkey]
--------------------------PhysicalProject
----------------------------PhysicalOlapScan[lineorder]
----------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2
--------------------------PhysicalDistribute
----------------------------PhysicalProject
------------------------------filter((supplier.s_region = 'ASIA'))
Expand Down
8 changes: 4 additions & 4 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.2.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF2 d_datekey->[lo_orderdate]
------------------PhysicalProject
--------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey))otherCondition=()
--------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey)) otherCondition=() build RFs:RF1 c_custkey->[lo_custkey]
----------------------PhysicalDistribute
------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF0 s_suppkey->[lo_suppkey]
--------------------------PhysicalProject
----------------------------PhysicalOlapScan[lineorder]
----------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2
--------------------------PhysicalDistribute
----------------------------PhysicalProject
------------------------------filter((supplier.s_nation = 'UNITED STATES'))
Expand Down
8 changes: 4 additions & 4 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.3.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF2 d_datekey->[lo_orderdate]
------------------PhysicalDistribute
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey))otherCondition=()
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey)) otherCondition=() build RFs:RF1 c_custkey->[lo_custkey]
------------------------PhysicalDistribute
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF0 s_suppkey->[lo_suppkey]
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[lineorder]
------------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2
----------------------------PhysicalDistribute
------------------------------PhysicalProject
--------------------------------filter(s_city IN ('UNITED KI1', 'UNITED KI5'))
Expand Down
8 changes: 4 additions & 4 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.4.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey)) otherCondition=() build RFs:RF2 c_custkey->[lo_custkey]
------------------PhysicalDistribute
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF1 d_datekey->[lo_orderdate]
------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF0 s_suppkey->[lo_suppkey]
--------------------------PhysicalProject
----------------------------PhysicalOlapScan[lineorder]
----------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2
--------------------------PhysicalDistribute
----------------------------PhysicalProject
------------------------------filter(s_city IN ('UNITED KI1', 'UNITED KI5'))
Expand Down
10 changes: 5 additions & 5 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q4.1.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF3 d_datekey->[lo_orderdate]
------------------PhysicalProject
--------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey))otherCondition=()
--------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey)) otherCondition=() build RFs:RF2 p_partkey->[lo_partkey]
----------------------PhysicalDistribute
------------------------PhysicalProject
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey))otherCondition=()
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey)) otherCondition=() build RFs:RF1 c_custkey->[lo_custkey]
----------------------------PhysicalDistribute
------------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
------------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF0 s_suppkey->[lo_suppkey]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[lineorder]
----------------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2 RF3
--------------------------------PhysicalDistribute
----------------------------------PhysicalProject
------------------------------------filter((supplier.s_region = 'AMERICA'))
Expand Down
10 changes: 5 additions & 5 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q4.2.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey)) otherCondition=() build RFs:RF3 p_partkey->[lo_partkey]
------------------PhysicalDistribute
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey))otherCondition=()
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey)) otherCondition=() build RFs:RF2 c_custkey->[lo_custkey]
------------------------PhysicalDistribute
--------------------------PhysicalProject
----------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
------------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
----------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF1 d_datekey->[lo_orderdate]
------------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF0 s_suppkey->[lo_suppkey]
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[lineorder]
----------------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2 RF3
--------------------------------PhysicalDistribute
----------------------------------PhysicalProject
------------------------------------filter((supplier.s_region = 'AMERICA'))
Expand Down
12 changes: 6 additions & 6 deletions regression-test/data/nereids_ssb_shape_sf100_p0/shape/q4.3.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey))otherCondition=()
----------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_custkey = customer.c_custkey)) otherCondition=() build RFs:RF3 lo_custkey->[c_custkey]
------------------PhysicalProject
--------------------PhysicalOlapScan[customer]
--------------------PhysicalOlapScan[customer] apply RFs: RF3
------------------PhysicalDistribute
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey))otherCondition=()
------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey))otherCondition=()
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey))otherCondition=()
----------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_orderdate = dates.d_datekey)) otherCondition=() build RFs:RF2 d_datekey->[lo_orderdate]
------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_partkey = part.p_partkey)) otherCondition=() build RFs:RF1 p_partkey->[lo_partkey]
--------------------------hashJoin[INNER_JOIN] hashCondition=((lineorder.lo_suppkey = supplier.s_suppkey)) otherCondition=() build RFs:RF0 s_suppkey->[lo_suppkey]
----------------------------PhysicalProject
------------------------------PhysicalOlapScan[lineorder]
------------------------------PhysicalOlapScan[lineorder] apply RFs: RF0 RF1 RF2
----------------------------PhysicalDistribute
------------------------------PhysicalProject
--------------------------------filter((supplier.s_nation = 'UNITED STATES'))
Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/correctness_p0/test_runtimefilter_with_window.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
suite("test_runtimefilter_with_window") {
sql """ set enable_nereids_planner=true"""
sql """ set disable_join_reorder=true"""
sql """ set enable_runtime_filter_prune=false"""
sql """ DROP TABLE IF EXISTS `test_runtimefilter_with_window_table1` """
sql """ DROP TABLE IF EXISTS `test_runtimefilter_with_window_table2` """
sql """
Expand Down

0 comments on commit 1632871

Please sign in to comment.