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

[fix](Nereids) result type of add precision is 1 more than expected (#27136)

Browse Source
This commit is contained in:
morrySnow
2023-11-17 18:13:09 +08:00
committed by GitHub
parent fdec286e82
commit fa7e1b7fc7
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Add.java
View File

@ -50,7 +50,7 @@ public class Add extends BinaryArithmetic implements CheckOverflowNullable {
@Override
public DecimalV3Type getDataTypeForDecimalV3(DecimalV3Type t1, DecimalV3Type t2) {
DecimalV3Type decimalV3Type = (DecimalV3Type) DecimalV3Type.widerDecimalV3Type(t1, t2, false);
return (DecimalV3Type) DecimalV3Type.createDecimalV3Type(decimalV3Type.getPrecision() + 1,
return DecimalV3Type.createDecimalV3Type(decimalV3Type.getPrecision() + 1,
decimalV3Type.getScale());
}

6
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/BinaryArithmetic.java
View File

@ -59,7 +59,11 @@ public abstract class BinaryArithmetic extends BinaryOperator implements Propaga
return getDataTypeForDecimalV2((DecimalV2Type) t1, (DecimalV2Type) t2);
}
if (t1.isDecimalV3Type() && t2.isDecimalV3Type()) {
return getDataTypeForDecimalV3((DecimalV3Type) t1, (DecimalV3Type) t2);
if (this instanceof Add || this instanceof Subtract || this instanceof Mod) {
return t1;
} else {
return getDataTypeForDecimalV3((DecimalV3Type) t1, (DecimalV3Type) t2);
}
}
return getDataTypeForOthers(t1, t2);
}

2
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Subtract.java
View File

@ -50,7 +50,7 @@ public class Subtract extends BinaryArithmetic implements CheckOverflowNullable
@Override
public DecimalV3Type getDataTypeForDecimalV3(DecimalV3Type t1, DecimalV3Type t2) {
DecimalV3Type decimalV3Type = (DecimalV3Type) DecimalV3Type.widerDecimalV3Type(t1, t2, false);
return (DecimalV3Type) DecimalV3Type.createDecimalV3Type(decimalV3Type.getPrecision() + 1,
return DecimalV3Type.createDecimalV3Type(decimalV3Type.getPrecision() + 1,
decimalV3Type.getScale());
}

12
regression-test/suites/nereids_arith_p0/decimal.groovy
View File

@ -2299,4 +2299,16 @@ suite('nereids_arith_p0_decimal') {
// select id, BITAND(kdcml128v3, kbool), BITOR(kdcml128v3, kbool), BITXOR(kdcml128v3, kbool) from expr_test order by id"""
// qt_sql_test_Decimal128V3_Boolean_notn_4 """
// select id, BITAND(kdcml128v3, kbool), BITOR(kdcml128v3, kbool), BITXOR(kdcml128v3, kbool) from expr_test_not_nullable order by id"""
// decimal add precision
sql """drop table if exists test_arithmetic_expressions"""
sql """
CREATE TABLE IF NOT EXISTS test_arithmetic_expressions (
`a` DECIMALV3(9, 3) NOT NULL,
`b` DECIMALV3(9, 3) NOT NULL
) DISTRIBUTED BY HASH(a) PROPERTIES("replication_num" = "1");
"""
sql "select a + b from test_arithmetic_expressions"
sql """drop table if exists test_arithmetic_expressions"""
}