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

[fix](datatype) fixed decimal type implicit cast handling in BinaryPredicate (#30181)

Browse Source
This commit is contained in:
Nitin-Kashyap
2024-01-24 07:27:23 +05:30
committed by yiguolei
parent 79d178ca54
commit f85b04c2c6
3 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java
View File

@ -1674,10 +1674,19 @@ public abstract class Expr extends TreeNode<Expr> implements ParseNode, Cloneabl
Type t2 = getChild(1).getType();
// add operand casts
Preconditions.checkState(compatibleType.isValid());
if (t1.getPrimitiveType() != compatibleType.getPrimitiveType()) {
if (t1.isDecimalV3() || t1.isDecimalV2()) {
if (!t1.equals(compatibleType)) {
castChild(compatibleType, 0);
}
} else if (t1.getPrimitiveType() != compatibleType.getPrimitiveType()) {
castChild(compatibleType, 0);
}
if (t2.getPrimitiveType() != compatibleType.getPrimitiveType()) {
if (t2.isDecimalV3() || t2.isDecimalV2()) {
if (!t2.equals(compatibleType)) {
castChild(compatibleType, 1);
}
} else if (t2.getPrimitiveType() != compatibleType.getPrimitiveType()) {
castChild(compatibleType, 1);
}
return compatibleType;

19
regression-test/data/datatype_p0/decimalv3/test_predicate_with_implicit_cast.out Normal file
View File

@ -0,0 +1,19 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !decimalv3_1 --
5.7 5.70 5.70
-- !decimalv3_2 --
5.7 5.70 5.70
-- !decimalv3_3 --
5.7 5.70 5.70
-- !decimalv3_1 --
5.7 5.70 5.70
-- !decimalv3_2 --
5.7 5.70 5.70
-- !decimalv3_3 --
5.7 5.70 5.70

71
regression-test/suites/datatype_p0/decimalv3/test_predicate_with_implicit_cast.groovy Normal file
View File

@ -0,0 +1,71 @@
// 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_predicate_with_implicit_cast") {
def tableName1 = "test_decimalv3_to_decimalv3_1"
def tableName2 = "test_decimalv3_to_decimalv3_2"
def prepare_test_decimalV3_to_decimalV3 = {
sql "drop table if exists ${tableName1};"
sql """
create table ${tableName1}(
a DECIMAL(2, 1),
b DECIMAL(3, 2)
)
ENGINE=OLAP
DUPLICATE KEY(a) COMMENT "OLAP"
DISTRIBUTED BY HASH(a) BUCKETS auto
PROPERTIES ( "replication_num" = "1" );
"""
sql "drop table if exists ${tableName2};"
sql """
create table ${tableName2}(
c DECIMAL(3, 2)
)
ENGINE=OLAP
DUPLICATE KEY(c) COMMENT "OLAP"
DISTRIBUTED BY HASH(c) BUCKETS auto
PROPERTIES ( "replication_num" = "1" );
"""
}
def q01 = {
qt_decimalv3_1 "SELECT * FROM ${tableName1}, ${tableName2} WHERE a=c;"
qt_decimalv3_2 "SELECT * FROM ${tableName1}, ${tableName2} WHERE a IN (c);"
qt_decimalv3_3 "SELECT * FROM ${tableName1}, ${tableName2} WHERE cast(a as DecimalV3(3,2))=c;"
}
prepare_test_decimalV3_to_decimalV3()
sql """
insert into ${tableName1} values (5.7, 5.70);
"""
sql """
insert into ${tableName2} values(5.70);
"""
sql """set enable_fallback_to_original_planner=false;"""
// with nereids planner
q01()
sql """set enable_nereids_planner=false;"""
// with legacy planner
q01()
}