This is an automated email from the ASF dual-hosted git repository.

jakevin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 502f5778f48 [enhancement](Nereids): set maxJoinNumBushyTree = 8 
(#26173)
502f5778f48 is described below

commit 502f5778f48fb4c1e993c7b0885a4f37f7f9ea26
Author: jakevin <[email protected]>
AuthorDate: Wed Nov 1 19:04:49 2023 +0800

    [enhancement](Nereids): set maxJoinNumBushyTree = 8 (#26173)
---
 .../java/org/apache/doris/qe/SessionVariable.java  |   2 +-
 .../shape/query17.out                              |  55 +++++-----
 .../shape/query18.out                              |  44 ++++----
 .../shape/query24.out                              |  52 ++++-----
 .../shape/query25.out                              |  63 ++++++-----
 .../shape/query29.out                              |  32 +++---
 .../shape/query54.out                              | 117 ++++++++++-----------
 .../nereids_tpcds_shape_sf1000_p0/shape/query6.out |  56 +++++-----
 .../shape/query61.out                              |  51 +++++----
 .../nereids_tpcds_shape_sf100_p0/shape/query17.out |  63 ++++++-----
 .../nereids_tpcds_shape_sf100_p0/shape/query18.out |  49 ++++-----
 .../nereids_tpcds_shape_sf100_p0/shape/query24.out |  27 ++---
 .../nereids_tpcds_shape_sf100_p0/shape/query25.out |  63 ++++++-----
 .../nereids_tpcds_shape_sf100_p0/shape/query29.out |  32 +++---
 .../nereids_tpcds_shape_sf100_p0/shape/query6.out  |  52 ++++-----
 .../nereids_tpcds_shape_sf100_p0/shape/query91.out |  60 ++++++-----
 .../data/nereids_tpch_shape_sf1000_p0/shape/q5.out |  32 +++---
 .../data/nereids_tpch_shape_sf1000_p0/shape/q7.out |  44 ++++----
 .../data/nereids_tpch_shape_sf1000_p0/shape/q8.out |  43 ++++----
 .../data/nereids_tpch_shape_sf1000_p0/shape/q9.out |  44 ++++----
 .../nereids_tpcds_shape_sf100_p0/rf/ds_rf17.groovy |   2 +-
 .../nereids_tpcds_shape_sf100_p0/rf/ds_rf18.groovy |   4 +-
 .../nereids_tpcds_shape_sf100_p0/rf/ds_rf24.groovy |   4 +-
 .../nereids_tpcds_shape_sf100_p0/rf/ds_rf25.groovy |   2 +-
 .../nereids_tpcds_shape_sf100_p0/rf/ds_rf29.groovy |   3 +-
 .../nereids_tpcds_shape_sf100_p0/rf/ds_rf6.groovy  |   4 +-
 .../nereids_tpcds_shape_sf100_p0/rf/ds_rf91.groovy |   4 +-
 .../nereids_tpch_shape_sf1000_p0/rf/h_rf5.groovy   |   4 +-
 .../nereids_tpch_shape_sf1000_p0/rf/h_rf7.groovy   |   3 +-
 .../nereids_tpch_shape_sf1000_p0/rf/h_rf8.groovy   |   4 +-
 .../nereids_tpch_shape_sf1000_p0/rf/h_rf9.groovy   |   3 +-
 31 files changed, 509 insertions(+), 509 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java 
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index ba9ccf806e4..c589d31ed56 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -854,7 +854,7 @@ public class SessionVariable implements Serializable, 
Writable {
 
 
     @VariableMgr.VarAttr(name = MAX_JOIN_NUMBER_BUSHY_TREE)
-    private int maxJoinNumBushyTree = 5;
+    private int maxJoinNumBushyTree = 8;
 
     @VariableMgr.VarAttr(name = ENABLE_PARTITION_TOPN)
     private boolean enablePartitionTopN = true;
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query17.out 
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query17.out
index 418fc060fb3..7d073ac5f47 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query17.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query17.out
@@ -9,42 +9,41 @@ PhysicalResultSink
 ------------PhysicalDistribute
 --------------hashAgg[LOCAL]
 ----------------PhysicalProject
-------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = d3.d_date_sk))otherCondition=()
---------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_customer_sk = 
catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = 
catalog_sales.cs_item_sk))otherCondition=()
-------------------------PhysicalDistribute
+------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_customer_sk = 
catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = 
catalog_sales.cs_item_sk))otherCondition=()
+--------------------PhysicalDistribute
+----------------------PhysicalProject
+------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = d3.d_date_sk))otherCondition=()
 --------------------------PhysicalProject
 ----------------------------PhysicalOlapScan[catalog_sales]
-------------------------PhysicalDistribute
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------filter(d_quarter_name IN ('2001Q1', '2001Q2', 
'2001Q3'))
+--------------------------------PhysicalOlapScan[date_dim]
+--------------------PhysicalDistribute
+----------------------PhysicalProject
+------------------------hashJoin[INNER_JOIN] hashCondition=((store.s_store_sk 
= store_sales.ss_store_sk))otherCondition=()
 --------------------------hashJoin[INNER_JOIN] hashCondition=((item.i_item_sk 
= store_sales.ss_item_sk))otherCondition=()
 ----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store.s_store_sk = store_sales.ss_store_sk))otherCondition=()
-----------------------------------PhysicalProject
-------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
+--------------------------------hashJoin[INNER_JOIN] 
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=()
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
+------------------------------------PhysicalProject
+--------------------------------------PhysicalOlapScan[store_sales]
+------------------------------------PhysicalDistribute
 --------------------------------------PhysicalProject
-----------------------------------------hashJoin[INNER_JOIN] 
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=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[store_returns]
-------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
---------------------------------------------PhysicalProject
-----------------------------------------------PhysicalOlapScan[store_sales]
---------------------------------------------PhysicalDistribute
-----------------------------------------------PhysicalProject
-------------------------------------------------filter((d1.d_quarter_name = 
'2001Q1'))
---------------------------------------------------PhysicalOlapScan[date_dim]
---------------------------------------PhysicalDistribute
-----------------------------------------PhysicalProject
-------------------------------------------filter(d_quarter_name IN ('2001Q1', 
'2001Q2', '2001Q3'))
---------------------------------------------PhysicalOlapScan[date_dim]
-----------------------------------PhysicalDistribute
+----------------------------------------filter((d1.d_quarter_name = '2001Q1'))
+------------------------------------------PhysicalOlapScan[date_dim]
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
 ------------------------------------PhysicalProject
---------------------------------------PhysicalOlapScan[store]
+--------------------------------------PhysicalOlapScan[store_returns]
+------------------------------------PhysicalDistribute
+--------------------------------------PhysicalProject
+----------------------------------------filter(d_quarter_name IN ('2001Q1', 
'2001Q2', '2001Q3'))
+------------------------------------------PhysicalOlapScan[date_dim]
 ----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[item]
---------------------PhysicalDistribute
-----------------------PhysicalProject
-------------------------filter(d_quarter_name IN ('2001Q1', '2001Q2', 
'2001Q3'))
---------------------------PhysicalOlapScan[date_dim]
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------PhysicalOlapScan[store]
 
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query18.out 
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query18.out
index 200d4c5ef0c..d8d3d49c126 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query18.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query18.out
@@ -15,30 +15,32 @@ PhysicalResultSink
 ------------------------PhysicalProject
 --------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
 ----------------------------PhysicalProject
-------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_bill_cdemo_sk = 
cd1.cd_demo_sk))otherCondition=()
---------------------------------PhysicalProject
-----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_bill_customer_sk = 
customer.c_customer_sk))otherCondition=()
-------------------------------------PhysicalProject
---------------------------------------PhysicalOlapScan[catalog_sales]
-------------------------------------PhysicalDistribute
---------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_cdemo_sk = cd2.cd_demo_sk))otherCondition=()
-----------------------------------------PhysicalDistribute
-------------------------------------------PhysicalProject
+------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_bill_customer_sk = 
customer.c_customer_sk))otherCondition=()
+--------------------------------PhysicalDistribute
+----------------------------------PhysicalProject
+------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_bill_cdemo_sk = 
cd1.cd_demo_sk))otherCondition=()
+--------------------------------------PhysicalProject
+----------------------------------------PhysicalOlapScan[catalog_sales]
+--------------------------------------PhysicalDistribute
+----------------------------------------PhysicalProject
+------------------------------------------filter((cd1.cd_education_status = 
'Primary') and (cd1.cd_gender = 'F'))
 
--------------------------------------------PhysicalOlapScan[customer_demographics]
-----------------------------------------PhysicalDistribute
-------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=()
---------------------------------------------PhysicalDistribute
-----------------------------------------------PhysicalProject
-------------------------------------------------filter(c_birth_month IN (1, 
10, 11, 3, 4, 7))
---------------------------------------------------PhysicalOlapScan[customer]
---------------------------------------------PhysicalDistribute
-----------------------------------------------PhysicalProject
-------------------------------------------------filter(ca_state IN ('AL', 
'CA', 'GA', 'IN', 'MO', 'MT', 'TN'))
---------------------------------------------------PhysicalOlapScan[customer_address]
 --------------------------------PhysicalDistribute
 ----------------------------------PhysicalProject
-------------------------------------filter((cd1.cd_education_status = 
'Primary') and (cd1.cd_gender = 'F'))
---------------------------------------PhysicalOlapScan[customer_demographics]
+------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_cdemo_sk = cd2.cd_demo_sk))otherCondition=()
+--------------------------------------PhysicalDistribute
+----------------------------------------PhysicalProject
+------------------------------------------PhysicalOlapScan[customer_demographics]
+--------------------------------------PhysicalDistribute
+----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=()
+------------------------------------------PhysicalDistribute
+--------------------------------------------PhysicalProject
+----------------------------------------------filter(c_birth_month IN (1, 10, 
11, 3, 4, 7))
+------------------------------------------------PhysicalOlapScan[customer]
+------------------------------------------PhysicalDistribute
+--------------------------------------------PhysicalProject
+----------------------------------------------filter(ca_state IN ('AL', 'CA', 
'GA', 'IN', 'MO', 'MT', 'TN'))
+------------------------------------------------PhysicalOlapScan[customer_address]
 ----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
 --------------------------------filter((date_dim.d_year = 2001))
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query24.out 
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query24.out
index 8efd7c30681..6aceccd646c 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query24.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query24.out
@@ -11,24 +11,24 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
 ----------------PhysicalDistribute
 ------------------PhysicalProject
 --------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_item_sk = item.i_item_sk))otherCondition=()
