diff --git a/regression-test/data/nereids_hint_tpcds_p0/shape/query21.out b/regression-test/data/nereids_hint_tpcds_p0/shape/query21.out
index 2076a345643b222..50515df29069f26 100644
--- a/regression-test/data/nereids_hint_tpcds_p0/shape/query21.out
+++ b/regression-test/data/nereids_hint_tpcds_p0/shape/query21.out
@@ -19,7 +19,7 @@ PhysicalResultSink
 ------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 --------------------------------PhysicalOlapScan[item]
 ------------------------PhysicalProject
---------------------------filter((date_dim.d_date <= '1999-07-22') and (date_dim.d_date >= '1999-05-23'))
+--------------------------filter((date_dim.d_date = '1999-05-23'))
 ----------------------------PhysicalOlapScan[date_dim]
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[warehouse]
diff --git a/regression-test/data/nereids_hint_tpcds_p0/shape/query40.out b/regression-test/data/nereids_hint_tpcds_p0/shape/query40.out
index b8219c68f1fe8b5..04e0789bf8a35ee 100644
--- a/regression-test/data/nereids_hint_tpcds_p0/shape/query40.out
+++ b/regression-test/data/nereids_hint_tpcds_p0/shape/query40.out
@@ -23,7 +23,7 @@ PhysicalResultSink
 --------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 ----------------------------------PhysicalOlapScan[item]
 --------------------------PhysicalProject
-----------------------------filter((date_dim.d_date <= '2001-06-01') and (date_dim.d_date >= '2001-04-02'))
+----------------------------filter((date_dim.d_date = '2001-04-02'))
 ------------------------------PhysicalOlapScan[date_dim]
 ------------------PhysicalProject
 --------------------PhysicalOlapScan[warehouse]
diff --git a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query21.out b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query21.out
index f68b978b0b2ba63..2c44317371e8e13 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query21.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query21.out
@@ -11,16 +11,16 @@ PhysicalResultSink
 ----------------PhysicalProject
 ------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=() build RFs:RF2 w_warehouse_sk->[inv_warehouse_sk]
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk]
+----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk]
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk]
+--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk]
 ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 RF2
 ----------------------------PhysicalProject
-------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
---------------------------------PhysicalOlapScan[item]
+------------------------------filter((date_dim.d_date = '1999-05-23'))
+--------------------------------PhysicalOlapScan[date_dim]
 ------------------------PhysicalProject
---------------------------filter((date_dim.d_date <= '1999-07-22') and (date_dim.d_date >= '1999-05-23'))
-----------------------------PhysicalOlapScan[date_dim]
+--------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query40.out b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query40.out
index 041e5711184598a..61d2306286e7917 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query40.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query40.out
@@ -14,17 +14,17 @@ PhysicalResultSink
 ----------------------PhysicalProject
 ------------------------PhysicalOlapScan[catalog_returns] apply RFs: RF2 RF3
 ----------------------PhysicalProject
-------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[cs_sold_date_sk]
+------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[cs_item_sk]
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk]
+----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[cs_sold_date_sk]
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 RF4
 ------------------------------PhysicalProject
---------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
-----------------------------------PhysicalOlapScan[item]
+--------------------------------filter((date_dim.d_date = '2001-04-02'))
+----------------------------------PhysicalOlapScan[date_dim]
 --------------------------PhysicalProject
-----------------------------filter((date_dim.d_date <= '2001-06-01') and (date_dim.d_date >= '2001-04-02'))
-------------------------------PhysicalOlapScan[date_dim]
+----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+------------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
 --------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query21.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query21.out
index db506f0acaa0e9d..621490d6608ba73 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query21.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query21.out
@@ -21,6 +21,6 @@ PhysicalResultSink
 --------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 ----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
-----------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28'))
+----------------------filter((date_dim.d_date = '2002-01-28'))
 ------------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query40.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query40.out
index 1465471817388b4..a7af45b01ff19fc 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query40.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query40.out
@@ -25,6 +25,6 @@ PhysicalResultSink
 ------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 --------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
---------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03'))
+--------------------filter((date_dim.d_date = '2001-03-03'))
 ----------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query21.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query21.out
index 6a3b7ecf26ca2f7..8fe10ba628d5f59 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query21.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query21.out
@@ -21,6 +21,6 @@ PhysicalResultSink
 --------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 ----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
-----------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28'))
+----------------------filter((date_dim.d_date = '2002-01-28'))
 ------------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query40.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query40.out
index aae0d7885570451..1fa5c0aabf528df 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query40.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query40.out
@@ -25,6 +25,6 @@ PhysicalResultSink
 ------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 --------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
---------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03'))
+--------------------filter((date_dim.d_date = '2001-03-03'))
 ----------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query21.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query21.out
index 991b448adf9f0c9..6950418da2e44fd 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query21.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query21.out
@@ -11,16 +11,16 @@ PhysicalResultSink
 ----------------PhysicalProject
 ------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=()
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk]
+----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk]
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk]
+--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk]
 ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1
 ----------------------------PhysicalProject
