This is an automated email from the ASF dual-hosted git repository.
lide pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new bff66079a1b [fix](nereids) fix wrong resut of function ifnull/coalesce
caused by mixed use multiple columns with type of
datetime/datetimev2/date/datev2 of function coalesce when enable nereids
(#36688)
bff66079a1b is described below
commit bff66079a1bde8a6f6764d0800054d1267f0d204
Author: Yulei-Yang <yulei.yang0...@gmail.com>
AuthorDate: Sat Jun 22 07:52:58 2024 +0800
[fix](nereids) fix wrong resut of function ifnull/coalesce caused by mixed
use multiple columns with type of datetime/datetimev2/date/datev2 of function
coalesce when enable nereids (#36688)
---
.../expressions/functions/SearchSignature.java | 5 ++
.../conditional_functions/test_coalesce_new.groovy | 65 ++++++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/SearchSignature.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/SearchSignature.java
index 496b51d9caf..a3fb3083078 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/SearchSignature.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/SearchSignature.java
@@ -23,6 +23,8 @@ import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.types.DataType;
+import org.apache.doris.nereids.types.DateTimeType;
+import org.apache.doris.nereids.types.DateTimeV2Type;
import org.apache.doris.nereids.types.DateType;
import org.apache.doris.nereids.types.DateV2Type;
import org.apache.doris.nereids.types.DecimalV3Type;
@@ -195,6 +197,9 @@ public class SearchSignature {
nonStrictMatched++;
if (sigArgType instanceof DateV2Type && realType instanceof
DateType) {
dateToDateV2Count++;
+ } else if (sigArgType instanceof DateTimeV2Type && (realType
instanceof DateTimeType
+ || realType instanceof DateV2Type || realType
instanceof DateType)) {
+ dateToDateV2Count++;
}
}
}
diff --git
a/regression-test/suites/query_p0/sql_functions/conditional_functions/test_coalesce_new.groovy
b/regression-test/suites/query_p0/sql_functions/conditional_functions/test_coalesce_new.groovy
index a223c5d4cbd..cf19442a210 100644
---
a/regression-test/suites/query_p0/sql_functions/conditional_functions/test_coalesce_new.groovy
+++
b/regression-test/suites/query_p0/sql_functions/conditional_functions/test_coalesce_new.groovy
@@ -60,6 +60,40 @@ suite("test_coalesce_new") {
"""
assertEquals(result12.size(), 2);
+ //test enable_date_conversion=true and enable_nereids
+ sql """
+ admin set frontend config ("enable_date_conversion"="true")
+ """
+ sql """
+ SET enable_nereids_planner=true
+ """
+ sql """
+ SET enable_fallback_to_original_planner=false
+ """
+ def result13 = try_sql """
+ select dt from test_cls where coalesce (dt,
str_to_date(concat('202306', '01'), '%Y%m%d')) >= '2023-06-01'
+ """
+ assertEquals(result13.size(), 2);
+ def result14 = try_sql """
+ select dt from test_cls where coalesce (dt, dt,
str_to_date(concat('202306', '01'), '%Y%m%d')) < '2023-06-01'
+ """
+ assertEquals(result14.size(), 1);
+ def result15 = try_sql """
+ select dt from test_cls where coalesce (dt,
str_to_date(concat('202306', '01'), '%Y%m%d'), str_to_date(concat('202306',
'01'), '%Y%m%d')) >= '2023-06-02'
+ """
+ assertEquals(result15.size(), 1);
+ def result16 = try_sql """
+ select dt from test_cls where ifnull(dt, str_to_date(concat('202306',
'01'), '%Y%m%d')) >= '2023-06-01'
+ """
+ assertEquals(result16.size(), 2);
+ def result17 = try_sql """
+ select dt from test_cls where coalesce(str_to_date(concat('202306',
'01'), '%Y%m%d'),dt) < '2023-06-02'
+ """
+ assertEquals(result17.size(), 3);
+ def result18 = try_sql """
+ select dt from test_cls where ifnull(str_to_date(concat('202306',
'01'), '%Y%m%d'),dt) < '2023-06-03'
+ """
+ assertEquals(result18.size(), 3);
// test parameter:datetimev2, datev2
sql """
@@ -105,6 +139,37 @@ suite("test_coalesce_new") {
"""
assertEquals(result22.size(), 2);
+ //test enable_date_conversion=true and enable_nereids
+ sql """
+ SET enable_nereids_planner=true
+ """
+ sql """
+ SET enable_fallback_to_original_planner=false
+ """
+ def result23 = try_sql """
+ select dt from test_cls_dtv2 where coalesce (dt,
str_to_date(concat('202306', '01'), '%Y%m%d')) >= '2023-06-01'
+ """
+ assertEquals(result23.size(), 2);
+ def result24 = try_sql """
+ select dt from test_cls_dtv2 where coalesce (dt, dt,
str_to_date(concat('202306', '01'), '%Y%m%d')) >= '2023-06-02'
+ """
+ assertEquals(result24.size(), 1);
+ def result25 = try_sql """
+ select dt from test_cls_dtv2 where coalesce (dt,
str_to_date(concat('202306', '01'), '%Y%m%d'), str_to_date(concat('202306',
'01'), '%Y%m%d')) >= '2023-06-02'
+ """
+ assertEquals(result25.size(), 1);
+ def result26 = try_sql """
+ select dt from test_cls_dtv2 where ifnull(dt,
str_to_date(concat('202306', '01'), '%Y%m%d')) < '2023-06-01'
+ """
+ assertEquals(result26.size(), 1);
+ def result27 = try_sql """
+ select dt from test_cls_dtv2 where
coalesce(str_to_date(concat('202306', '01'), '%Y%m%d'),dt) < '2023-06-01'
+ """
+ assertEquals(result27.size(), 0);
+ def result28 = try_sql """
+ select dt from test_cls_dtv2 where ifnull(str_to_date(concat('202306',
'01'), '%Y%m%d'),dt) < '2023-06-01'
+ """
+ assertEquals(result28.size(), 0);
sql """
drop table test_cls
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