-----------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = customer_address.ca_address_sk) 
and (store.s_zip = customer_address.ca_zip))otherCondition=(( not 
(c_birth_country = upper(ca_country))))
+----------------------hashJoin[INNER_JOIN] hashCondition=((store.s_zip = 
customer_address.ca_zip) and (store_sales.ss_customer_sk = 
customer.c_customer_sk))otherCondition=()
 ------------------------PhysicalDistribute
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_customer_sk = 
customer.c_customer_sk))otherCondition=()
-------------------------------PhysicalDistribute
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_store_sk = store.s_store_sk))otherCondition=()
-----------------------------------PhysicalProject
-------------------------------------PhysicalOlapScan[store_sales]
-----------------------------------PhysicalDistribute
-------------------------------------PhysicalProject
---------------------------------------filter((store.s_market_id = 5))
-----------------------------------------PhysicalOlapScan[store]
+----------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_store_sk = store.s_store_sk))otherCondition=()
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[store_sales]
 ------------------------------PhysicalDistribute
 --------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[customer]
+----------------------------------filter((store.s_market_id = 5))
+------------------------------------PhysicalOlapScan[store]
 ------------------------PhysicalDistribute
---------------------------PhysicalProject
-----------------------------PhysicalOlapScan[customer_address]
+--------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=(( not (c_birth_country = 
upper(ca_country))))
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[customer]
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[customer_address]
 ----------------------PhysicalDistribute
 ------------------------PhysicalProject
 --------------------------PhysicalOlapScan[item]
@@ -69,24 +69,24 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
 ----------------PhysicalDistribute
 ------------------PhysicalProject
 --------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_item_sk = item.i_item_sk))otherCondition=()
-----------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = customer_address.ca_address_sk) 
and (store.s_zip = customer_address.ca_zip))otherCondition=(( not 
(c_birth_country = upper(ca_country))))
+----------------------hashJoin[INNER_JOIN] hashCondition=((store.s_zip = 
customer_address.ca_zip) and (store_sales.ss_customer_sk = 
customer.c_customer_sk))otherCondition=()
 ------------------------PhysicalDistribute
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_customer_sk = 
customer.c_customer_sk))otherCondition=()
-------------------------------PhysicalDistribute
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_store_sk = store.s_store_sk))otherCondition=()
-----------------------------------PhysicalProject
-------------------------------------PhysicalOlapScan[store_sales]
-----------------------------------PhysicalDistribute
-------------------------------------PhysicalProject
---------------------------------------filter((store.s_market_id = 5))
-----------------------------------------PhysicalOlapScan[store]
+----------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_store_sk = store.s_store_sk))otherCondition=()
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[store_sales]
 ------------------------------PhysicalDistribute
 --------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[customer]
+----------------------------------filter((store.s_market_id = 5))
+------------------------------------PhysicalOlapScan[store]
 ------------------------PhysicalDistribute
---------------------------PhysicalProject
-----------------------------PhysicalOlapScan[customer_address]
+--------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=(( not (c_birth_country = 
upper(ca_country))))
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[customer]
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[customer_address]
 ----------------------PhysicalDistribute
 ------------------------PhysicalProject
 --------------------------PhysicalOlapScan[item]
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query25.out 
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query25.out
index 46482ede35f..b6e51a1d8ab 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query25.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query25.out
@@ -8,42 +8,41 @@ PhysicalResultSink
 ----------PhysicalDistribute
 ------------hashAgg[LOCAL]
 --------------PhysicalProject
-----------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = d3.d_date_sk))otherCondition=()
-------------------PhysicalProject
---------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_customer_sk = 
catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = 
catalog_sales.cs_item_sk))otherCondition=()
-----------------------PhysicalDistribute
+----------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_customer_sk = 
catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = 
catalog_sales.cs_item_sk))otherCondition=()
+------------------PhysicalDistribute
+--------------------PhysicalProject
+----------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = d3.d_date_sk))otherCondition=()
 ------------------------PhysicalProject
 --------------------------PhysicalOlapScan[catalog_sales]
-----------------------PhysicalDistribute
-------------------------hashJoin[INNER_JOIN] hashCondition=((store.s_store_sk 
= store_sales.ss_store_sk))otherCondition=()
+------------------------PhysicalDistribute
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN] 
hashCondition=((item.i_item_sk = store_sales.ss_item_sk))otherCondition=()
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
-----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
+----------------------------filter((d3.d_moy <= 10) and (d3.d_moy >= 4) and 
(d3.d_year = 1999))
+------------------------------PhysicalOlapScan[date_dim]
+------------------PhysicalDistribute
+--------------------PhysicalProject
+----------------------hashJoin[INNER_JOIN] hashCondition=((store.s_store_sk = 
store_sales.ss_store_sk))otherCondition=()
+------------------------hashJoin[INNER_JOIN] hashCondition=((item.i_item_sk = 
store_sales.ss_item_sk))otherCondition=()
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------hashJoin[INNER_JOIN] 
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=()
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
+----------------------------------PhysicalProject
+------------------------------------PhysicalOlapScan[store_sales]
+----------------------------------PhysicalDistribute
+------------------------------------PhysicalProject
+--------------------------------------filter((d1.d_moy = 4) and (d1.d_year = 
1999))
+----------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
+----------------------------------PhysicalProject
+------------------------------------PhysicalOlapScan[store_returns]
+----------------------------------PhysicalDistribute
 ------------------------------------PhysicalProject
---------------------------------------hashJoin[INNER_JOIN] 
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=()
-----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[store_returns]
-----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[store_sales]
-------------------------------------------PhysicalDistribute
---------------------------------------------PhysicalProject
-----------------------------------------------filter((d1.d_moy = 4) and 
(d1.d_year = 1999))
-------------------------------------------------PhysicalOlapScan[date_dim]
-------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------filter((d2.d_moy <= 10) and (d2.d_moy 
>= 4) and (d2.d_year = 1999))
-------------------------------------------PhysicalOlapScan[date_dim]
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[item]
+--------------------------------------filter((d2.d_moy <= 10) and (d2.d_moy >= 
4) and (d2.d_year = 1999))
+----------------------------------------PhysicalOlapScan[date_dim]
 --------------------------PhysicalDistribute
 ----------------------------PhysicalProject
-------------------------------PhysicalOlapScan[store]
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------filter((d3.d_moy <= 10) and (d3.d_moy >= 4) and 
(d3.d_year = 1999))
-------------------------PhysicalOlapScan[date_dim]
+------------------------------PhysicalOlapScan[item]
+------------------------PhysicalDistribute
+--------------------------PhysicalProject
+----------------------------PhysicalOlapScan[store]
 
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query29.out 
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query29.out
index 26e1fa0413f..eb9652b6b5b 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query29.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query29.out
@@ -15,29 +15,27 @@ PhysicalResultSink
 ------------------------PhysicalOlapScan[catalog_sales]
 ----------------------PhysicalDistribute
 ------------------------hashJoin[INNER_JOIN] hashCondition=((store.s_store_sk 
= store_sales.ss_store_sk))otherCondition=()
---------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN] 
hashCondition=((item.i_item_sk = store_sales.ss_item_sk))otherCondition=()
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
+--------------------------hashJoin[INNER_JOIN] hashCondition=((item.i_item_sk 
= store_sales.ss_item_sk))otherCondition=()
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------hashJoin[INNER_JOIN] 
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=()
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
+------------------------------------PhysicalProject
+--------------------------------------PhysicalOlapScan[store_sales]
+------------------------------------PhysicalDistribute
+--------------------------------------PhysicalProject
+----------------------------------------filter((d1.d_moy = 4) and (d1.d_year = 
1998))
+------------------------------------------PhysicalOlapScan[date_dim]
 ----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
 ------------------------------------PhysicalProject
---------------------------------------hashJoin[INNER_JOIN] 
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=()
-----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[store_returns]
-----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[store_sales]
-------------------------------------------PhysicalDistribute
---------------------------------------------PhysicalProject
-----------------------------------------------filter((d1.d_moy = 4) and 
(d1.d_year = 1998))
-------------------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------------PhysicalOlapScan[store_returns]
 ------------------------------------PhysicalDistribute
 --------------------------------------PhysicalProject
 ----------------------------------------filter((d2.d_moy <= 7) and (d2.d_moy 
>= 4) and (d2.d_year = 1998))
 ------------------------------------------PhysicalOlapScan[date_dim]
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[item]
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[item]
 --------------------------PhysicalDistribute
 ----------------------------PhysicalProject
 ------------------------------PhysicalOlapScan[store]
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query54.out 
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query54.out
index 352165e257b..7384490c695 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query54.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query54.out
@@ -13,72 +13,71 @@ PhysicalResultSink
 --------------------PhysicalDistribute
 ----------------------hashAgg[LOCAL]
 ------------------------PhysicalProject
---------------------------NestedLoopJoin[INNER_JOIN](cast(d_month_seq as 
BIGINT) <= (d_month_seq + 3))
-----------------------------NestedLoopJoin[INNER_JOIN](cast(d_month_seq as 
BIGINT) >= (d_month_seq + 1))
+--------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
+----------------------------PhysicalProject
+------------------------------NestedLoopJoin[INNER_JOIN](cast(d_month_seq as 
BIGINT) <= (d_month_seq + 3))
+--------------------------------NestedLoopJoin[INNER_JOIN](cast(d_month_seq as 
BIGINT) >= (d_month_seq + 1))
+----------------------------------PhysicalProject
+------------------------------------PhysicalOlapScan[date_dim]
+----------------------------------PhysicalDistribute
+------------------------------------PhysicalAssertNumRows
+--------------------------------------PhysicalDistribute
+----------------------------------------hashAgg[GLOBAL]
+------------------------------------------PhysicalDistribute
+--------------------------------------------hashAgg[LOCAL]
+----------------------------------------------PhysicalProject
+------------------------------------------------filter((date_dim.d_moy = 1) 
and (date_dim.d_year = 1999))
+--------------------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------PhysicalDistribute
+----------------------------------PhysicalAssertNumRows
+------------------------------------PhysicalDistribute
+--------------------------------------hashAgg[GLOBAL]
+----------------------------------------PhysicalDistribute
+------------------------------------------hashAgg[LOCAL]
+--------------------------------------------PhysicalProject
+----------------------------------------------filter((date_dim.d_moy = 1) and 
(date_dim.d_year = 1999))
+------------------------------------------------PhysicalOlapScan[date_dim]
+----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((my_customers.c_customer_sk = 
store_sales.ss_customer_sk))otherCondition=()
+----------------------------------PhysicalProject
+------------------------------------PhysicalOlapScan[store_sales]
 ----------------------------------PhysicalDistribute
 ------------------------------------PhysicalProject