-------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
---------------------------------PhysicalOlapScan[item]
+------------------------------filter((date_dim.d_date = '2002-01-28'))
+--------------------------------PhysicalOlapScan[date_dim]
 ------------------------PhysicalProject
---------------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28'))
-----------------------------PhysicalOlapScan[date_dim]
+--------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query40.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query40.out
index ade38048fb9732f..cc14224e1c7fe1b 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query40.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query40.out
@@ -14,17 +14,17 @@ PhysicalResultSink
 ----------------------PhysicalProject
 ------------------------PhysicalOlapScan[catalog_returns] apply RFs: RF2 RF3
 ----------------------PhysicalProject
-------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[cs_sold_date_sk]
+------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[cs_item_sk]
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk]
+----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[cs_sold_date_sk]
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1
 ------------------------------PhysicalProject
---------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
-----------------------------------PhysicalOlapScan[item]
+--------------------------------filter((date_dim.d_date = '2001-03-03'))
+----------------------------------PhysicalOlapScan[date_dim]
 --------------------------PhysicalProject
-----------------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03'))
-------------------------------PhysicalOlapScan[date_dim]
+----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+------------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
 --------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query21.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query21.out
index e80000c63531288..cb45325ac9e747a 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query21.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query21.out
@@ -11,16 +11,16 @@ PhysicalResultSink
 ----------------PhysicalProject
 ------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=() build RFs:RF2 w_warehouse_sk->[inv_warehouse_sk]
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk]
+----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk]
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk]
+--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk]
 ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 RF2
 ----------------------------PhysicalProject
-------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
---------------------------------PhysicalOlapScan[item]
+------------------------------filter((date_dim.d_date = '2002-01-28'))
+--------------------------------PhysicalOlapScan[date_dim]
 ------------------------PhysicalProject
---------------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28'))
-----------------------------PhysicalOlapScan[date_dim]
+--------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query40.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query40.out
index 5ff27658e2ed3ff..5c9d8fbfe4f88d4 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query40.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query40.out
@@ -14,17 +14,17 @@ PhysicalResultSink
 ----------------------PhysicalProject
 ------------------------PhysicalOlapScan[catalog_returns] apply RFs: RF2 RF3
 ----------------------PhysicalProject
-------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[cs_sold_date_sk]
+------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[cs_item_sk]
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk]
+----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[cs_sold_date_sk]
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 RF4
 ------------------------------PhysicalProject
---------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
-----------------------------------PhysicalOlapScan[item]
+--------------------------------filter((date_dim.d_date = '2001-03-03'))
+----------------------------------PhysicalOlapScan[date_dim]
 --------------------------PhysicalProject
-----------------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03'))
-------------------------------PhysicalOlapScan[date_dim]
+----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+------------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
 --------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query21.out b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query21.out
index 31448491385145b..47437f6e6cc6fb8 100644
--- a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query21.out
+++ b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query21.out
@@ -21,6 +21,6 @@ PhysicalResultSink
 --------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 ----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
-----------------------filter((date_dim.d_date <= '1999-04-19') and (date_dim.d_date >= '1999-02-18'))
+----------------------filter((date_dim.d_date = '1999-02-18'))
 ------------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query40.out b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query40.out
index 414f6e3e0bd2ed6..e7fac15753c030a 100644
--- a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query40.out
+++ b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query40.out
@@ -25,6 +25,6 @@ PhysicalResultSink
 ------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 --------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
---------------------filter((date_dim.d_date <= '2000-04-17') and (date_dim.d_date >= '2000-02-17'))
+--------------------filter((date_dim.d_date = '2000-02-17'))
 ----------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query21.out b/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query21.out
index db506f0acaa0e9d..621490d6608ba73 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query21.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query21.out
@@ -21,6 +21,6 @@ PhysicalResultSink
 --------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 ----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
-----------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28'))
+----------------------filter((date_dim.d_date = '2002-01-28'))
 ------------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query40.out b/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query40.out
index 1465471817388b4..a7af45b01ff19fc 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query40.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query40.out
@@ -25,6 +25,6 @@ PhysicalResultSink
 ------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 --------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
---------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03'))
+--------------------filter((date_dim.d_date = '2001-03-03'))
 ----------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query21.out b/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query21.out
index 6a3b7ecf26ca2f7..8fe10ba628d5f59 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query21.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query21.out
@@ -21,6 +21,6 @@ PhysicalResultSink
 --------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 ----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
-----------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28'))
+----------------------filter((date_dim.d_date = '2002-01-28'))
 ------------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query40.out b/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query40.out
index aae0d7885570451..1fa5c0aabf528df 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query40.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query40.out
@@ -25,6 +25,6 @@ PhysicalResultSink
 ------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
 --------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
---------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03'))
+--------------------filter((date_dim.d_date = '2001-03-03'))
 ----------------------PhysicalOlapScan[date_dim]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query21.out b/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query21.out
index 991b448adf9f0c9..6950418da2e44fd 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query21.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query21.out
@@ -11,16 +11,16 @@ PhysicalResultSink
 ----------------PhysicalProject
 ------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=()
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk]
+----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk]
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk]
+--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk]
 ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1
 ----------------------------PhysicalProject
