database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](planner) fix wrong resut of function ifnull/coalesce caused by … (#36727)

Browse Source
This commit is contained in:
Yulei-Yang
2024-06-25 17:32:04 +08:00
committed by GitHub
parent 695d58f354
commit 8fc70e32bc
3 changed files with 199 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java
View File

@ -1591,6 +1591,14 @@ public class FunctionCallExpr extends Expr {
argTypes[i] = assignmentCompatibleType;
}
}
} else if (assignmentCompatibleType.isDateV2OrDateTimeV2()) {
for (int i = 0; i < childTypes.length; i++) {
if (assignmentCompatibleType.isDateV2OrDateTimeV2()
&& !childTypes[i].equals(assignmentCompatibleType)) {
uncheckedCastChild(assignmentCompatibleType, i);
argTypes[i] = assignmentCompatibleType;
}
}
}
fn = getBuiltinFunction(fnName.getFunction(), argTypes,
Function.CompareMode.IS_NONSTRICT_SUPERTYPE_OF);

5
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/SearchSignature.java
View File

@ -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;
@ -191,6 +193,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++;
}
}
}

186
regression-test/suites/query_p0/sql_functions/conditional_functions/test_coalesce_new.groovy Normal file
View File

@ -0,0 +1,186 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
suite("test_coalesce_new") {
// test parameter:datetime, datev2
sql """
admin set frontend config ("enable_date_conversion"="false")
"""
sql """
admin set frontend config ("disable_datev1"="false")
"""
sql """
drop table if exists test_cls
"""
sql """
CREATE TABLE `test_cls` (
`id` int(11) NOT NULL COMMENT '',
`name` varchar(32) NOT NULL COMMENT '',
`dt` datetime NOT NULL
) ENGINE=OLAP
UNIQUE KEY(`id`)
DISTRIBUTED BY HASH(`id`) BUCKETS 2
PROPERTIES(
"replication_allocation" = "tag.location.default: 1"
);
"""
sql """
insert into test_cls values (1,'Alice','2023-06-01 12:00:00'),(2,'Bob','2023-06-02 12:00:00'),(3,'Carl','2023-05-01 14:00:00')
"""
sql """
SET enable_nereids_planner=false
"""
def result1 = try_sql """
select dt from test_cls where coalesce (dt, str_to_date(concat('202306', '01'), '%Y%m%d')) >= '2023-06-01'
"""
assertEquals(result1.size(), 2);
def result11 = try_sql """
select dt from test_cls where coalesce (dt, dt, str_to_date(concat('202306', '01'), '%Y%m%d')) >= '2023-06-01'
"""
assertEquals(result11.size(), 2);
def result12 = 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-01'
"""
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 """
admin set frontend config ("enable_date_conversion"="true")
"""
sql """
admin set frontend config ("disable_datev1"="true")
"""
sql """
drop table if exists test_cls_dtv2
"""
sql """
CREATE TABLE `test_cls_dtv2` (
`id` int(11) NOT NULL COMMENT '',
`name` varchar(32) NOT NULL COMMENT '',
`dt` datetime NOT NULL
) ENGINE=OLAP
UNIQUE KEY(`id`)
DISTRIBUTED BY HASH(`id`) BUCKETS 2
PROPERTIES(
"replication_allocation" = "tag.location.default: 1"
);
"""
sql """
insert into test_cls_dtv2 values (1,'Alice','2023-06-01 12:00:00'),(2,'Bob','2023-06-02 12:00:00'),(3,'Carl','2023-05-01 14:00:00')
"""
sql """
SET enable_nereids_planner=false
"""
def result2 = try_sql """
select dt from test_cls_dtv2 where coalesce (dt, str_to_date(concat('202306', '01'), '%Y%m%d')) >= '2023-06-01'
"""
assertEquals(result2.size(), 2);
def result21 = try_sql """
select dt from test_cls_dtv2 where coalesce (dt, dt, str_to_date(concat('202306', '01'), '%Y%m%d')) >= '2023-06-01'
"""
assertEquals(result21.size(), 2);
def result22 = 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-01'
"""
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
"""
sql """
drop table test_cls_dtv2
"""
sql """
admin set frontend config ("disable_datev1"="false")
"""
sql """
admin set frontend config ("enable_date_conversion"="true")
"""
}