---------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((my_customers.c_customer_sk = 
store_sales.ss_customer_sk))otherCondition=()
-----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[store_sales]
+--------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer_address.ca_county = store.s_county) and 
(customer_address.ca_state = store.s_state))otherCondition=()
 ----------------------------------------PhysicalDistribute
-------------------------------------------PhysicalProject
---------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer_address.ca_county = store.s_county) and 
(customer_address.ca_state = store.s_state))otherCondition=()
-----------------------------------------------PhysicalDistribute
-------------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((my_customers.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=()
+------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((my_customers.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=()
+--------------------------------------------PhysicalProject
+----------------------------------------------PhysicalOlapScan[customer_address]
+--------------------------------------------PhysicalDistribute
+----------------------------------------------PhysicalProject
+------------------------------------------------hashAgg[LOCAL]
 --------------------------------------------------PhysicalProject
-----------------------------------------------------PhysicalOlapScan[customer_address]
---------------------------------------------------PhysicalDistribute
-----------------------------------------------------PhysicalProject
-------------------------------------------------------hashAgg[LOCAL]
+----------------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_customer_sk = 
cs_or_ws_sales.customer_sk))otherCondition=()
+------------------------------------------------------PhysicalDistribute
 --------------------------------------------------------PhysicalProject
-----------------------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_customer_sk = 
cs_or_ws_sales.customer_sk))otherCondition=()
-------------------------------------------------------------PhysicalDistribute
---------------------------------------------------------------PhysicalProject
-----------------------------------------------------------------PhysicalOlapScan[customer]
-------------------------------------------------------------PhysicalDistribute
---------------------------------------------------------------PhysicalProject
-----------------------------------------------------------------hashJoin[INNER_JOIN]
 hashCondition=((cs_or_ws_sales.sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
-------------------------------------------------------------------PhysicalProject
---------------------------------------------------------------------hashJoin[INNER_JOIN]
 hashCondition=((cs_or_ws_sales.item_sk = item.i_item_sk))otherCondition=()
-----------------------------------------------------------------------PhysicalUnion
-------------------------------------------------------------------------PhysicalDistribute
---------------------------------------------------------------------------PhysicalProject
-----------------------------------------------------------------------------PhysicalOlapScan[catalog_sales]
-------------------------------------------------------------------------PhysicalDistribute
---------------------------------------------------------------------------PhysicalProject
-----------------------------------------------------------------------------PhysicalOlapScan[web_sales]
-----------------------------------------------------------------------PhysicalDistribute
-------------------------------------------------------------------------PhysicalProject
---------------------------------------------------------------------------filter((item.i_category
 = 'Music') and (item.i_class = 'country'))
-----------------------------------------------------------------------------PhysicalOlapScan[item]
+----------------------------------------------------------PhysicalOlapScan[customer]
+------------------------------------------------------PhysicalDistribute
+--------------------------------------------------------PhysicalProject
+----------------------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((cs_or_ws_sales.sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
+------------------------------------------------------------PhysicalProject
+--------------------------------------------------------------hashJoin[INNER_JOIN]
 hashCondition=((cs_or_ws_sales.item_sk = item.i_item_sk))otherCondition=()
+----------------------------------------------------------------PhysicalUnion
 
------------------------------------------------------------------PhysicalDistribute
 
--------------------------------------------------------------------PhysicalProject
-----------------------------------------------------------------------filter((date_dim.d_moy
 = 1) and (date_dim.d_year = 1999))
-------------------------------------------------------------------------PhysicalOlapScan[date_dim]
-----------------------------------------------PhysicalDistribute
-------------------------------------------------PhysicalProject
---------------------------------------------------PhysicalOlapScan[store]
-----------------------------------PhysicalDistribute
-------------------------------------PhysicalProject
---------------------------------------PhysicalOlapScan[date_dim]
-------------------------------PhysicalDistribute
---------------------------------PhysicalAssertNumRows
-----------------------------------PhysicalDistribute
-------------------------------------hashAgg[GLOBAL]
---------------------------------------PhysicalDistribute
-----------------------------------------hashAgg[LOCAL]
+----------------------------------------------------------------------PhysicalOlapScan[catalog_sales]
+------------------------------------------------------------------PhysicalDistribute
+--------------------------------------------------------------------PhysicalProject
+----------------------------------------------------------------------PhysicalOlapScan[web_sales]
+----------------------------------------------------------------PhysicalDistribute
+------------------------------------------------------------------PhysicalProject
+--------------------------------------------------------------------filter((item.i_category
 = 'Music') and (item.i_class = 'country'))
+----------------------------------------------------------------------PhysicalOlapScan[item]
+------------------------------------------------------------PhysicalDistribute
+--------------------------------------------------------------PhysicalProject
+----------------------------------------------------------------filter((date_dim.d_moy
 = 1) and (date_dim.d_year = 1999))
+------------------------------------------------------------------PhysicalOlapScan[date_dim]
+----------------------------------------PhysicalDistribute
 ------------------------------------------PhysicalProject
---------------------------------------------filter((date_dim.d_moy = 1) and 
(date_dim.d_year = 1999))
-----------------------------------------------PhysicalOlapScan[date_dim]
-----------------------------PhysicalDistribute
-------------------------------PhysicalAssertNumRows
---------------------------------PhysicalDistribute
-----------------------------------hashAgg[GLOBAL]
-------------------------------------PhysicalDistribute
---------------------------------------hashAgg[LOCAL]
-----------------------------------------PhysicalProject
-------------------------------------------filter((date_dim.d_moy = 1) and 
(date_dim.d_year = 1999))
---------------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------------------PhysicalOlapScan[store]
 
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query6.out 
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query6.out
index fbd59d03080..0fe5f610ea2 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query6.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query6.out
@@ -10,45 +10,45 @@ PhysicalResultSink
 --------------PhysicalDistribute
 ----------------hashAgg[LOCAL]
 ------------------PhysicalProject
---------------------hashJoin[INNER_JOIN] hashCondition=((a.ca_address_sk = 
c.c_current_addr_sk))otherCondition=()
+--------------------hashJoin[INNER_JOIN] hashCondition=((c.c_customer_sk = 
s.ss_customer_sk))otherCondition=()
 ----------------------PhysicalDistribute
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN] hashCondition=((c.c_customer_sk 
= s.ss_customer_sk))otherCondition=()
+--------------------------hashJoin[INNER_JOIN] hashCondition=((s.ss_item_sk = 
i.i_item_sk))otherCondition=()
 ----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((j.i_category = 
i.i_category))otherCondition=((cast(i_current_price as DECIMALV3(38, 5)) > (1.2 
* avg(cast(i_current_price as DECIMALV3(9, 4))))))
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((s.ss_sold_date_sk = d.d_date_sk))otherCondition=()
 ----------------------------------PhysicalProject
-------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((s.ss_item_sk = i.i_item_sk))otherCondition=()
+------------------------------------PhysicalOlapScan[store_sales]
+----------------------------------PhysicalDistribute
+------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d.d_month_seq = date_dim.d_month_seq))otherCondition=()
+--------------------------------------PhysicalProject
+----------------------------------------PhysicalOlapScan[date_dim]
 --------------------------------------PhysicalDistribute
-----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((s.ss_sold_date_sk = d.d_date_sk))otherCondition=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[store_sales]
+----------------------------------------PhysicalAssertNumRows
 ------------------------------------------PhysicalDistribute
---------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d.d_month_seq = date_dim.d_month_seq))otherCondition=()
-----------------------------------------------PhysicalProject
-------------------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------------------hashAgg[GLOBAL]
 ----------------------------------------------PhysicalDistribute
-------------------------------------------------PhysicalAssertNumRows
---------------------------------------------------PhysicalDistribute
-----------------------------------------------------hashAgg[GLOBAL]
-------------------------------------------------------PhysicalDistribute
---------------------------------------------------------hashAgg[LOCAL]
-----------------------------------------------------------PhysicalProject
-------------------------------------------------------------filter((date_dim.d_moy
 = 3) and (date_dim.d_year = 2002))
---------------------------------------------------------------PhysicalOlapScan[date_dim]
---------------------------------------PhysicalDistribute
+------------------------------------------------hashAgg[LOCAL]
+--------------------------------------------------PhysicalProject
+----------------------------------------------------filter((date_dim.d_moy = 
3) and (date_dim.d_year = 2002))
+------------------------------------------------------PhysicalOlapScan[date_dim]
+----------------------------PhysicalDistribute
+------------------------------hashJoin[INNER_JOIN] 
hashCondition=((j.i_category = 
i.i_category))otherCondition=((cast(i_current_price as DECIMALV3(38, 5)) > (1.2 
* avg(cast(i_current_price as DECIMALV3(9, 4))))))
+--------------------------------PhysicalProject
+----------------------------------PhysicalOlapScan[item]
+--------------------------------PhysicalDistribute
+----------------------------------hashAgg[GLOBAL]
+------------------------------------PhysicalDistribute
+--------------------------------------hashAgg[LOCAL]
 ----------------------------------------PhysicalProject
 ------------------------------------------PhysicalOlapScan[item]
-----------------------------------PhysicalDistribute
-------------------------------------hashAgg[GLOBAL]
---------------------------------------PhysicalDistribute
-----------------------------------------hashAgg[LOCAL]
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[item]
+----------------------PhysicalDistribute
+------------------------PhysicalProject
+--------------------------hashJoin[INNER_JOIN] hashCondition=((a.ca_address_sk 
= c.c_current_addr_sk))otherCondition=()
 ----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[customer]
