fix

wangyum · wangyum · commit c63b162abc0e · 2021-02-13T18:29:51.000+08:00
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
@@ -203,7 +203,7 @@ Input [2]: [d_date_sk#22, d_date#23]
 
 (36) Filter [codegen id : 10]
 Input [2]: [d_date_sk#22, d_date#23]
-Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 2002-02-01)) AND (d_date#23 <= 2002-04-02)) AND isnotnull(d_date_sk#22))
+Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 11719)) AND (d_date#23 <= 11779)) AND isnotnull(d_date_sk#22))
 
 (37) Project [codegen id : 10]
 Output [1]: [d_date_sk#22]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt
@@ -141,7 +141,7 @@ Input [2]: [d_date_sk#16, d_date#17]
 
 (22) Filter [codegen id : 8]
 Input [2]: [d_date_sk#16, d_date#17]
-Condition : (((isnotnull(d_date#17) AND (d_date#17 >= 2002-02-01)) AND (d_date#17 <= 2002-04-02)) AND isnotnull(d_date_sk#16))
+Condition : (((isnotnull(d_date#17) AND (d_date#17 >= 11719)) AND (d_date#17 <= 11779)) AND isnotnull(d_date_sk#16))
 
 (23) Project [codegen id : 8]
 Output [1]: [d_date_sk#16]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33.sf100/explain.txt
@@ -163,15 +163,15 @@ Condition : isnotnull(i_item_sk#13)
 Output [2]: [i_category#15, i_manufact_id#14]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/item]
-PushedFilters: [IsNotNull(i_category), EqualTo(i_category,Electronics                                       )]
+PushedFilters: [IsNotNull(i_category), EqualTo(i_category,Electronics)]
 ReadSchema: struct<i_category:string,i_manufact_id:int>
 
 (22) ColumnarToRow [codegen id : 3]
 Input [2]: [i_category#15, i_manufact_id#14]
 
 (23) Filter [codegen id : 3]
 Input [2]: [i_category#15, i_manufact_id#14]
-Condition : (isnotnull(i_category#15) AND (i_category#15 = Electronics                                       ))
+Condition : (isnotnull(i_category#15) AND (i_category#15 = Electronics))
 
 (24) Project [codegen id : 3]
 Output [1]: [i_manufact_id#14 AS i_manufact_id#14#16]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt
@@ -163,15 +163,15 @@ Condition : isnotnull(i_item_sk#13)
 Output [2]: [i_category#15, i_manufact_id#14]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/item]
-PushedFilters: [IsNotNull(i_category), EqualTo(i_category,Electronics                                       )]
+PushedFilters: [IsNotNull(i_category), EqualTo(i_category,Electronics)]
 ReadSchema: struct<i_category:string,i_manufact_id:int>
 
 (22) ColumnarToRow [codegen id : 3]
 Input [2]: [i_category#15, i_manufact_id#14]
 
 (23) Filter [codegen id : 3]
 Input [2]: [i_category#15, i_manufact_id#14]
-Condition : (isnotnull(i_category#15) AND (i_category#15 = Electronics                                       ))
+Condition : (isnotnull(i_category#15) AND (i_category#15 = Electronics))
 
 (24) Project [codegen id : 3]
 Output [1]: [i_manufact_id#14 AS i_manufact_id#14#16]
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
@@ -160,7 +160,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 >= 11192)) AND (d_date#26 <= 11206)) 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/q5/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt
@@ -130,7 +130,7 @@ Input [2]: [d_date_sk#22, d_date#23]
 
 (12) Filter [codegen id : 3]
 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-06)) AND isnotnull(d_date_sk#22))
+Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 11192)) AND (d_date#23 <= 11206)) AND isnotnull(d_date_sk#22))
 
 (13) Project [codegen id : 3]
 Output [1]: [d_date_sk#22]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58.sf100/explain.txt
@@ -467,7 +467,7 @@ Input [2]: [d_date#5, d_week_seq#6]
 
 (82) Filter [codegen id : 1]
 Input [2]: [d_date#5, d_week_seq#6]
-Condition : (isnotnull(d_date#5) AND (d_date#5 = 2000-01-03))
+Condition : (isnotnull(d_date#5) AND (d_date#5 = 10959))
 
 (83) Project [codegen id : 1]
 Output [1]: [d_week_seq#6]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt
@@ -467,7 +467,7 @@ Input [2]: [d_date#8, d_week_seq#9]
 
 (82) Filter [codegen id : 1]
 Input [2]: [d_date#8, d_week_seq#9]
-Condition : (isnotnull(d_date#8) AND (d_date#8 = 2000-01-03))
+Condition : (isnotnull(d_date#8) AND (d_date#8 = 10959))
 
 (83) Project [codegen id : 1]
 Output [1]: [d_week_seq#9]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93.sf100/explain.txt
@@ -47,15 +47,15 @@ Input [5]: [sr_item_sk#1, sr_reason_sk#2, sr_ticket_number#3, sr_return_quantity
 Output [2]: [r_reason_sk#6, r_reason_desc#7]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/reason]
-PushedFilters: [IsNotNull(r_reason_desc), EqualTo(r_reason_desc,reason 28                                                                                           ), IsNotNull(r_reason_sk)]
+PushedFilters: [IsNotNull(r_reason_desc), EqualTo(r_reason_desc,reason 28), IsNotNull(r_reason_sk)]
 ReadSchema: struct<r_reason_sk:int,r_reason_desc:string>
 
 (6) ColumnarToRow [codegen id : 1]
 Input [2]: [r_reason_sk#6, r_reason_desc#7]
 
 (7) Filter [codegen id : 1]
 Input [2]: [r_reason_sk#6, r_reason_desc#7]
-Condition : ((isnotnull(r_reason_desc#7) AND (r_reason_desc#7 = reason 28                                                                                           )) AND isnotnull(r_reason_sk#6))
+Condition : ((isnotnull(r_reason_desc#7) AND (r_reason_desc#7 = reason 28)) AND isnotnull(r_reason_sk#6))
 
 (8) Project [codegen id : 1]
 Output [1]: [r_reason_sk#6]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt
@@ -85,15 +85,15 @@ Input [9]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, s
 Output [2]: [r_reason_sk#14, r_reason_desc#15]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/reason]
-PushedFilters: [IsNotNull(r_reason_desc), EqualTo(r_reason_desc,reason 28                                                                                           ), IsNotNull(r_reason_sk)]
+PushedFilters: [IsNotNull(r_reason_desc), EqualTo(r_reason_desc,reason 28), IsNotNull(r_reason_sk)]
 ReadSchema: struct<r_reason_sk:int,r_reason_desc:string>
 
 (15) ColumnarToRow [codegen id : 5]
 Input [2]: [r_reason_sk#14, r_reason_desc#15]
 
 (16) Filter [codegen id : 5]
 Input [2]: [r_reason_sk#14, r_reason_desc#15]
-Condition : ((isnotnull(r_reason_desc#15) AND (r_reason_desc#15 = reason 28                                                                                           )) AND isnotnull(r_reason_sk#14))
+Condition : ((isnotnull(r_reason_desc#15) AND (r_reason_desc#15 = reason 28)) AND isnotnull(r_reason_sk#14))
 
 (17) Project [codegen id : 5]
 Output [1]: [r_reason_sk#14]
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
@@ -175,15 +175,15 @@ Input [7]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_num
 Output [2]: [web_site_sk#20, web_company_name#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_site]
-PushedFilters: [IsNotNull(web_company_name), EqualTo(web_company_name,pri                                               ), IsNotNull(web_site_sk)]
+PushedFilters: [IsNotNull(web_company_name), EqualTo(web_company_name,pri), IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_company_name:string>
 
 (30) ColumnarToRow [codegen id : 10]
 Input [2]: [web_site_sk#20, web_company_name#21]
 
 (31) Filter [codegen id : 10]
 Input [2]: [web_site_sk#20, web_company_name#21]
-Condition : ((isnotnull(web_company_name#21) AND (web_company_name#21 = pri                                               )) AND isnotnull(web_site_sk#20))
+Condition : ((isnotnull(web_company_name#21) AND (web_company_name#21 = pri)) AND isnotnull(web_site_sk#20))
 
 (32) Project [codegen id : 10]
 Output [1]: [web_site_sk#20]
@@ -214,7 +214,7 @@ Input [2]: [d_date_sk#23, d_date#24]
 
 (38) Filter [codegen id : 11]
 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 >= 10623)) AND (d_date#24 <= 10683)) AND isnotnull(d_date_sk#23))
 
 (39) Project [codegen id : 11]
 Output [1]: [d_date_sk#23]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt
@@ -152,7 +152,7 @@ Input [2]: [d_date_sk#17, d_date#18]
 
 (24) Filter [codegen id : 9]
 Input [2]: [d_date_sk#17, d_date#18]
-Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-01)) AND (d_date#18 <= 1999-04-02)) AND isnotnull(d_date_sk#17))
+Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 10623)) AND (d_date#18 <= 10683)) AND isnotnull(d_date_sk#17))
 
 (25) Project [codegen id : 9]
 Output [1]: [d_date_sk#17]
@@ -206,15 +206,15 @@ Input [6]: [ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#5, ws_ext_ship_
 Output [2]: [web_site_sk#23, web_company_name#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_site]
-PushedFilters: [IsNotNull(web_company_name), EqualTo(web_company_name,pri                                               ), IsNotNull(web_site_sk)]
+PushedFilters: [IsNotNull(web_company_name), EqualTo(web_company_name,pri), IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_company_name:string>
 
 (37) ColumnarToRow [codegen id : 11]
 Input [2]: [web_site_sk#23, web_company_name#24]
 
 (38) Filter [codegen id : 11]
 Input [2]: [web_site_sk#23, web_company_name#24]
-Condition : ((isnotnull(web_company_name#24) AND (web_company_name#24 = pri                                               )) AND isnotnull(web_site_sk#23))
+Condition : ((isnotnull(web_company_name#24) AND (web_company_name#24 = pri)) AND isnotnull(web_site_sk#23))
 
 (39) Project [codegen id : 11]
 Output [1]: [web_site_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
@@ -252,15 +252,15 @@ Input [7]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_num
 Output [2]: [web_site_sk#24, web_company_name#25]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_site]
-PushedFilters: [IsNotNull(web_company_name), EqualTo(web_company_name,pri                                               ), IsNotNull(web_site_sk)]
+PushedFilters: [IsNotNull(web_company_name), EqualTo(web_company_name,pri), IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_company_name:string>
 
 (45) ColumnarToRow [codegen id : 19]
 Input [2]: [web_site_sk#24, web_company_name#25]
 
 (46) Filter [codegen id : 19]
 Input [2]: [web_site_sk#24, web_company_name#25]
-Condition : ((isnotnull(web_company_name#25) AND (web_company_name#25 = pri                                               )) AND isnotnull(web_site_sk#24))
+Condition : ((isnotnull(web_company_name#25) AND (web_company_name#25 = pri)) AND isnotnull(web_site_sk#24))
 
 (47) Project [codegen id : 19]
 Output [1]: [web_site_sk#24]
@@ -291,7 +291,7 @@ Input [2]: [d_date_sk#27, d_date#28]
 
 (53) Filter [codegen id : 20]
 Input [2]: [d_date_sk#27, d_date#28]
-Condition : (((isnotnull(d_date#28) AND (d_date#28 >= 1999-02-01)) AND (d_date#28 <= 1999-04-02)) AND isnotnull(d_date_sk#27))
+Condition : (((isnotnull(d_date#28) AND (d_date#28 >= 10623)) AND (d_date#28 <= 10683)) AND isnotnull(d_date_sk#27))
 
 (54) Project [codegen id : 20]
 Output [1]: [d_date_sk#27]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt
@@ -229,7 +229,7 @@ Input [2]: [d_date_sk#21, d_date#22]
 
 (39) Filter [codegen id : 18]
 Input [2]: [d_date_sk#21, d_date#22]
-Condition : (((isnotnull(d_date#22) AND (d_date#22 >= 1999-02-01)) AND (d_date#22 <= 1999-04-02)) AND isnotnull(d_date_sk#21))
+Condition : (((isnotnull(d_date#22) AND (d_date#22 >= 10623)) AND (d_date#22 <= 10683)) AND isnotnull(d_date_sk#21))
 
 (40) Project [codegen id : 18]
 Output [1]: [d_date_sk#21]
@@ -283,15 +283,15 @@ Input [6]: [ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_
 Output [2]: [web_site_sk#27, web_company_name#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_site]
-PushedFilters: [IsNotNull(web_company_name), EqualTo(web_company_name,pri                                               ), IsNotNull(web_site_sk)]
+PushedFilters: [IsNotNull(web_company_name), EqualTo(web_company_name,pri), IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_company_name:string>
 
 (52) ColumnarToRow [codegen id : 20]
 Input [2]: [web_site_sk#27, web_company_name#28]
 
 (53) Filter [codegen id : 20]
 Input [2]: [web_site_sk#27, web_company_name#28]
-Condition : ((isnotnull(web_company_name#28) AND (web_company_name#28 = pri                                               )) AND isnotnull(web_site_sk#27))
+Condition : ((isnotnull(web_company_name#28) AND (web_company_name#28 = pri)) AND isnotnull(web_site_sk#27))
 
 (54) Project [codegen id : 20]
 Output [1]: [web_site_sk#27]
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
@@ -173,7 +173,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 >= 10442)) AND (d_date#26 <= 10456)) 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/q5a/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt
@@ -143,7 +143,7 @@ Input [2]: [d_date_sk#22, d_date#23]
 
 (12) Filter [codegen id : 3]
 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-08-18)) AND isnotnull(d_date_sk#22))
+Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 10442)) AND (d_date#23 <= 10456)) AND isnotnull(d_date_sk#22))
 
 (13) Project [codegen id : 3]
 Output [1]: [d_date_sk#22]