-------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
---------------------------------PhysicalOlapScan[item]
+------------------------------filter((date_dim.d_date = '2002-01-28'))
+--------------------------------PhysicalOlapScan[date_dim]
 ------------------------PhysicalProject
---------------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28'))
-----------------------------PhysicalOlapScan[date_dim]
+--------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query40.out b/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query40.out
index ade38048fb9732f..cc14224e1c7fe1b 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query40.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query40.out
@@ -14,17 +14,17 @@ PhysicalResultSink
 ----------------------PhysicalProject
 ------------------------PhysicalOlapScan[catalog_returns] apply RFs: RF2 RF3
 ----------------------PhysicalProject
-------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[cs_sold_date_sk]
+------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[cs_item_sk]
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk]
+----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[cs_sold_date_sk]
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1
 ------------------------------PhysicalProject
---------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
-----------------------------------PhysicalOlapScan[item]
+--------------------------------filter((date_dim.d_date = '2001-03-03'))
+----------------------------------PhysicalOlapScan[date_dim]
 --------------------------PhysicalProject
-----------------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03'))
-------------------------------PhysicalOlapScan[date_dim]
+----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+------------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
 --------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query21.out b/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query21.out
index e80000c63531288..cb45325ac9e747a 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query21.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query21.out
@@ -11,16 +11,16 @@ PhysicalResultSink
 ----------------PhysicalProject
 ------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=() build RFs:RF2 w_warehouse_sk->[inv_warehouse_sk]
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk]
+----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk]
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk]
+--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk]
 ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 RF2
 ----------------------------PhysicalProject
-------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
---------------------------------PhysicalOlapScan[item]
+------------------------------filter((date_dim.d_date = '2002-01-28'))
+--------------------------------PhysicalOlapScan[date_dim]
 ------------------------PhysicalProject
---------------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28'))
-----------------------------PhysicalOlapScan[date_dim]
+--------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query40.out b/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query40.out
index 5ff27658e2ed3ff..5c9d8fbfe4f88d4 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query40.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query40.out
@@ -14,17 +14,17 @@ PhysicalResultSink
 ----------------------PhysicalProject
 ------------------------PhysicalOlapScan[catalog_returns] apply RFs: RF2 RF3
 ----------------------PhysicalProject
-------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[cs_sold_date_sk]
+------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[cs_item_sk]
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk]
+----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[cs_sold_date_sk]
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 RF4
 ------------------------------PhysicalProject
---------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
-----------------------------------PhysicalOlapScan[item]
+--------------------------------filter((date_dim.d_date = '2001-03-03'))
+----------------------------------PhysicalOlapScan[date_dim]
 --------------------------PhysicalProject
-----------------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03'))
-------------------------------PhysicalOlapScan[date_dim]
+----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+------------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
 --------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query21.out b/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query21.out
index f68b978b0b2ba63..2c44317371e8e13 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query21.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query21.out
@@ -11,16 +11,16 @@ PhysicalResultSink
 ----------------PhysicalProject
 ------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_warehouse_sk = warehouse.w_warehouse_sk)) otherCondition=() build RFs:RF2 w_warehouse_sk->[inv_warehouse_sk]
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk]
+----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk]
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk]
+--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk]
 ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 RF2
 ----------------------------PhysicalProject
-------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
---------------------------------PhysicalOlapScan[item]
+------------------------------filter((date_dim.d_date = '1999-05-23'))
+--------------------------------PhysicalOlapScan[date_dim]
 ------------------------PhysicalProject
---------------------------filter((date_dim.d_date <= '1999-07-22') and (date_dim.d_date >= '1999-05-23'))
-----------------------------PhysicalOlapScan[date_dim]
+--------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+----------------------------PhysicalOlapScan[item]
 --------------------PhysicalProject
 ----------------------PhysicalOlapScan[warehouse]
 
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query40.out b/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query40.out
index 041e5711184598a..61d2306286e7917 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query40.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query40.out
@@ -14,17 +14,17 @@ PhysicalResultSink
 ----------------------PhysicalProject
 ------------------------PhysicalOlapScan[catalog_returns] apply RFs: RF2 RF3
 ----------------------PhysicalProject
-------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[cs_sold_date_sk]
+------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[cs_item_sk]
 --------------------------PhysicalProject
-----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk]
+----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((catalog_sales.cs_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[cs_sold_date_sk]
 ------------------------------PhysicalProject
 --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 RF4
 ------------------------------PhysicalProject
---------------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
-----------------------------------PhysicalOlapScan[item]
+--------------------------------filter((date_dim.d_date = '2001-04-02'))
+----------------------------------PhysicalOlapScan[date_dim]
 --------------------------PhysicalProject
-----------------------------filter((date_dim.d_date <= '2001-06-01') and (date_dim.d_date >= '2001-04-02'))
-------------------------------PhysicalOlapScan[date_dim]
+----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99))
+------------------------------PhysicalOlapScan[item]
 ------------------PhysicalProject
 --------------------PhysicalOlapScan[warehouse]