-----------------------PhysicalDistribute
-------------------------PhysicalProject
---------------------------PhysicalOlapScan[customer_address]
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[customer_address]
 
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query61.out 
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query61.out
index 7d61c9ee51a..952a849fa0d 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query61.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query61.out
@@ -49,35 +49,34 @@ PhysicalResultSink
 --------------PhysicalDistribute
 ----------------hashAgg[LOCAL]
 ------------------PhysicalProject
---------------------hashJoin[INNER_JOIN] 
hashCondition=((customer_address.ca_address_sk = 
customer.c_current_addr_sk))otherCondition=()
-----------------------PhysicalDistribute
-------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_customer_sk = 
customer.c_customer_sk))otherCondition=()
-----------------------------PhysicalDistribute
-------------------------------PhysicalProject
---------------------------------PhysicalOlapScan[customer]
-----------------------------PhysicalDistribute
-------------------------------PhysicalProject
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_store_sk = store.s_store_sk))otherCondition=()
+--------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_store_sk = store.s_store_sk))otherCondition=()
+----------------------PhysicalProject
+------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_customer_sk = 
customer.c_customer_sk))otherCondition=()
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_item_sk = item.i_item_sk))otherCondition=()
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
 ----------------------------------PhysicalProject
-------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_item_sk = item.i_item_sk))otherCondition=()
---------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
-----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[store_sales]
-----------------------------------------PhysicalDistribute
-------------------------------------------PhysicalProject
---------------------------------------------filter((date_dim.d_moy = 12) and 
(date_dim.d_year = 2000))
-----------------------------------------------PhysicalOlapScan[date_dim]
---------------------------------------PhysicalDistribute
-----------------------------------------PhysicalProject
-------------------------------------------filter((item.i_category = 'Home'))
---------------------------------------------PhysicalOlapScan[item]
+------------------------------------PhysicalOlapScan[store_sales]
 ----------------------------------PhysicalDistribute
 ------------------------------------PhysicalProject
---------------------------------------filter((store.s_gmt_offset = -7.00))
-----------------------------------------PhysicalOlapScan[store]
+--------------------------------------filter((date_dim.d_moy = 12) and 
(date_dim.d_year = 2000))
+----------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------PhysicalDistribute
+----------------------------------PhysicalProject
+------------------------------------filter((item.i_category = 'Home'))
+--------------------------------------PhysicalOlapScan[item]
+--------------------------PhysicalDistribute
+----------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer_address.ca_address_sk = 
customer.c_current_addr_sk))otherCondition=()
+------------------------------PhysicalDistribute
+--------------------------------PhysicalProject
+----------------------------------PhysicalOlapScan[customer]
+------------------------------PhysicalDistribute
+--------------------------------PhysicalProject
+----------------------------------filter((customer_address.ca_gmt_offset = 
-7.00))
+------------------------------------PhysicalOlapScan[customer_address]
 ----------------------PhysicalDistribute
 ------------------------PhysicalProject
---------------------------filter((customer_address.ca_gmt_offset = -7.00))
-----------------------------PhysicalOlapScan[customer_address]
+--------------------------filter((store.s_gmt_offset = -7.00))
+----------------------------PhysicalOlapScan[store]
 
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query17.out 
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query17.out
index 07d153a378c..7d073ac5f47 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query17.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query17.out
@@ -9,42 +9,41 @@ PhysicalResultSink
 ------------PhysicalDistribute
 --------------hashAgg[LOCAL]
 ----------------PhysicalProject
-------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = d3.d_date_sk))otherCondition=()
---------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_customer_sk = 
catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = 
catalog_sales.cs_item_sk))otherCondition=()
-------------------------PhysicalDistribute
+------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_customer_sk = 
catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = 
catalog_sales.cs_item_sk))otherCondition=()
+--------------------PhysicalDistribute
+----------------------PhysicalProject
+------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = d3.d_date_sk))otherCondition=()
 --------------------------PhysicalProject
 ----------------------------PhysicalOlapScan[catalog_sales]
-------------------------PhysicalDistribute
---------------------------hashJoin[INNER_JOIN] 
hashCondition=((store.s_store_sk = store_sales.ss_store_sk))otherCondition=()
+--------------------------PhysicalDistribute
 ----------------------------PhysicalProject
-------------------------------hashJoin[INNER_JOIN] 
hashCondition=((item.i_item_sk = store_sales.ss_item_sk))otherCondition=()
---------------------------------PhysicalDistribute
-----------------------------------PhysicalProject
-------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
+------------------------------filter(d_quarter_name IN ('2001Q1', '2001Q2', 
'2001Q3'))
+--------------------------------PhysicalOlapScan[date_dim]
+--------------------PhysicalDistribute
+----------------------PhysicalProject
+------------------------hashJoin[INNER_JOIN] hashCondition=((store.s_store_sk 
= store_sales.ss_store_sk))otherCondition=()
+--------------------------hashJoin[INNER_JOIN] hashCondition=((item.i_item_sk 
= store_sales.ss_item_sk))otherCondition=()
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------hashJoin[INNER_JOIN] 
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=()
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
+------------------------------------PhysicalProject
+--------------------------------------PhysicalOlapScan[store_sales]
+------------------------------------PhysicalDistribute
+--------------------------------------PhysicalProject
+----------------------------------------filter((d1.d_quarter_name = '2001Q1'))
+------------------------------------------PhysicalOlapScan[date_dim]
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
+------------------------------------PhysicalProject
+--------------------------------------PhysicalOlapScan[store_returns]
+------------------------------------PhysicalDistribute
 --------------------------------------PhysicalProject
-----------------------------------------hashJoin[INNER_JOIN] 
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=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[store_returns]
-------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
---------------------------------------------PhysicalProject
-----------------------------------------------PhysicalOlapScan[store_sales]
---------------------------------------------PhysicalDistribute
-----------------------------------------------PhysicalProject
-------------------------------------------------filter((d1.d_quarter_name = 
'2001Q1'))
---------------------------------------------------PhysicalOlapScan[date_dim]
---------------------------------------PhysicalDistribute
-----------------------------------------PhysicalProject
-------------------------------------------filter(d_quarter_name IN ('2001Q1', 
'2001Q2', '2001Q3'))
---------------------------------------------PhysicalOlapScan[date_dim]
---------------------------------PhysicalDistribute
-----------------------------------PhysicalProject
-------------------------------------PhysicalOlapScan[item]
+----------------------------------------filter(d_quarter_name IN ('2001Q1', 
'2001Q2', '2001Q3'))
+------------------------------------------PhysicalOlapScan[date_dim]
 ----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
---------------------------------PhysicalOlapScan[store]
---------------------PhysicalDistribute
-----------------------PhysicalProject
-------------------------filter(d_quarter_name IN ('2001Q1', '2001Q2', 
'2001Q3'))
---------------------------PhysicalOlapScan[date_dim]
+--------------------------------PhysicalOlapScan[item]
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------PhysicalOlapScan[store]
 
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query18.out 
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query18.out
index 77e1ffc5f9a..212241e2d63 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query18.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query18.out
@@ -15,35 +15,36 @@ PhysicalResultSink
 ------------------------PhysicalOlapScan[item]
 ----------------------PhysicalDistribute
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_cdemo_sk = cd2.cd_demo_sk))otherCondition=()
-----------------------------PhysicalDistribute
-------------------------------PhysicalProject
---------------------------------PhysicalOlapScan[customer_demographics]
-----------------------------PhysicalDistribute
-------------------------------PhysicalProject
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
+--------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = 
date_dim.d_date_sk))otherCondition=()
+----------------------------PhysicalProject
+------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_bill_customer_sk = 
customer.c_customer_sk))otherCondition=()
+--------------------------------PhysicalDistribute
 ----------------------------------PhysicalProject
 ------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_bill_cdemo_sk = 
cd1.cd_demo_sk))otherCondition=()
 --------------------------------------PhysicalProject
-----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_bill_customer_sk = 
customer.c_customer_sk))otherCondition=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[catalog_sales]
-------------------------------------------PhysicalDistribute
---------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=()
-----------------------------------------------PhysicalDistribute
-------------------------------------------------PhysicalProject
---------------------------------------------------filter(c_birth_month IN (1, 
10, 2, 4, 7, 8))
-----------------------------------------------------PhysicalOlapScan[customer]
-----------------------------------------------PhysicalDistribute
-------------------------------------------------PhysicalProject
---------------------------------------------------filter(ca_state IN ('GA', 
'IN', 'ME', 'NC', 'OK', 'WA', 'WY'))
-----------------------------------------------------PhysicalOlapScan[customer_address]
+----------------------------------------PhysicalOlapScan[catalog_sales]
 --------------------------------------PhysicalDistribute
 ----------------------------------------PhysicalProject
 ------------------------------------------filter((cd1.cd_education_status = 
'Advanced Degree') and (cd1.cd_gender = 'F'))
 
--------------------------------------------PhysicalOlapScan[customer_demographics]
-----------------------------------PhysicalDistribute
-------------------------------------PhysicalProject
---------------------------------------filter((date_dim.d_year = 1998))
-----------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------PhysicalDistribute
+----------------------------------PhysicalProject
+------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_cdemo_sk = cd2.cd_demo_sk))otherCondition=()
+--------------------------------------PhysicalDistribute
+----------------------------------------PhysicalProject
+------------------------------------------PhysicalOlapScan[customer_demographics]
+--------------------------------------PhysicalDistribute
+----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=()
+------------------------------------------PhysicalDistribute
+--------------------------------------------PhysicalProject
+----------------------------------------------filter(c_birth_month IN (1, 10, 
2, 4, 7, 8))
+------------------------------------------------PhysicalOlapScan[customer]
+------------------------------------------PhysicalDistribute
+--------------------------------------------PhysicalProject
+----------------------------------------------filter(ca_state IN ('GA', 'IN', 
'ME', 'NC', 'OK', 'WA', 'WY'))
+------------------------------------------------PhysicalOlapScan[customer_address]
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------filter((date_dim.d_year = 1998))
+----------------------------------PhysicalOlapScan[date_dim]
 
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query24.out 
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query24.out
index 7e73cccbde8..4e894ab30ae 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query24.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query24.out
@@ -11,23 +11,24 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
 ----------------PhysicalDistribute
 ------------------PhysicalProject
 --------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_item_sk = item.i_item_sk))otherCondition=()
