Skip to content

[enhancement](Nereids) add type coercion between decimal and integral #12482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 1 commit into from
Sep 9, 2022
Merged

[enhancement](Nereids) add type coercion between decimal and integral #12482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/util/TypeCoercionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ public static boolean canHandleTypeCoercion(DataType leftType, DataType rightTyp
if (leftType instanceof NullType && rightType instanceof DecimalType) {
return true;
}
if (leftType instanceof DecimalType && rightType instanceof IntegralType
|| leftType instanceof IntegralType && rightType instanceof DecimalType) {
return true;
}
// TODO: add decimal promotion support
if (!(leftType instanceof DecimalType) && !(rightType instanceof DecimalType) && !leftType.equals(rightType)) {
return true;
Expand Down Expand Up @@ -189,6 +193,10 @@ public static Optional<DataType> findTightestCommonType(DataType left, DataType
}
} else if (left instanceof CharacterType || right instanceof CharacterType) {
tightestCommonType = StringType.INSTANCE;
} else if (left instanceof DecimalType && right instanceof IntegralType) {
tightestCommonType = DecimalType.widerDecimalType((DecimalType) left, DecimalType.forType(right));
} else if (left instanceof IntegralType && right instanceof DecimalType) {
tightestCommonType = DecimalType.widerDecimalType((DecimalType) right, DecimalType.forType(left));
}
return Optional.ofNullable(tightestCommonType);
}
Expand Down
35 changes: 35 additions & 0 deletions ...ore/src/test/java/org/apache/doris/nereids/rules/expression/rewrite/TypeCoercionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.doris.nereids.trees.expressions.Divide;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.InPredicate;
import org.apache.doris.nereids.trees.expressions.LessThanEqual;
import org.apache.doris.nereids.trees.expressions.WhenClause;
import org.apache.doris.nereids.trees.expressions.functions.Avg;
import org.apache.doris.nereids.trees.expressions.functions.Substring;
Expand All @@ -32,20 +33,25 @@
import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.BooleanLiteral;
import org.apache.doris.nereids.trees.expressions.literal.DateLiteral;
import org.apache.doris.nereids.trees.expressions.literal.DecimalLiteral;
import org.apache.doris.nereids.trees.expressions.literal.DoubleLiteral;
import org.apache.doris.nereids.trees.expressions.literal.IntegerLiteral;
import org.apache.doris.nereids.trees.expressions.literal.SmallIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.StringLiteral;
import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
import org.apache.doris.nereids.types.BigIntType;
import org.apache.doris.nereids.types.DecimalType;
import org.apache.doris.nereids.types.DoubleType;
import org.apache.doris.nereids.types.IntegerType;
import org.apache.doris.nereids.types.StringType;
import org.apache.doris.nereids.types.TinyIntType;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import java.math.BigDecimal;
import java.util.List;

public class TypeCoercionTest {
Expand Down Expand Up @@ -103,6 +109,35 @@ public void testAvgImplicitCast() {
assertRewrite(expected, expression);
}

@Test
public void testBinaryPredicate() {
Expression left = new DecimalLiteral(new BigDecimal(2.4));
Expression right = new TinyIntLiteral((byte) 2);
Expression lessThanEq = new LessThanEqual(left, right);
Expression rewrittenPred =
new LessThanEqual(
left,
new Cast(right, left.getDataType()));
assertRewrite(rewrittenPred, lessThanEq);

rewrittenPred =
new LessThanEqual(
new Cast(right, left.getDataType()),
left
);
lessThanEq = new LessThanEqual(right, left);
assertRewrite(rewrittenPred, lessThanEq);

left = new DecimalLiteral(new BigDecimal(1));
lessThanEq = new LessThanEqual(left, right);
rewrittenPred =
new LessThanEqual(
new Cast(left, DecimalType.forType(TinyIntType.INSTANCE)),
new Cast(right, DecimalType.forType(TinyIntType.INSTANCE))
);
assertRewrite(rewrittenPred, lessThanEq);
}

@Test
public void testCaseWhenTypeCoercion() {
WhenClause actualWhenClause1 = new WhenClause(new BooleanLiteral(true), new SmallIntLiteral((short) 1));
Expand Down
4 changes: 2 additions & 2 deletions fe/fe-core/src/test/java/org/apache/doris/nereids/util/TypeCoercionUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ public void testCanHandleTypeCoercion() {
Assertions.assertTrue(TypeCoercionUtils.canHandleTypeCoercion(decimalType, nullType));
Assertions.assertTrue(TypeCoercionUtils.canHandleTypeCoercion(nullType, decimalType));
Assertions.assertTrue(TypeCoercionUtils.canHandleTypeCoercion(smallIntType, integerType));
Assertions.assertFalse(TypeCoercionUtils.canHandleTypeCoercion(integerType, decimalType));
Assertions.assertFalse(TypeCoercionUtils.canHandleTypeCoercion(decimalType, integerType));
Assertions.assertTrue(TypeCoercionUtils.canHandleTypeCoercion(integerType, decimalType));
Assertions.assertTrue(TypeCoercionUtils.canHandleTypeCoercion(decimalType, integerType));
Assertions.assertFalse(TypeCoercionUtils.canHandleTypeCoercion(integerType, integerType));
}

Expand Down