From 0d4556708b740aaa83e1e1596c22da7da7fb7b03 Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Thu, 15 Apr 2021 16:08:02 +0300 Subject: [PATCH] Re-gen results for PlanStabilityWithStatsSuite --- .../approved-plans-v1_4/q12.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q16.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q20.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q21.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q32.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q37.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q40.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q5.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q72.sf100/explain.txt | 2 +- .../approved-plans-v1_4/q77.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q80.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q82.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q92.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q94.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q95.sf100/explain.txt | 4 ++-- .../approved-plans-v1_4/q98.sf100/explain.txt | 4 ++-- .../approved-plans-v2_7/q12.sf100/explain.txt | 4 ++-- .../approved-plans-v2_7/q20.sf100/explain.txt | 4 ++-- .../approved-plans-v2_7/q5a.sf100/explain.txt | 4 ++-- .../approved-plans-v2_7/q72.sf100/explain.txt | 2 +- .../approved-plans-v2_7/q77a.sf100/explain.txt | 4 ++-- .../approved-plans-v2_7/q80a.sf100/explain.txt | 4 ++-- .../approved-plans-v2_7/q98.sf100/explain.txt | 4 ++-- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12.sf100/explain.txt index 7c414d9080734..9b21fba17d8e4 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12.sf100/explain.txt @@ -86,7 +86,7 @@ Input [9]: [ws_item_sk#1, ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_sk#6, Output [2]: [d_date_sk#13, d_date#14] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), IsNotNull(d_date_sk)] ReadSchema: struct (14) ColumnarToRow [codegen id : 5] @@ -94,7 +94,7 @@ Input [2]: [d_date_sk#13, d_date#14] (15) Filter [codegen id : 5] Input [2]: [d_date_sk#13, d_date#14] -Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (d_date#14 <= 1999-03-24)) AND isnotnull(d_date_sk#13)) +Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (cast(d_date#14 as timestamp) <= 1999-03-24 00:00:00)) AND isnotnull(d_date_sk#13)) (16) Project [codegen id : 5] Output [1]: [d_date_sk#13] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16.sf100/explain.txt index 7604ea1e786d8..5e8740615d06a 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16.sf100/explain.txt @@ -195,7 +195,7 @@ Input [6]: [cs_ship_date_sk#1, cs_call_center_sk#3, cs_order_number#5, cs_ext_sh Output [2]: [d_date_sk#23, d_date#24] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2002-02-01), LessThanOrEqual(d_date,2002-04-02), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2002-02-01), IsNotNull(d_date_sk)] ReadSchema: struct (35) ColumnarToRow [codegen id : 10] @@ -203,7 +203,7 @@ Input [2]: [d_date_sk#23, d_date#24] (36) Filter [codegen id : 10] Input [2]: [d_date_sk#23, d_date#24] -Condition : (((isnotnull(d_date#24) AND (d_date#24 >= 2002-02-01)) AND (d_date#24 <= 2002-04-02)) AND isnotnull(d_date_sk#23)) +Condition : (((isnotnull(d_date#24) AND (d_date#24 >= 2002-02-01)) AND (cast(d_date#24 as timestamp) <= 2002-04-02 00:00:00)) AND isnotnull(d_date_sk#23)) (37) Project [codegen id : 10] Output [1]: [d_date_sk#23] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20.sf100/explain.txt index d6bbbfc515205..3cb2ac435cb32 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20.sf100/explain.txt @@ -86,7 +86,7 @@ Input [9]: [cs_item_sk#1, cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_sk#6, Output [2]: [d_date_sk#13, d_date#14] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), IsNotNull(d_date_sk)] ReadSchema: struct (14) ColumnarToRow [codegen id : 5] @@ -94,7 +94,7 @@ Input [2]: [d_date_sk#13, d_date#14] (15) Filter [codegen id : 5] Input [2]: [d_date_sk#13, d_date#14] -Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (d_date#14 <= 1999-03-24)) AND isnotnull(d_date_sk#13)) +Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (cast(d_date#14 as timestamp) <= 1999-03-24 00:00:00)) AND isnotnull(d_date_sk#13)) (16) Project [codegen id : 5] Output [1]: [d_date_sk#13] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21.sf100/explain.txt index efb45b5ccdb7f..06842552caed7 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21.sf100/explain.txt @@ -78,7 +78,7 @@ Input [6]: [inv_item_sk#1, inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_ Output [2]: [d_date_sk#10, d_date#11] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-10), LessThanOrEqual(d_date,2000-04-10), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), IsNotNull(d_date_sk)] ReadSchema: struct (12) ColumnarToRow [codegen id : 2] @@ -86,7 +86,7 @@ Input [2]: [d_date_sk#10, d_date#11] (13) Filter [codegen id : 2] Input [2]: [d_date_sk#10, d_date#11] -Condition : (((isnotnull(d_date#11) AND (d_date#11 >= 2000-02-10)) AND (d_date#11 <= 2000-04-10)) AND isnotnull(d_date_sk#10)) +Condition : (((isnotnull(d_date#11) AND (cast(d_date#11 as timestamp) >= 2000-02-10 00:00:00)) AND (cast(d_date#11 as timestamp) <= 2000-04-10 00:00:00)) AND isnotnull(d_date_sk#10)) (14) BroadcastExchange Input [2]: [d_date_sk#10, d_date#11] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32.sf100/explain.txt index 5d171e5f595b9..cc0ddf60e406d 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32.sf100/explain.txt @@ -73,7 +73,7 @@ Condition : isnotnull(cs_item_sk#4) Output [2]: [d_date_sk#8, d_date#9] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-01-27), LessThanOrEqual(d_date,2000-04-26), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-01-27), IsNotNull(d_date_sk)] ReadSchema: struct (10) ColumnarToRow [codegen id : 2] @@ -81,7 +81,7 @@ Input [2]: [d_date_sk#8, d_date#9] (11) Filter [codegen id : 2] Input [2]: [d_date_sk#8, d_date#9] -Condition : (((isnotnull(d_date#9) AND (d_date#9 >= 2000-01-27)) AND (d_date#9 <= 2000-04-26)) AND isnotnull(d_date_sk#8)) +Condition : (((isnotnull(d_date#9) AND (d_date#9 >= 2000-01-27)) AND (cast(d_date#9 as timestamp) <= 2000-04-26 00:00:00)) AND isnotnull(d_date_sk#8)) (12) Project [codegen id : 2] Output [1]: [d_date_sk#8] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37.sf100/explain.txt index 1f2c169ba0921..edd4accfe1bf3 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37.sf100/explain.txt @@ -87,7 +87,7 @@ Input [6]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_item Output [2]: [d_date_sk#11, d_date#12] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-01), LessThanOrEqual(d_date,2000-04-01), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-01), IsNotNull(d_date_sk)] ReadSchema: struct (13) ColumnarToRow [codegen id : 2] @@ -95,7 +95,7 @@ Input [2]: [d_date_sk#11, d_date#12] (14) Filter [codegen id : 2] Input [2]: [d_date_sk#11, d_date#12] -Condition : (((isnotnull(d_date#12) AND (d_date#12 >= 2000-02-01)) AND (d_date#12 <= 2000-04-01)) AND isnotnull(d_date_sk#11)) +Condition : (((isnotnull(d_date#12) AND (d_date#12 >= 2000-02-01)) AND (cast(d_date#12 as timestamp) <= 2000-04-01 00:00:00)) AND isnotnull(d_date_sk#11)) (15) Project [codegen id : 2] Output [1]: [d_date_sk#11] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40.sf100/explain.txt index c53874d2288e5..922bc407d930e 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40.sf100/explain.txt @@ -130,7 +130,7 @@ Input [7]: [cs_warehouse_sk#1, cs_item_sk#2, cs_sales_price#4, cs_sold_date_sk#5 Output [2]: [d_date_sk#17, d_date#18] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-10), LessThanOrEqual(d_date,2000-04-10), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), IsNotNull(d_date_sk)] ReadSchema: struct (22) ColumnarToRow [codegen id : 6] @@ -138,7 +138,7 @@ Input [2]: [d_date_sk#17, d_date#18] (23) Filter [codegen id : 6] Input [2]: [d_date_sk#17, d_date#18] -Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 2000-02-10)) AND (d_date#18 <= 2000-04-10)) AND isnotnull(d_date_sk#17)) +Condition : (((isnotnull(d_date#18) AND (cast(d_date#18 as timestamp) >= 2000-02-10 00:00:00)) AND (cast(d_date#18 as timestamp) <= 2000-04-10 00:00:00)) AND isnotnull(d_date_sk#17)) (24) BroadcastExchange Input [2]: [d_date_sk#17, d_date#18] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5.sf100/explain.txt index ec4a566d0e4c4..663a576542d7b 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5.sf100/explain.txt @@ -153,7 +153,7 @@ Input [8]: [store_sk#6, date_sk#7, sales_price#8, profit#9, return_amt#10, net_l Output [2]: [d_date_sk#25, d_date#26] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-23), LessThanOrEqual(d_date,2000-09-06), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-23), IsNotNull(d_date_sk)] ReadSchema: struct (17) ColumnarToRow [codegen id : 4] @@ -161,7 +161,7 @@ Input [2]: [d_date_sk#25, d_date#26] (18) Filter [codegen id : 4] Input [2]: [d_date_sk#25, d_date#26] -Condition : (((isnotnull(d_date#26) AND (d_date#26 >= 2000-08-23)) AND (d_date#26 <= 2000-09-06)) AND isnotnull(d_date_sk#25)) +Condition : (((isnotnull(d_date#26) AND (d_date#26 >= 2000-08-23)) AND (cast(d_date#26 as timestamp) <= 2000-09-06 00:00:00)) AND isnotnull(d_date_sk#25)) (19) Project [codegen id : 4] Output [1]: [d_date_sk#25] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72.sf100/explain.txt index 95092a8bbcc51..1b4bd981ab54e 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72.sf100/explain.txt @@ -276,7 +276,7 @@ Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)) (44) BroadcastHashJoin [codegen id : 10] Left keys [1]: [cs_sold_date_sk#8] Right keys [1]: [d_date_sk#23] -Join condition: (d_date#17 > d_date#24 + 5 days) +Join condition: (cast(d_date#17 as timestamp) > cast(d_date#24 as timestamp) + 432000000000) (45) Project [codegen id : 10] Output [7]: [cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_quantity#7, i_item_desc#21, d_week_seq#25, d_date_sk#28] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77.sf100/explain.txt index 34d2ec82f500d..a7398c210feaa 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77.sf100/explain.txt @@ -109,7 +109,7 @@ Condition : isnotnull(ss_store_sk#1) Output [2]: [d_date_sk#6, d_date#7] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-03), LessThanOrEqual(d_date,2000-09-02), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-03), IsNotNull(d_date_sk)] ReadSchema: struct (5) ColumnarToRow [codegen id : 1] @@ -117,7 +117,7 @@ Input [2]: [d_date_sk#6, d_date#7] (6) Filter [codegen id : 1] Input [2]: [d_date_sk#6, d_date#7] -Condition : (((isnotnull(d_date#7) AND (d_date#7 >= 2000-08-03)) AND (d_date#7 <= 2000-09-02)) AND isnotnull(d_date_sk#6)) +Condition : (((isnotnull(d_date#7) AND (d_date#7 >= 2000-08-03)) AND (cast(d_date#7 as timestamp) <= 2000-09-02 00:00:00)) AND isnotnull(d_date_sk#6)) (7) Project [codegen id : 1] Output [1]: [d_date_sk#6] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80.sf100/explain.txt index 2c625a8f4fd41..7867050d6c2a1 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80.sf100/explain.txt @@ -236,7 +236,7 @@ Input [8]: [ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss_net_profit#6, Output [2]: [d_date_sk#22, d_date#23] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-23), LessThanOrEqual(d_date,2000-09-22), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-23), IsNotNull(d_date_sk)] ReadSchema: struct (29) ColumnarToRow [codegen id : 7] @@ -244,7 +244,7 @@ Input [2]: [d_date_sk#22, d_date#23] (30) Filter [codegen id : 7] Input [2]: [d_date_sk#22, d_date#23] -Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 2000-08-23)) AND (d_date#23 <= 2000-09-22)) AND isnotnull(d_date_sk#22)) +Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 2000-08-23)) AND (cast(d_date#23 as timestamp) <= 2000-09-22 00:00:00)) AND isnotnull(d_date_sk#22)) (31) Project [codegen id : 7] Output [1]: [d_date_sk#22] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82.sf100/explain.txt index 6725e273a3acc..8470bdab29592 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82.sf100/explain.txt @@ -87,7 +87,7 @@ Input [6]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_item Output [2]: [d_date_sk#11, d_date#12] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-05-25), LessThanOrEqual(d_date,2000-07-24), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-05-25), IsNotNull(d_date_sk)] ReadSchema: struct (13) ColumnarToRow [codegen id : 2] @@ -95,7 +95,7 @@ Input [2]: [d_date_sk#11, d_date#12] (14) Filter [codegen id : 2] Input [2]: [d_date_sk#11, d_date#12] -Condition : (((isnotnull(d_date#12) AND (d_date#12 >= 2000-05-25)) AND (d_date#12 <= 2000-07-24)) AND isnotnull(d_date_sk#11)) +Condition : (((isnotnull(d_date#12) AND (d_date#12 >= 2000-05-25)) AND (cast(d_date#12 as timestamp) <= 2000-07-24 00:00:00)) AND isnotnull(d_date_sk#11)) (15) Project [codegen id : 2] Output [1]: [d_date_sk#11] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92.sf100/explain.txt index 94e76ced527a0..86ca198daaa42 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92.sf100/explain.txt @@ -76,7 +76,7 @@ Condition : isnotnull(ws_item_sk#4) Output [2]: [d_date_sk#8, d_date#9] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-01-27), LessThanOrEqual(d_date,2000-04-26), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-01-27), IsNotNull(d_date_sk)] ReadSchema: struct (10) ColumnarToRow [codegen id : 2] @@ -84,7 +84,7 @@ Input [2]: [d_date_sk#8, d_date#9] (11) Filter [codegen id : 2] Input [2]: [d_date_sk#8, d_date#9] -Condition : (((isnotnull(d_date#9) AND (d_date#9 >= 2000-01-27)) AND (d_date#9 <= 2000-04-26)) AND isnotnull(d_date_sk#8)) +Condition : (((isnotnull(d_date#9) AND (d_date#9 >= 2000-01-27)) AND (cast(d_date#9 as timestamp) <= 2000-04-26 00:00:00)) AND isnotnull(d_date_sk#8)) (12) Project [codegen id : 2] Output [1]: [d_date_sk#8] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94.sf100/explain.txt index 840f300eadff4..b644ef253f6db 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94.sf100/explain.txt @@ -195,7 +195,7 @@ Input [6]: [ws_ship_date_sk#1, ws_web_site_sk#3, ws_order_number#5, ws_ext_ship_ Output [2]: [d_date_sk#23, d_date#24] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-01), LessThanOrEqual(d_date,1999-04-02), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-01), IsNotNull(d_date_sk)] ReadSchema: struct (35) ColumnarToRow [codegen id : 10] @@ -203,7 +203,7 @@ Input [2]: [d_date_sk#23, d_date#24] (36) Filter [codegen id : 10] Input [2]: [d_date_sk#23, d_date#24] -Condition : (((isnotnull(d_date#24) AND (d_date#24 >= 1999-02-01)) AND (d_date#24 <= 1999-04-02)) AND isnotnull(d_date_sk#23)) +Condition : (((isnotnull(d_date#24) AND (d_date#24 >= 1999-02-01)) AND (cast(d_date#24 as timestamp) <= 1999-04-02 00:00:00)) AND isnotnull(d_date_sk#23)) (37) Project [codegen id : 10] Output [1]: [d_date_sk#23] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95.sf100/explain.txt index 82e4651d09edf..2a4e97a63b952 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95.sf100/explain.txt @@ -257,7 +257,7 @@ Input [6]: [ws_ship_date_sk#1, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_ Output [2]: [d_date_sk#28, d_date#29] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-01), LessThanOrEqual(d_date,1999-04-02), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-01), IsNotNull(d_date_sk)] ReadSchema: struct (47) ColumnarToRow [codegen id : 18] @@ -265,7 +265,7 @@ Input [2]: [d_date_sk#28, d_date#29] (48) Filter [codegen id : 18] Input [2]: [d_date_sk#28, d_date#29] -Condition : (((isnotnull(d_date#29) AND (d_date#29 >= 1999-02-01)) AND (d_date#29 <= 1999-04-02)) AND isnotnull(d_date_sk#28)) +Condition : (((isnotnull(d_date#29) AND (d_date#29 >= 1999-02-01)) AND (cast(d_date#29 as timestamp) <= 1999-04-02 00:00:00)) AND isnotnull(d_date_sk#28)) (49) Project [codegen id : 18] Output [1]: [d_date_sk#28] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98.sf100/explain.txt index 91f246ce2aa12..016ba5e8d16aa 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98.sf100/explain.txt @@ -88,7 +88,7 @@ Input [9]: [ss_item_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_sk#6, Output [2]: [d_date_sk#13, d_date#14] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), IsNotNull(d_date_sk)] ReadSchema: struct (14) ColumnarToRow [codegen id : 5] @@ -96,7 +96,7 @@ Input [2]: [d_date_sk#13, d_date#14] (15) Filter [codegen id : 5] Input [2]: [d_date_sk#13, d_date#14] -Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (d_date#14 <= 1999-03-24)) AND isnotnull(d_date_sk#13)) +Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (cast(d_date#14 as timestamp) <= 1999-03-24 00:00:00)) AND isnotnull(d_date_sk#13)) (16) Project [codegen id : 5] Output [1]: [d_date_sk#13] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12.sf100/explain.txt index d4acaa2cec459..db9f8eb40a3f0 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12.sf100/explain.txt @@ -86,7 +86,7 @@ Input [9]: [ws_item_sk#1, ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_sk#6, Output [2]: [d_date_sk#13, d_date#14] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), IsNotNull(d_date_sk)] ReadSchema: struct (14) ColumnarToRow [codegen id : 5] @@ -94,7 +94,7 @@ Input [2]: [d_date_sk#13, d_date#14] (15) Filter [codegen id : 5] Input [2]: [d_date_sk#13, d_date#14] -Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (d_date#14 <= 1999-03-24)) AND isnotnull(d_date_sk#13)) +Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (cast(d_date#14 as timestamp) <= 1999-03-24 00:00:00)) AND isnotnull(d_date_sk#13)) (16) Project [codegen id : 5] Output [1]: [d_date_sk#13] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20.sf100/explain.txt index d9b14fcfb5bf9..a4f9f7ca2bd81 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20.sf100/explain.txt @@ -86,7 +86,7 @@ Input [9]: [cs_item_sk#1, cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_sk#6, Output [2]: [d_date_sk#13, d_date#14] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), IsNotNull(d_date_sk)] ReadSchema: struct (14) ColumnarToRow [codegen id : 5] @@ -94,7 +94,7 @@ Input [2]: [d_date_sk#13, d_date#14] (15) Filter [codegen id : 5] Input [2]: [d_date_sk#13, d_date#14] -Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (d_date#14 <= 1999-03-24)) AND isnotnull(d_date_sk#13)) +Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (cast(d_date#14 as timestamp) <= 1999-03-24 00:00:00)) AND isnotnull(d_date_sk#13)) (16) Project [codegen id : 5] Output [1]: [d_date_sk#13] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a.sf100/explain.txt index e660800796abe..dcc02b7d4ebca 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a.sf100/explain.txt @@ -166,7 +166,7 @@ Input [8]: [store_sk#6, date_sk#7, sales_price#8, profit#9, return_amt#10, net_l Output [2]: [d_date_sk#25, d_date#26] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-08-18), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), IsNotNull(d_date_sk)] ReadSchema: struct (17) ColumnarToRow [codegen id : 4] @@ -174,7 +174,7 @@ Input [2]: [d_date_sk#25, d_date#26] (18) Filter [codegen id : 4] Input [2]: [d_date_sk#25, d_date#26] -Condition : (((isnotnull(d_date#26) AND (d_date#26 >= 1998-08-04)) AND (d_date#26 <= 1998-08-18)) AND isnotnull(d_date_sk#25)) +Condition : (((isnotnull(d_date#26) AND (d_date#26 >= 1998-08-04)) AND (cast(d_date#26 as timestamp) <= 1998-08-18 00:00:00)) AND isnotnull(d_date_sk#25)) (19) Project [codegen id : 4] Output [1]: [d_date_sk#25] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72.sf100/explain.txt index 949f9c51b3d22..81344efe99d24 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72.sf100/explain.txt @@ -276,7 +276,7 @@ Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)) (44) BroadcastHashJoin [codegen id : 10] Left keys [1]: [cs_sold_date_sk#8] Right keys [1]: [d_date_sk#23] -Join condition: (d_date#17 > d_date#24 + 5 days) +Join condition: (cast(d_date#17 as timestamp) > cast(d_date#24 as timestamp) + 432000000000) (45) Project [codegen id : 10] Output [7]: [cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_quantity#7, i_item_desc#21, d_week_seq#25, d_date_sk#28] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a.sf100/explain.txt index 1f4f137f42c4a..d6ce671dcf6ee 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a.sf100/explain.txt @@ -122,7 +122,7 @@ Condition : isnotnull(ss_store_sk#1) Output [2]: [d_date_sk#6, d_date#7] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-09-03), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), IsNotNull(d_date_sk)] ReadSchema: struct (5) ColumnarToRow [codegen id : 1] @@ -130,7 +130,7 @@ Input [2]: [d_date_sk#6, d_date#7] (6) Filter [codegen id : 1] Input [2]: [d_date_sk#6, d_date#7] -Condition : (((isnotnull(d_date#7) AND (d_date#7 >= 1998-08-04)) AND (d_date#7 <= 1998-09-03)) AND isnotnull(d_date_sk#6)) +Condition : (((isnotnull(d_date#7) AND (d_date#7 >= 1998-08-04)) AND (cast(d_date#7 as timestamp) <= 1998-09-03 00:00:00)) AND isnotnull(d_date_sk#6)) (7) Project [codegen id : 1] Output [1]: [d_date_sk#6] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a.sf100/explain.txt index cd8f5d5c6ae61..21e521ac3b7e2 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a.sf100/explain.txt @@ -249,7 +249,7 @@ Input [8]: [ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss_net_profit#6, Output [2]: [d_date_sk#22, d_date#23] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-09-03), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), IsNotNull(d_date_sk)] ReadSchema: struct (29) ColumnarToRow [codegen id : 7] @@ -257,7 +257,7 @@ Input [2]: [d_date_sk#22, d_date#23] (30) Filter [codegen id : 7] Input [2]: [d_date_sk#22, d_date#23] -Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 1998-08-04)) AND (d_date#23 <= 1998-09-03)) AND isnotnull(d_date_sk#22)) +Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 1998-08-04)) AND (cast(d_date#23 as timestamp) <= 1998-09-03 00:00:00)) AND isnotnull(d_date_sk#22)) (31) Project [codegen id : 7] Output [1]: [d_date_sk#22] diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98.sf100/explain.txt index 33d4b7d49e1d0..6f838bf072063 100644 --- a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98.sf100/explain.txt +++ b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98.sf100/explain.txt @@ -87,7 +87,7 @@ Input [9]: [ss_item_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_sk#6, Output [2]: [d_date_sk#13, d_date#14] Batched: true Location [not included in comparison]/{warehouse_dir}/date_dim] -PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)] +PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), IsNotNull(d_date_sk)] ReadSchema: struct (14) ColumnarToRow [codegen id : 5] @@ -95,7 +95,7 @@ Input [2]: [d_date_sk#13, d_date#14] (15) Filter [codegen id : 5] Input [2]: [d_date_sk#13, d_date#14] -Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (d_date#14 <= 1999-03-24)) AND isnotnull(d_date_sk#13)) +Condition : (((isnotnull(d_date#14) AND (d_date#14 >= 1999-02-22)) AND (cast(d_date#14 as timestamp) <= 1999-03-24 00:00:00)) AND isnotnull(d_date_sk#13)) (16) Project [codegen id : 5] Output [1]: [d_date_sk#13]