-----------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = customer_address.ca_address_sk) 
and (store.s_zip = customer_address.ca_zip))otherCondition=(( not 
(c_birth_country = upper(ca_country))))
-------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_customer_sk = 
customer.c_customer_sk))otherCondition=()
-----------------------------PhysicalDistribute
-------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_store_sk = store.s_store_sk))otherCondition=()
+----------------------hashJoin[INNER_JOIN] hashCondition=((store.s_zip = 
customer_address.ca_zip) and (store_sales.ss_customer_sk = 
customer.c_customer_sk))otherCondition=()
+------------------------PhysicalDistribute
+--------------------------PhysicalProject
+----------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_sales.ss_store_sk = store.s_store_sk))otherCondition=()
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[store_sales]
+------------------------------PhysicalDistribute
 --------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[store_sales]
---------------------------------PhysicalDistribute
-----------------------------------PhysicalProject
-------------------------------------filter((store.s_market_id = 8))
---------------------------------------PhysicalOlapScan[store]
+----------------------------------filter((store.s_market_id = 8))
+------------------------------------PhysicalOlapScan[store]
+------------------------PhysicalDistribute
+--------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_current_addr_sk = 
customer_address.ca_address_sk))otherCondition=(( not (c_birth_country = 
upper(ca_country))))
 ----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[customer]
-------------------------PhysicalDistribute
---------------------------PhysicalProject
-----------------------------PhysicalOlapScan[customer_address]
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[customer_address]
 ----------------------PhysicalDistribute
 ------------------------PhysicalProject
 --------------------------PhysicalOlapScan[item]
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query25.out 
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query25.out
index 93bc1d64faf..742a1f10b6c 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query25.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query25.out
@@ -8,42 +8,41 @@ PhysicalResultSink
 ----------PhysicalDistribute
 ------------hashAgg[LOCAL]
 --------------PhysicalProject
-----------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = d3.d_date_sk))otherCondition=()
-------------------PhysicalProject
---------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_customer_sk = 
catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = 
catalog_sales.cs_item_sk))otherCondition=()
-----------------------PhysicalDistribute
+----------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_customer_sk = 
catalog_sales.cs_bill_customer_sk) and (store_returns.sr_item_sk = 
catalog_sales.cs_item_sk))otherCondition=()
+------------------PhysicalDistribute
+--------------------PhysicalProject
+----------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_sales.cs_sold_date_sk = d3.d_date_sk))otherCondition=()
 ------------------------PhysicalProject
 --------------------------PhysicalOlapScan[catalog_sales]
-----------------------PhysicalDistribute
-------------------------hashJoin[INNER_JOIN] hashCondition=((store.s_store_sk 
= store_sales.ss_store_sk))otherCondition=()
+------------------------PhysicalDistribute
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN] 
hashCondition=((item.i_item_sk = store_sales.ss_item_sk))otherCondition=()
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
-----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
+----------------------------filter((d3.d_moy <= 10) and (d3.d_moy >= 4) and 
(d3.d_year = 2000))
+------------------------------PhysicalOlapScan[date_dim]
+------------------PhysicalDistribute
+--------------------PhysicalProject
+----------------------hashJoin[INNER_JOIN] hashCondition=((store.s_store_sk = 
store_sales.ss_store_sk))otherCondition=()
+------------------------hashJoin[INNER_JOIN] hashCondition=((item.i_item_sk = 
store_sales.ss_item_sk))otherCondition=()
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------hashJoin[INNER_JOIN] 
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=()
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
+----------------------------------PhysicalProject
+------------------------------------PhysicalOlapScan[store_sales]
+----------------------------------PhysicalDistribute
+------------------------------------PhysicalProject
+--------------------------------------filter((d1.d_moy = 4) and (d1.d_year = 
2000))
+----------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
+----------------------------------PhysicalProject
+------------------------------------PhysicalOlapScan[store_returns]
+----------------------------------PhysicalDistribute
 ------------------------------------PhysicalProject
---------------------------------------hashJoin[INNER_JOIN] 
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=()
-----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[store_returns]
-----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[store_sales]
-------------------------------------------PhysicalDistribute
---------------------------------------------PhysicalProject
-----------------------------------------------filter((d1.d_moy = 4) and 
(d1.d_year = 2000))
-------------------------------------------------PhysicalOlapScan[date_dim]
-------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------filter((d2.d_moy <= 10) and (d2.d_moy 
>= 4) and (d2.d_year = 2000))
-------------------------------------------PhysicalOlapScan[date_dim]
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[item]
+--------------------------------------filter((d2.d_moy <= 10) and (d2.d_moy >= 
4) and (d2.d_year = 2000))
+----------------------------------------PhysicalOlapScan[date_dim]
 --------------------------PhysicalDistribute
 ----------------------------PhysicalProject
-------------------------------PhysicalOlapScan[store]
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------filter((d3.d_moy <= 10) and (d3.d_moy >= 4) and 
(d3.d_year = 2000))
-------------------------PhysicalOlapScan[date_dim]
+------------------------------PhysicalOlapScan[item]
+------------------------PhysicalDistribute
+--------------------------PhysicalProject
+----------------------------PhysicalOlapScan[store]
 
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query29.out 
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query29.out
index 39042f54138..77be3492437 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query29.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query29.out
@@ -15,29 +15,27 @@ PhysicalResultSink
 ------------------------PhysicalOlapScan[catalog_sales]
 ----------------------PhysicalDistribute
 ------------------------hashJoin[INNER_JOIN] hashCondition=((store.s_store_sk 
= store_sales.ss_store_sk))otherCondition=()
---------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN] 
hashCondition=((item.i_item_sk = store_sales.ss_item_sk))otherCondition=()
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
+--------------------------hashJoin[INNER_JOIN] hashCondition=((item.i_item_sk 
= store_sales.ss_item_sk))otherCondition=()
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------hashJoin[INNER_JOIN] 
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=()
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
+------------------------------------PhysicalProject
+--------------------------------------PhysicalOlapScan[store_sales]
+------------------------------------PhysicalDistribute
+--------------------------------------PhysicalProject
+----------------------------------------filter((d1.d_moy = 4) and (d1.d_year = 
1999))
+------------------------------------------PhysicalOlapScan[date_dim]
 ----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((store_returns.sr_returned_date_sk = 
d2.d_date_sk))otherCondition=()
 ------------------------------------PhysicalProject
---------------------------------------hashJoin[INNER_JOIN] 
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=()
-----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[store_returns]
-----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d1.d_date_sk = store_sales.ss_sold_date_sk))otherCondition=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[store_sales]
-------------------------------------------PhysicalDistribute
---------------------------------------------PhysicalProject
-----------------------------------------------filter((d1.d_moy = 4) and 
(d1.d_year = 1999))
-------------------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------------PhysicalOlapScan[store_returns]
 ------------------------------------PhysicalDistribute
 --------------------------------------PhysicalProject
 ----------------------------------------filter((d2.d_moy <= 7) and (d2.d_moy 
>= 4) and (d2.d_year = 1999))
 ------------------------------------------PhysicalOlapScan[date_dim]
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[item]
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[item]
 --------------------------PhysicalDistribute
 ----------------------------PhysicalProject
 ------------------------------PhysicalOlapScan[store]
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query6.out 
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query6.out
index 80cf4daa143..a7389bfaad8 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query6.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query6.out
@@ -19,35 +19,35 @@ PhysicalResultSink
 --------------------------------PhysicalOlapScan[customer]
 ----------------------------PhysicalDistribute
 ------------------------------PhysicalProject
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((j.i_category = 
i.i_category))otherCondition=((cast(i_current_price as DECIMALV3(38, 5)) > (1.2 
* avg(cast(i_current_price as DECIMALV3(9, 4))))))
-----------------------------------PhysicalProject
-------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((s.ss_item_sk = i.i_item_sk))otherCondition=()
---------------------------------------PhysicalDistribute
-----------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((s.ss_sold_date_sk = d.d_date_sk))otherCondition=()
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[store_sales]
-------------------------------------------PhysicalDistribute
---------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d.d_month_seq = date_dim.d_month_seq))otherCondition=()
-----------------------------------------------PhysicalProject
-------------------------------------------------PhysicalOlapScan[date_dim]
-----------------------------------------------PhysicalDistribute
-------------------------------------------------PhysicalAssertNumRows
---------------------------------------------------PhysicalDistribute
-----------------------------------------------------hashAgg[GLOBAL]
-------------------------------------------------------PhysicalDistribute
---------------------------------------------------------hashAgg[LOCAL]
-----------------------------------------------------------PhysicalProject
-------------------------------------------------------------filter((date_dim.d_moy
 = 3) and (date_dim.d_year = 2002))
---------------------------------------------------------------PhysicalOlapScan[date_dim]
---------------------------------------PhysicalDistribute
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((s.ss_item_sk = i.i_item_sk))otherCondition=()
+----------------------------------PhysicalDistribute
+------------------------------------PhysicalProject
+--------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((s.ss_sold_date_sk = d.d_date_sk))otherCondition=()
 ----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[item]
+------------------------------------------PhysicalOlapScan[store_sales]
+----------------------------------------PhysicalDistribute
+------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((d.d_month_seq = date_dim.d_month_seq))otherCondition=()
+--------------------------------------------PhysicalProject
+----------------------------------------------PhysicalOlapScan[date_dim]
+--------------------------------------------PhysicalDistribute
+----------------------------------------------PhysicalAssertNumRows
+------------------------------------------------PhysicalDistribute
+--------------------------------------------------hashAgg[GLOBAL]
+----------------------------------------------------PhysicalDistribute
+------------------------------------------------------hashAgg[LOCAL]
+--------------------------------------------------------PhysicalProject
+----------------------------------------------------------filter((date_dim.d_moy
 = 3) and (date_dim.d_year = 2002))
+------------------------------------------------------------PhysicalOlapScan[date_dim]
 ----------------------------------PhysicalDistribute
