From 7e35bf7a974a7b004b3f7a947c22525315d251de Mon Sep 17 00:00:00 2001 From: minghong Date: Wed, 25 Dec 2024 15:28:26 +0800 Subject: [PATCH 1/2] fix --- .../doris/nereids/trees/expressions/TimestampArithmetic.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/TimestampArithmetic.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/TimestampArithmetic.java index 737778a82d1d9c..40a727eb1757ba 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/TimestampArithmetic.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/TimestampArithmetic.java @@ -160,6 +160,7 @@ public boolean equals(Object o) { } TimestampArithmetic other = (TimestampArithmetic) o; return Objects.equals(funcName, other.funcName) && Objects.equals(timeUnit, other.timeUnit) + && op.equals(other.op) && Objects.equals(left(), other.left()) && Objects.equals(right(), other.right()); } } From a807052cb17cd6b2281fe732d9ea3161face1026 Mon Sep 17 00:00:00 2001 From: minghong Date: Sat, 4 Jan 2025 07:35:29 +0800 Subject: [PATCH 2/2] refresh shape ds21/ds40 --- .../data/nereids_hint_tpcds_p0/shape/query21.out | 2 +- .../data/nereids_hint_tpcds_p0/shape/query40.out | 2 +- .../nereids_tpcds_shape_sf1000_p0/shape/query21.out | 12 ++++++------ .../nereids_tpcds_shape_sf1000_p0/shape/query40.out | 12 ++++++------ .../noStatsRfPrune/query21.out | 2 +- .../noStatsRfPrune/query40.out | 2 +- .../no_stats_shape/query21.out | 2 +- .../no_stats_shape/query40.out | 2 +- .../rf_prune/query21.out | 12 ++++++------ .../rf_prune/query40.out | 12 ++++++------ .../nereids_tpcds_shape_sf100_p0/shape/query21.out | 12 ++++++------ .../nereids_tpcds_shape_sf100_p0/shape/query40.out | 12 ++++++------ .../nereids_tpcds_shape_sf10t_orc/shape/query21.out | 2 +- .../nereids_tpcds_shape_sf10t_orc/shape/query40.out | 2 +- .../tpcds_sf100/noStatsRfPrune/query21.out | 2 +- .../tpcds_sf100/noStatsRfPrune/query40.out | 2 +- .../tpcds_sf100/no_stats_shape/query21.out | 2 +- .../tpcds_sf100/no_stats_shape/query40.out | 2 +- .../new_shapes_p0/tpcds_sf100/rf_prune/query21.out | 12 ++++++------ .../new_shapes_p0/tpcds_sf100/rf_prune/query40.out | 12 ++++++------ .../data/new_shapes_p0/tpcds_sf100/shape/query21.out | 12 ++++++------ .../data/new_shapes_p0/tpcds_sf100/shape/query40.out | 12 ++++++------ .../new_shapes_p0/tpcds_sf1000/shape/query21.out | 12 ++++++------ .../new_shapes_p0/tpcds_sf1000/shape/query40.out | 12 ++++++------ 24 files changed, 84 insertions(+), 84 deletions(-) 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 50515df29069f2..2076a345643b22 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-05-23')) +--------------------------filter((date_dim.d_date <= '1999-07-22') and (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 04e0789bf8a35e..b8219c68f1fe8b 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-04-02')) +----------------------------filter((date_dim.d_date <= '2001-06-01') and (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 2c44317371e8e1..f68b978b0b2ba6 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=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk] +----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk] ------------------------PhysicalProject ---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk] +--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk] ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 RF2 ----------------------------PhysicalProject -------------------------------filter((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 ---------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -----------------------------PhysicalOlapScan[item] +--------------------------filter((date_dim.d_date <= '1999-07-22') and (date_dim.d_date >= '1999-05-23')) +----------------------------PhysicalOlapScan[date_dim] --------------------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 61d2306286e791..041e5711184598 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=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 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:RF1 d_date_sk->[cs_sold_date_sk] --------------------------PhysicalProject -----------------------------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] +----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk] ------------------------------PhysicalProject --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 RF4 ------------------------------PhysicalProject ---------------------------------filter((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 -----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -------------------------------PhysicalOlapScan[item] +----------------------------filter((date_dim.d_date <= '2001-06-01') and (date_dim.d_date >= '2001-04-02')) +------------------------------PhysicalOlapScan[date_dim] ------------------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 621490d6608ba7..db506f0acaa0e9 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-01-28')) +----------------------filter((date_dim.d_date <= '2002-03-29') and (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 a7af45b01ff19f..1465471817388b 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-03-03')) +--------------------filter((date_dim.d_date <= '2001-05-02') and (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 8fe10ba628d5f5..6a3b7ecf26ca2f 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-01-28')) +----------------------filter((date_dim.d_date <= '2002-03-29') and (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 1fa5c0aabf528d..aae0d788557045 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-03-03')) +--------------------filter((date_dim.d_date <= '2001-05-02') and (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 6950418da2e44f..991b448adf9f0c 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=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk] +----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk] ------------------------PhysicalProject ---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk] +--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk] ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 ----------------------------PhysicalProject -------------------------------filter((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 ---------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -----------------------------PhysicalOlapScan[item] +--------------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28')) +----------------------------PhysicalOlapScan[date_dim] --------------------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 cc14224e1c7fe1..ade38048fb9732 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=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 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:RF1 d_date_sk->[cs_sold_date_sk] --------------------------PhysicalProject -----------------------------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] +----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk] ------------------------------PhysicalProject --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 ------------------------------PhysicalProject ---------------------------------filter((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 -----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -------------------------------PhysicalOlapScan[item] +----------------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03')) +------------------------------PhysicalOlapScan[date_dim] ------------------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 cb45325ac9e747..e80000c6353128 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=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk] +----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk] ------------------------PhysicalProject ---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk] +--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk] ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 RF2 ----------------------------PhysicalProject -------------------------------filter((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 ---------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -----------------------------PhysicalOlapScan[item] +--------------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28')) +----------------------------PhysicalOlapScan[date_dim] --------------------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 5c9d8fbfe4f88d..5ff27658e2ed3f 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=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 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:RF1 d_date_sk->[cs_sold_date_sk] --------------------------PhysicalProject -----------------------------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] +----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk] ------------------------------PhysicalProject --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 RF4 ------------------------------PhysicalProject ---------------------------------filter((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 -----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -------------------------------PhysicalOlapScan[item] +----------------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03')) +------------------------------PhysicalOlapScan[date_dim] ------------------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 47437f6e6cc6fb..31448491385145 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-02-18')) +----------------------filter((date_dim.d_date <= '1999-04-19') and (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 e7fac15753c030..414f6e3e0bd2ed 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-02-17')) +--------------------filter((date_dim.d_date <= '2000-04-17') and (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 621490d6608ba7..db506f0acaa0e9 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-01-28')) +----------------------filter((date_dim.d_date <= '2002-03-29') and (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 a7af45b01ff19f..1465471817388b 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-03-03')) +--------------------filter((date_dim.d_date <= '2001-05-02') and (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 8fe10ba628d5f5..6a3b7ecf26ca2f 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-01-28')) +----------------------filter((date_dim.d_date <= '2002-03-29') and (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 1fa5c0aabf528d..aae0d788557045 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-03-03')) +--------------------filter((date_dim.d_date <= '2001-05-02') and (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 6950418da2e44f..991b448adf9f0c 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=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk] +----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk] ------------------------PhysicalProject ---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk] +--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk] ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 ----------------------------PhysicalProject -------------------------------filter((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 ---------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -----------------------------PhysicalOlapScan[item] +--------------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28')) +----------------------------PhysicalOlapScan[date_dim] --------------------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 cc14224e1c7fe1..ade38048fb9732 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=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 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:RF1 d_date_sk->[cs_sold_date_sk] --------------------------PhysicalProject -----------------------------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] +----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk] ------------------------------PhysicalProject --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 ------------------------------PhysicalProject ---------------------------------filter((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 -----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -------------------------------PhysicalOlapScan[item] +----------------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03')) +------------------------------PhysicalOlapScan[date_dim] ------------------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 cb45325ac9e747..e80000c6353128 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=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk] +----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk] ------------------------PhysicalProject ---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk] +--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk] ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 RF2 ----------------------------PhysicalProject -------------------------------filter((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 ---------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -----------------------------PhysicalOlapScan[item] +--------------------------filter((date_dim.d_date <= '2002-03-29') and (date_dim.d_date >= '2002-01-28')) +----------------------------PhysicalOlapScan[date_dim] --------------------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 5c9d8fbfe4f88d..5ff27658e2ed3f 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=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 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:RF1 d_date_sk->[cs_sold_date_sk] --------------------------PhysicalProject -----------------------------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] +----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk] ------------------------------PhysicalProject --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 RF4 ------------------------------PhysicalProject ---------------------------------filter((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 -----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -------------------------------PhysicalOlapScan[item] +----------------------------filter((date_dim.d_date <= '2001-05-02') and (date_dim.d_date >= '2001-03-03')) +------------------------------PhysicalOlapScan[date_dim] ------------------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 2c44317371e8e1..f68b978b0b2ba6 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=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF1 i_item_sk->[inv_item_sk] +----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[inv_date_sk] ------------------------PhysicalProject ---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((inventory.inv_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[inv_date_sk] +--------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = inventory.inv_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[inv_item_sk] ----------------------------PhysicalOlapScan[inventory] apply RFs: RF0 RF1 RF2 ----------------------------PhysicalProject -------------------------------filter((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 ---------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -----------------------------PhysicalOlapScan[item] +--------------------------filter((date_dim.d_date <= '1999-07-22') and (date_dim.d_date >= '1999-05-23')) +----------------------------PhysicalOlapScan[date_dim] --------------------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 61d2306286e791..041e5711184598 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=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF1 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:RF1 d_date_sk->[cs_sold_date_sk] --------------------------PhysicalProject -----------------------------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] +----------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((item.i_item_sk = catalog_sales.cs_item_sk)) otherCondition=() build RFs:RF0 i_item_sk->[cs_item_sk] ------------------------------PhysicalProject --------------------------------PhysicalOlapScan[catalog_sales] apply RFs: RF0 RF1 RF4 ------------------------------PhysicalProject ---------------------------------filter((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 -----------------------------filter((item.i_current_price <= 1.49) and (item.i_current_price >= 0.99)) -------------------------------PhysicalOlapScan[item] +----------------------------filter((date_dim.d_date <= '2001-06-01') and (date_dim.d_date >= '2001-04-02')) +------------------------------PhysicalOlapScan[date_dim] ------------------PhysicalProject --------------------PhysicalOlapScan[warehouse]