-------------------------------------hashAgg[GLOBAL]
+------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((j.i_category = 
i.i_category))otherCondition=((cast(i_current_price as DECIMALV3(38, 5)) > (1.2 
* avg(cast(i_current_price as DECIMALV3(9, 4))))))
+--------------------------------------PhysicalProject
+----------------------------------------PhysicalOlapScan[item]
 --------------------------------------PhysicalDistribute
-----------------------------------------hashAgg[LOCAL]
-------------------------------------------PhysicalProject
---------------------------------------------PhysicalOlapScan[item]
+----------------------------------------hashAgg[GLOBAL]
+------------------------------------------PhysicalDistribute
+--------------------------------------------hashAgg[LOCAL]
+----------------------------------------------PhysicalProject
+------------------------------------------------PhysicalOlapScan[item]
 ----------------------PhysicalDistribute
 ------------------------PhysicalProject
 --------------------------PhysicalOlapScan[customer_address]
diff --git 
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query91.out 
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query91.out
index 7a9fdaaf587..6f2dd12ca91 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query91.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query91.out
@@ -9,37 +9,39 @@ PhysicalResultSink
 ------------PhysicalDistribute
 --------------hashAgg[LOCAL]
 ----------------PhysicalProject
-------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_returns.cr_call_center_sk = 
call_center.cc_call_center_sk))otherCondition=()
+------------------hashJoin[INNER_JOIN] 
hashCondition=((customer_address.ca_address_sk = 
customer.c_current_addr_sk))otherCondition=()
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_returns.cr_returned_date_sk = 
date_dim.d_date_sk))otherCondition=()
-------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_returns.cr_returning_customer_sk = 
customer.c_customer_sk))otherCondition=()
-----------------------------PhysicalProject
-------------------------------PhysicalOlapScan[catalog_returns]
-----------------------------PhysicalDistribute
-------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer_address.ca_address_sk = 
customer.c_current_addr_sk))otherCondition=()
+----------------------filter((customer_address.ca_gmt_offset = -6.00))
+------------------------PhysicalOlapScan[customer_address]
+--------------------PhysicalDistribute
+----------------------PhysicalProject
+------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_returns.cr_call_center_sk = 
call_center.cc_call_center_sk))otherCondition=()
+--------------------------PhysicalProject
+----------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_returns.cr_returning_customer_sk = 
customer.c_customer_sk))otherCondition=()
+------------------------------PhysicalDistribute
 --------------------------------PhysicalProject
-----------------------------------filter((customer_address.ca_gmt_offset = 
-6.00))
-------------------------------------PhysicalOlapScan[customer_address]
---------------------------------PhysicalDistribute
-----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((household_demographics.hd_demo_sk = 
customer.c_current_hdemo_sk))otherCondition=()
-------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer_demographics.cd_demo_sk = 
customer.c_current_cdemo_sk))otherCondition=()
---------------------------------------PhysicalDistribute
-----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[customer]
---------------------------------------PhysicalDistribute
-----------------------------------------PhysicalProject
-------------------------------------------filter((((customer_demographics.cd_marital_status
 = 'M') AND (customer_demographics.cd_education_status = 'Unknown')) OR 
((customer_demographics.cd_marital_status = 'W') AND 
(customer_demographics.cd_education_status = 'Advanced Degree'))))
---------------------------------------------PhysicalOlapScan[customer_demographics]
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((catalog_returns.cr_returned_date_sk = 
date_dim.d_date_sk))otherCondition=()
+------------------------------------PhysicalProject
+--------------------------------------PhysicalOlapScan[catalog_returns]
 ------------------------------------PhysicalDistribute
 --------------------------------------PhysicalProject
-----------------------------------------filter((hd_buy_potential like 
'1001-5000%'))
-------------------------------------------PhysicalOlapScan[household_demographics]
-------------------------PhysicalDistribute
---------------------------PhysicalProject
-----------------------------filter((date_dim.d_moy = 11) and (date_dim.d_year 
= 2001))
-------------------------------PhysicalOlapScan[date_dim]
---------------------PhysicalDistribute
-----------------------PhysicalProject
-------------------------PhysicalOlapScan[call_center]
+----------------------------------------filter((date_dim.d_moy = 11) and 
(date_dim.d_year = 2001))
+------------------------------------------PhysicalOlapScan[date_dim]
+------------------------------PhysicalDistribute
+--------------------------------hashJoin[INNER_JOIN] 
hashCondition=((household_demographics.hd_demo_sk = 
customer.c_current_hdemo_sk))otherCondition=()
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer_demographics.cd_demo_sk = 
customer.c_current_cdemo_sk))otherCondition=()
+------------------------------------PhysicalDistribute
+--------------------------------------PhysicalProject
+----------------------------------------PhysicalOlapScan[customer]
+------------------------------------PhysicalDistribute
+--------------------------------------PhysicalProject
+----------------------------------------filter((((customer_demographics.cd_marital_status
 = 'M') AND (customer_demographics.cd_education_status = 'Unknown')) OR 
((customer_demographics.cd_marital_status = 'W') AND 
(customer_demographics.cd_education_status = 'Advanced Degree'))))
+------------------------------------------PhysicalOlapScan[customer_demographics]
+----------------------------------PhysicalDistribute
+------------------------------------PhysicalProject
+--------------------------------------filter((hd_buy_potential like 
'1001-5000%'))
+----------------------------------------PhysicalOlapScan[household_demographics]
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------PhysicalOlapScan[call_center]
 
diff --git a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q5.out 
b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q5.out
index 6a67fb0e890..c2d0e6a45c9 100644
--- a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q5.out
+++ b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q5.out
@@ -11,27 +11,27 @@ PhysicalResultSink
 ----------------hashJoin[INNER_JOIN] hashCondition=((customer.c_custkey = 
orders.o_custkey) and (customer.c_nationkey = 
supplier.s_nationkey))otherCondition=()
 ------------------PhysicalDistribute
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN] hashCondition=((lineitem.l_orderkey 
= orders.o_orderkey))otherCondition=()
+----------------------hashJoin[INNER_JOIN] hashCondition=((lineitem.l_suppkey 
= supplier.s_suppkey))otherCondition=()
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN] 
hashCondition=((lineitem.l_suppkey = supplier.s_suppkey))otherCondition=()
+--------------------------hashJoin[INNER_JOIN] 
hashCondition=((lineitem.l_orderkey = orders.o_orderkey))otherCondition=()
 ----------------------------PhysicalProject
 ------------------------------PhysicalOlapScan[lineitem]
+----------------------------PhysicalProject
+------------------------------filter((orders.o_orderdate < '1995-01-01') and 
(orders.o_orderdate >= '1994-01-01'))
+--------------------------------PhysicalOlapScan[orders]
+------------------------PhysicalDistribute
+--------------------------hashJoin[INNER_JOIN] 
hashCondition=((supplier.s_nationkey = nation.n_nationkey))otherCondition=()
+----------------------------PhysicalProject
+------------------------------PhysicalOlapScan[supplier]
 ----------------------------PhysicalDistribute
-------------------------------hashJoin[INNER_JOIN] 
hashCondition=((supplier.s_nationkey = nation.n_nationkey))otherCondition=()
---------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[supplier]
+------------------------------hashJoin[INNER_JOIN] 
hashCondition=((nation.n_regionkey = region.r_regionkey))otherCondition=()
 --------------------------------PhysicalDistribute
-----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((nation.n_regionkey = region.r_regionkey))otherCondition=()
-------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------PhysicalOlapScan[nation]
-------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------filter((region.r_name = 'ASIA'))
-------------------------------------------PhysicalOlapScan[region]
-------------------------PhysicalProject
---------------------------filter((orders.o_orderdate < '1995-01-01') and 
(orders.o_orderdate >= '1994-01-01'))
-----------------------------PhysicalOlapScan[orders]
+----------------------------------PhysicalProject
+------------------------------------PhysicalOlapScan[nation]
+--------------------------------PhysicalDistribute
+----------------------------------PhysicalProject
+------------------------------------filter((region.r_name = 'ASIA'))
+--------------------------------------PhysicalOlapScan[region]
 ------------------PhysicalDistribute
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[customer]
diff --git a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q7.out 
b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q7.out
index 3b3e31a9df4..cb7089e7026 100644
--- a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q7.out
+++ b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q7.out
@@ -8,30 +8,32 @@ PhysicalResultSink
 ----------PhysicalDistribute
 ------------hashAgg[LOCAL]
 --------------PhysicalProject
-----------------hashJoin[INNER_JOIN] hashCondition=((customer.c_custkey = 
orders.o_custkey) and (customer.c_nationkey = n2.n_nationkey))otherCondition=()
+----------------hashJoin[INNER_JOIN] hashCondition=((orders.o_orderkey = 
lineitem.l_orderkey))otherCondition=((((n1.n_name = 'FRANCE') AND (n2.n_name = 
'GERMANY')) OR ((n1.n_name = 'GERMANY') AND (n2.n_name = 'FRANCE'))))
 ------------------PhysicalProject
---------------------PhysicalOlapScan[customer]
+--------------------hashJoin[INNER_JOIN] hashCondition=((supplier.s_suppkey = 
lineitem.l_suppkey))otherCondition=()
+----------------------PhysicalProject
+------------------------filter((lineitem.l_shipdate <= '1996-12-31') and 
(lineitem.l_shipdate >= '1995-01-01'))
+--------------------------PhysicalOlapScan[lineitem]
+----------------------PhysicalDistribute
+------------------------hashJoin[INNER_JOIN] 
hashCondition=((supplier.s_nationkey = n1.n_nationkey))otherCondition=()
+--------------------------PhysicalProject
+----------------------------PhysicalOlapScan[supplier]
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------filter(((n1.n_name = 'FRANCE') OR (n1.n_name = 
'GERMANY')))
+--------------------------------PhysicalOlapScan[nation]
 ------------------PhysicalDistribute
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN] hashCondition=((orders.o_orderkey = 
lineitem.l_orderkey))otherCondition=()
-------------------------PhysicalProject
---------------------------PhysicalOlapScan[orders]
-------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN] 
hashCondition=((supplier.s_suppkey = lineitem.l_suppkey))otherCondition=()
+----------------------hashJoin[INNER_JOIN] hashCondition=((customer.c_custkey 
= orders.o_custkey))otherCondition=()
+------------------------PhysicalDistribute
+--------------------------PhysicalProject
+----------------------------PhysicalOlapScan[orders]
+------------------------PhysicalDistribute
+--------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_nationkey = n2.n_nationkey))otherCondition=()
 ----------------------------PhysicalProject
-------------------------------filter((lineitem.l_shipdate <= '1996-12-31') and 
(lineitem.l_shipdate >= '1995-01-01'))
---------------------------------PhysicalOlapScan[lineitem]
+------------------------------PhysicalOlapScan[customer]
 ----------------------------PhysicalDistribute
-------------------------------hashJoin[INNER_JOIN] 
hashCondition=((supplier.s_nationkey = n1.n_nationkey))otherCondition=()
---------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[supplier]
---------------------------------PhysicalDistribute
-----------------------------------NestedLoopJoin[INNER_JOIN](((n1.n_name = 
'FRANCE') AND (n2.n_name = 'GERMANY')) OR ((n1.n_name = 'GERMANY') AND 
(n2.n_name = 'FRANCE')))
-------------------------------------PhysicalProject
---------------------------------------filter(((n1.n_name = 'FRANCE') OR 
(n1.n_name = 'GERMANY')))
-----------------------------------------PhysicalOlapScan[nation]
-------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------filter(((n2.n_name = 'GERMANY') OR 
(n2.n_name = 'FRANCE')))
-------------------------------------------PhysicalOlapScan[nation]
+------------------------------PhysicalProject
+--------------------------------filter(((n2.n_name = 'GERMANY') OR (n2.n_name 
= 'FRANCE')))
+----------------------------------PhysicalOlapScan[nation]
 
diff --git a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q8.out 
b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q8.out
index 176d1b64a65..280d78c129e 100644
--- a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q8.out
+++ b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q8.out
@@ -16,36 +16,35 @@ PhysicalResultSink
 --------------------------PhysicalOlapScan[supplier]
 ------------------------PhysicalDistribute
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN] 
hashCondition=((lineitem.l_orderkey = orders.o_orderkey))otherCondition=()
+----------------------------hashJoin[INNER_JOIN] 
hashCondition=((orders.o_custkey = customer.c_custkey))otherCondition=()
 ------------------------------PhysicalDistribute
 --------------------------------PhysicalProject
-----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((orders.o_custkey = customer.c_custkey))otherCondition=()
-------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------filter((orders.o_orderdate <= 
'1996-12-31') and (orders.o_orderdate >= '1995-01-01'))
-------------------------------------------PhysicalOlapScan[orders]
-------------------------------------PhysicalDistribute
---------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_nationkey = n1.n_nationkey))otherCondition=()
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((lineitem.l_orderkey = orders.o_orderkey))otherCondition=()
+------------------------------------PhysicalProject
+--------------------------------------filter((orders.o_orderdate <= 
'1996-12-31') and (orders.o_orderdate >= '1995-01-01'))
+----------------------------------------PhysicalOlapScan[orders]
+------------------------------------PhysicalProject
+--------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((part.p_partkey = lineitem.l_partkey))otherCondition=()
 ----------------------------------------PhysicalProject
-------------------------------------------PhysicalOlapScan[customer]
+------------------------------------------PhysicalOlapScan[lineitem]
 ----------------------------------------PhysicalDistribute
-------------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((n1.n_regionkey = region.r_regionkey))otherCondition=()
---------------------------------------------PhysicalDistribute
-----------------------------------------------PhysicalProject
-------------------------------------------------PhysicalOlapScan[nation]
---------------------------------------------PhysicalDistribute
-----------------------------------------------PhysicalProject
-------------------------------------------------filter((region.r_name = 
'AMERICA'))
---------------------------------------------------PhysicalOlapScan[region]
+------------------------------------------PhysicalProject
+--------------------------------------------filter((part.p_type = 'ECONOMY 
ANODIZED STEEL'))
+----------------------------------------------PhysicalOlapScan[part]
 ------------------------------PhysicalDistribute
 --------------------------------PhysicalProject
-----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((part.p_partkey = lineitem.l_partkey))otherCondition=()
+----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((customer.c_nationkey = n1.n_nationkey))otherCondition=()
 ------------------------------------PhysicalProject
---------------------------------------PhysicalOlapScan[lineitem]
+--------------------------------------PhysicalOlapScan[customer]
 ------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------filter((part.p_type = 'ECONOMY 
ANODIZED STEEL'))
-------------------------------------------PhysicalOlapScan[part]
+--------------------------------------hashJoin[INNER_JOIN] 
hashCondition=((n1.n_regionkey = region.r_regionkey))otherCondition=()
+----------------------------------------PhysicalDistribute
+------------------------------------------PhysicalProject
+--------------------------------------------PhysicalOlapScan[nation]
+----------------------------------------PhysicalDistribute
+------------------------------------------PhysicalProject
+--------------------------------------------filter((region.r_name = 'AMERICA'))
+----------------------------------------------PhysicalOlapScan[region]
 --------------------PhysicalDistribute
 ----------------------PhysicalProject
 ------------------------PhysicalOlapScan[nation]
diff --git a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q9.out 
b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q9.out
index 3f330af3959..c4db8fac693 100644
--- a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q9.out
+++ b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q9.out
@@ -9,31 +9,29 @@ PhysicalResultSink
 ------------hashAgg[LOCAL]
 --------------PhysicalProject
 ----------------hashJoin[INNER_JOIN] hashCondition=((partsupp.ps_partkey = 
lineitem.l_partkey) and (partsupp.ps_suppkey = 
lineitem.l_suppkey))otherCondition=()
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN] hashCondition=((orders.o_orderkey = 
lineitem.l_orderkey))otherCondition=()
-------------------------PhysicalProject
---------------------------PhysicalOlapScan[orders]
-------------------------PhysicalDistribute
+------------------PhysicalProject
+--------------------hashJoin[INNER_JOIN] hashCondition=((supplier.s_suppkey = 
lineitem.l_suppkey))otherCondition=()
+----------------------PhysicalDistribute
+------------------------hashJoin[INNER_JOIN] hashCondition=((orders.o_orderkey 
= lineitem.l_orderkey))otherCondition=()
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN] 
hashCondition=((supplier.s_suppkey = lineitem.l_suppkey))otherCondition=()
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
-----------------------------------hashJoin[INNER_JOIN] 
hashCondition=((part.p_partkey = lineitem.l_partkey))otherCondition=()
-------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------PhysicalOlapScan[lineitem]
-------------------------------------PhysicalDistribute
---------------------------------------PhysicalProject
-----------------------------------------filter((p_name like '%green%'))
-------------------------------------------PhysicalOlapScan[part]
-------------------------------PhysicalDistribute
---------------------------------hashJoin[INNER_JOIN] 
hashCondition=((supplier.s_nationkey = nation.n_nationkey))otherCondition=()
+----------------------------PhysicalOlapScan[orders]
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------hashJoin[INNER_JOIN] 
hashCondition=((part.p_partkey = lineitem.l_partkey))otherCondition=()
+--------------------------------PhysicalDistribute
 ----------------------------------PhysicalProject
-------------------------------------PhysicalOlapScan[supplier]
-----------------------------------PhysicalDistribute
-------------------------------------PhysicalProject
---------------------------------------PhysicalOlapScan[nation]
+------------------------------------PhysicalOlapScan[lineitem]
+--------------------------------PhysicalDistribute
+----------------------------------PhysicalProject
+------------------------------------filter((p_name like '%green%'))
+--------------------------------------PhysicalOlapScan[part]
+----------------------PhysicalDistribute
+------------------------hashJoin[INNER_JOIN] 
hashCondition=((supplier.s_nationkey = nation.n_nationkey))otherCondition=()
+--------------------------PhysicalProject
+----------------------------PhysicalOlapScan[supplier]
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------PhysicalOlapScan[nation]
 ------------------PhysicalDistribute
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[partsupp]
diff --git 
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf17.groovy 
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf17.groovy
index bb61a205c3b..8b537ae1c47 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf17.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf17.groovy
@@ -97,5 +97,5 @@ limit 100;
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
 
-     
assertEquals("RF9[d_date_sk->[cs_sold_date_sk],RF7[sr_customer_sk->[cs_bill_customer_sk],RF8[sr_item_sk->[cs_item_sk],RF6[s_store_sk->[ss_store_sk],RF5[i_item_sk->[ss_item_sk],RF4[d_date_sk->[sr_returned_date_sk],RF1[ss_customer_sk->[sr_customer_sk],RF2[ss_item_sk->[sr_item_sk],RF3[ss_ticket_number->[sr_ticket_number],RF0[d_date_sk->[ss_sold_date_sk]",
 getRuntimeFilters(plan))
+     
assertEquals("RF8[sr_customer_sk->[cs_bill_customer_sk],RF9[sr_item_sk->[cs_item_sk],RF7[d_date_sk->[cs_sold_date_sk],RF6[s_store_sk->[ss_store_sk],RF5[i_item_sk->[ss_item_sk],RF2[sr_customer_sk->[ss_customer_sk],RF3[sr_item_sk->[ss_item_sk],RF4[sr_ticket_number->[ss_ticket_number],RF1[d_date_sk->[ss_sold_date_sk],RF0[d_date_sk->[sr_returned_date_sk]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf18.groovy 
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf18.groovy
index da219a0328a..157a11ed927 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf18.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf18.groovy
@@ -85,6 +85,6 @@ suite("ds_rf18") {
     // def outFile = 
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.18"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-    
-     
assertEquals("RF5[cs_item_sk->[i_item_sk],RF4[c_current_cdemo_sk->[cd_demo_sk],RF3[d_date_sk->[cs_sold_date_sk],RF2[cd_demo_sk->[cs_bill_cdemo_sk],RF1[c_customer_sk->[cs_bill_customer_sk],RF0[ca_address_sk->[c_current_addr_sk]",
 getRuntimeFilters(plan))
+
+     
assertEquals("RF5[cs_item_sk->[i_item_sk],RF4[d_date_sk->[cs_sold_date_sk],RF3[c_customer_sk->[cs_bill_customer_sk],RF2[cd_demo_sk->[cs_bill_cdemo_sk],RF1[c_current_cdemo_sk->[cd_demo_sk],RF0[ca_address_sk->[c_current_addr_sk]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf24.groovy 
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf24.groovy
index 5d34c892b05..b66787da27b 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf24.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf24.groovy
@@ -106,6 +106,6 @@ order by c_last_name
     // def outFile = 
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.24"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-    
-     
assertEquals("RF5[sr_item_sk->[ss_item_sk],RF6[sr_ticket_number->[ss_ticket_number],RF4[i_item_sk->[ss_item_sk],RF2[ca_zip->[s_zip],RF3[ca_address_sk->[c_current_addr_sk],RF1[c_customer_sk->[ss_customer_sk],RF0[s_store_sk->[ss_store_sk]",
 getRuntimeFilters(plan))
+
+     
assertEquals("RF5[sr_item_sk->[ss_item_sk],RF6[sr_ticket_number->[ss_ticket_number],RF4[i_item_sk->[ss_item_sk],RF2[ca_zip->[s_zip],RF3[c_customer_sk->[ss_customer_sk],RF1[s_store_sk->[ss_store_sk],RF0[ca_address_sk->[c_current_addr_sk]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf25.groovy 
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf25.groovy
index 75c228b8a24..c67775d7125 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf25.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf25.groovy
@@ -99,5 +99,5 @@ suite("ds_rf25") {
     // def outFile = 
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.25"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-     
assertEquals("RF9[d_date_sk->[cs_sold_date_sk],RF7[sr_customer_sk->[cs_bill_customer_sk],RF8[sr_item_sk->[cs_item_sk],RF6[s_store_sk->[ss_store_sk],RF5[i_item_sk->[ss_item_sk],RF4[d_date_sk->[sr_returned_date_sk],RF1[ss_customer_sk->[sr_customer_sk],RF2[ss_item_sk->[sr_item_sk],RF3[ss_ticket_number->[sr_ticket_number],RF0[d_date_sk->[ss_sold_date_sk]",
 getRuntimeFilters(plan))
+     
assertEquals("RF8[sr_customer_sk->[cs_bill_customer_sk],RF9[sr_item_sk->[cs_item_sk],RF7[d_date_sk->[cs_sold_date_sk],RF6[s_store_sk->[ss_store_sk],RF5[i_item_sk->[ss_item_sk],RF2[sr_customer_sk->[ss_customer_sk],RF3[sr_item_sk->[ss_item_sk],RF4[sr_ticket_number->[ss_ticket_number],RF1[d_date_sk->[ss_sold_date_sk],RF0[d_date_sk->[sr_returned_date_sk]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf29.groovy 
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf29.groovy
index 42a00e2fb0d..bea8af3bf04 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf29.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf29.groovy
@@ -98,5 +98,6 @@ suite("ds_rf29") {
     // def outFile = 
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.29"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-     
assertEquals("RF9[d_date_sk->[cs_sold_date_sk],RF7[sr_customer_sk->[cs_bill_customer_sk],RF8[sr_item_sk->[cs_item_sk],RF6[s_store_sk->[ss_store_sk],RF5[i_item_sk->[ss_item_sk],RF4[d_date_sk->[sr_returned_date_sk],RF1[ss_customer_sk->[sr_customer_sk],RF2[ss_item_sk->[sr_item_sk],RF3[ss_ticket_number->[sr_ticket_number],RF0[d_date_sk->[ss_sold_date_sk]",
 getRuntimeFilters(plan))
+
+     
assertEquals("RF9[d_date_sk->[cs_sold_date_sk],RF7[sr_customer_sk->[cs_bill_customer_sk],RF8[sr_item_sk->[cs_item_sk],RF6[s_store_sk->[ss_store_sk],RF5[i_item_sk->[ss_item_sk],RF2[sr_customer_sk->[ss_customer_sk],RF3[sr_item_sk->[ss_item_sk],RF4[sr_ticket_number->[ss_ticket_number],RF1[d_date_sk->[ss_sold_date_sk],RF0[d_date_sk->[sr_returned_date_sk]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf6.groovy 
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf6.groovy
index 914f2c1c01e..a5940e32f2a 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf6.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf6.groovy
@@ -77,6 +77,6 @@ suite("ds_rf6") {
     // def outFile = 
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.6"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-    
-     
assertEquals("RF5[ca_address_sk->[c_current_addr_sk],RF4[ss_customer_sk->[c_customer_sk],RF3[i_category->[i_category],RF2[i_item_sk->[ss_item_sk],RF1[d_date_sk->[ss_sold_date_sk],RF0[d_month_seq->[d_month_seq]",
 getRuntimeFilters(plan))
+
+     
assertEquals("RF5[ca_address_sk->[c_current_addr_sk],RF4[ss_customer_sk->[c_customer_sk],RF3[i_item_sk->[ss_item_sk],RF2[d_date_sk->[ss_sold_date_sk],RF1[d_month_seq->[d_month_seq],RF0[i_category->[i_category]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf91.groovy 
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf91.groovy
index d8c9df4b044..2ad1abb7c2c 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf91.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf91.groovy
@@ -82,6 +82,6 @@ order by sum(cr_net_loss) desc;
     // def outFile = 
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.91"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-    
-     
assertEquals("RF5[cc_call_center_sk->[cr_call_center_sk],RF4[d_date_sk->[cr_returned_date_sk],RF3[c_customer_sk->[cr_returning_customer_sk],RF2[c_current_addr_sk->[ca_address_sk],RF1[hd_demo_sk->[c_current_hdemo_sk],RF0[cd_demo_sk->[c_current_cdemo_sk]",
 getRuntimeFilters(plan))
+
+     
assertEquals("RF5[c_current_addr_sk->[ca_address_sk],RF4[cc_call_center_sk->[cr_call_center_sk],RF3[c_customer_sk->[cr_returning_customer_sk],RF2[d_date_sk->[cr_returned_date_sk],RF1[hd_demo_sk->[c_current_hdemo_sk],RF0[cd_demo_sk->[c_current_cdemo_sk]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf5.groovy 
b/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf5.groovy
index dabcb2b481b..7972f45010e 100644
--- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf5.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf5.groovy
@@ -94,6 +94,6 @@ order by
     }
     // def outFile = 
"regression-test/suites/nereids_tpch_shape_sf1000_p0/ddl/rf/rf.5"
     // File file = new File(outFile)
-    // file.write(getRuntimeFilters(plan))
-    
assertEquals("RF4[c_nationkey->[s_nationkey],RF5[c_custkey->[o_custkey],RF3[o_orderkey->[l_orderkey],RF2[s_suppkey->[l_suppkey],RF1[n_nationkey->[s_nationkey],RF0[r_regionkey->[n_regionkey]",
 getRuntimeFilters(plan))
+
+    
assertEquals("RF4[c_nationkey->[s_nationkey],RF5[c_custkey->[o_custkey],RF3[s_suppkey->[l_suppkey],RF2[o_orderkey->[l_orderkey],RF1[n_nationkey->[s_nationkey],RF0[r_regionkey->[n_regionkey]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf7.groovy 
b/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf7.groovy
index 02a6d4f8571..b602c986f83 100644
--- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf7.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf7.groovy
@@ -109,5 +109,6 @@ order by
     // def outFile = 
"regression-test/suites/nereids_tpch_shape_sf1000_p0/ddl/rf/rf.7"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-    
assertEquals("RF3[n_nationkey->[c_nationkey],RF4[o_custkey->[c_custkey],RF2[l_orderkey->[o_orderkey],RF1[s_suppkey->[l_suppkey],RF0[n_nationkey->[s_nationkey]",
 getRuntimeFilters(plan))
+
+    
assertEquals("RF4[o_orderkey->[l_orderkey],RF3[s_suppkey->[l_suppkey],RF2[n_nationkey->[s_nationkey],RF1[c_custkey->[o_custkey],RF0[n_nationkey->[c_nationkey]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf8.groovy 
b/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf8.groovy
index f42a8a6e150..10027247a70 100644
--- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf8.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf8.groovy
@@ -108,5 +108,7 @@ order by
     // def outFile = 
"regression-test/suites/nereids_tpch_shape_sf1000_p0/ddl/rf/rf.8"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-    
assertEquals("RF6[n_nationkey->[s_nationkey],RF5[l_suppkey->[s_suppkey],RF4[l_orderkey->[o_orderkey],RF3[c_custkey->[o_custkey],RF2[n_nationkey->[c_nationkey],RF1[r_regionkey->[n_regionkey],RF0[p_partkey->[l_partkey]",
 getRuntimeFilters(plan))
+        // file.write(getRuntimeFilters(plan))
+
+    
assertEquals("RF6[n_nationkey->[s_nationkey],RF5[l_suppkey->[s_suppkey],RF4[c_custkey->[o_custkey],RF3[l_orderkey->[o_orderkey],RF2[p_partkey->[l_partkey],RF1[n_nationkey->[c_nationkey],RF0[r_regionkey->[n_regionkey]",
 getRuntimeFilters(plan))
 }
diff --git 
a/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf9.groovy 
b/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf9.groovy
index 856eda2aed5..913687fe84a 100644
--- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf9.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/rf/h_rf9.groovy
@@ -103,5 +103,6 @@ order by
     // def outFile = 
"regression-test/suites/nereids_tpch_shape_sf1000_p0/ddl/rf/rf.9"
     // File file = new File(outFile)
     // file.write(getRuntimeFilters(plan))
-    
assertEquals("RF4[ps_suppkey->[l_suppkey],RF5[ps_partkey->[l_partkey],RF3[l_orderkey->[o_orderkey],RF2[s_suppkey->[l_suppkey],RF1[p_partkey->[l_partkey],RF0[n_nationkey->[s_nationkey]",
 getRuntimeFilters(plan))
+
+    
assertEquals("RF4[ps_suppkey->[l_suppkey],RF5[ps_partkey->[l_partkey],RF3[s_suppkey->[l_suppkey],RF2[l_orderkey->[o_orderkey],RF1[p_partkey->[l_partkey],RF0[n_nationkey->[s_nationkey]",
 getRuntimeFilters(plan))
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to