Skip to content

[fix](expr opt) Preserve cast boundaries during arithmetic simplification #67733

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

Draft
morrySnow wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −48
Draft

[fix](expr opt) Preserve cast boundaries during arithmetic simplification #67733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a9beb2
[fix](fe) Preserve cast boundaries during arithmetic simplification
morrySnow Sep 9, 2026
dd88b8b
[fix](regression) Isolate dialect session setting
morrySnow Sep 10, 2026
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
56 changes: 9 additions & 47 deletions ...src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyArithmeticRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.Add;
import org.apache.doris.nereids.trees.expressions.BinaryArithmetic;
import org.apache.doris.nereids.trees.expressions.Cast;
import org.apache.doris.nereids.trees.expressions.Divide;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.Multiply;
import org.apache.doris.nereids.trees.expressions.Subtract;
import org.apache.doris.nereids.types.DataType;
import org.apache.doris.nereids.util.TypeCoercionUtils;
import org.apache.doris.nereids.util.TypeUtils;
import org.apache.doris.nereids.util.Utils;
Expand Down Expand Up @@ -138,16 +136,13 @@ private static Expression process(BinaryArithmetic arithmetic, boolean isAddOrSu
// isAddOrSub: true for extract only "+" or "-" sub expressions, false for extract only "*" or "/" sub expressions
private static List<Operand> flatten(Expression expr, boolean isAddOrSub) {
List<Operand> result = Lists.newArrayList();
doFlatten(true, expr, isAddOrSub, result, Optional.empty());
doFlatten(true, expr, isAddOrSub, result);
return result;
}

// flag: true for '+' or '*', false for '-' or '/'
// isAddOrSub: true for extract only "+" or "-" sub expressions, false for extract only "*" or "/" sub expressions
private static void doFlatten(boolean flag, Expression expr, boolean isAddOrSub, List<Operand> result,
Optional<DataType> castType) {
// cast (a * 10 as double) * (cast 20 as double)
// => cast(a as double) * (cast 10 as double) * (cast 20 as double)
private static void doFlatten(boolean flag, Expression expr, boolean isAddOrSub, List<Operand> result) {
BinaryArithmetic arithmetic = null;
Predicate<Expression> isPositiveArithmetic = isAddOrSub
? TypeUtils::isAdd : TypeUtils::isMultiply;
Expand All @@ -156,52 +151,20 @@ private static void doFlatten(boolean flag, Expression expr, boolean isAddOrSub,
Predicate<Expression> isPosNegArithmetic = isPositiveArithmetic.or(isNegativeArithmetic);
if (isPosNegArithmetic.test(expr)) {
arithmetic = (BinaryArithmetic) expr;
} else if (expr instanceof Cast && hasConstantOperand(expr, isAddOrSub)) {
Cast cast = (Cast) expr;
if (isPosNegArithmetic.test(cast.child())) {
arithmetic = (BinaryArithmetic) cast.child();
castType = Optional.of(cast.getDataType());
}
}
if (arithmetic != null) {
doFlatten(flag, arithmetic.left(), isAddOrSub, result, castType);
doFlatten(flag, arithmetic.left(), isAddOrSub, result);
if (isNegativeArithmetic.test(arithmetic) && !flag) {
doFlatten(true, arithmetic.right(), isAddOrSub, result, castType);
doFlatten(true, arithmetic.right(), isAddOrSub, result);
} else if (isPositiveArithmetic.test(arithmetic) && !flag) {
doFlatten(false, arithmetic.right(), isAddOrSub, result, castType);
doFlatten(false, arithmetic.right(), isAddOrSub, result);
} else {
doFlatten(!isNegativeArithmetic.test(arithmetic), arithmetic.right(), isAddOrSub, result, castType);
doFlatten(!isNegativeArithmetic.test(arithmetic), arithmetic.right(), isAddOrSub, result);
}
} else {
if (castType.isPresent()) {
result.add(Operand.of(flag, TypeCoercionUtils.castIfNotSameType(expr, castType.get())));
} else {
result.add(Operand.of(flag, expr));
}
}
}

private static boolean hasConstantOperand(Expression expr, boolean isAddOrSub) {
if (expr.isConstant()) {
return true;
}

Predicate<Expression> checkArithmetic = isAddOrSub
? TypeUtils::isAddOrSubtract : TypeUtils::isMultiplyOrDivide;
BinaryArithmetic arithmetic = null;
if (checkArithmetic.test(expr)) {
arithmetic = (BinaryArithmetic) expr;
} else if (expr instanceof Cast) {
Cast cast = (Cast) expr;
if (checkArithmetic.test(cast.child())) {
arithmetic = (BinaryArithmetic) cast.child();
}
}
if (arithmetic != null) {
return hasConstantOperand(arithmetic.left(), isAddOrSub)
|| hasConstantOperand(arithmetic.right(), isAddOrSub);
} else {
return false;
// Keep non-arithmetic expressions atomic. In particular, moving a cast to the
// operands can change rounding, overflow, error and null behavior.
result.add(Operand.of(flag, expr));
}
}

Expand Down Expand Up @@ -241,4 +204,3 @@ public String toString() {
}
}
}

13 changes: 13 additions & 0 deletions ...e/src/test/java/org/apache/doris/nereids/rules/expression/SimplifyArithmeticRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,19 @@ void testSimplifyArithmeticRuleOnly() {
assertRewriteAfterSimplify("-IA / 2.0 * ((-IB - 1) - (3 + (IC + 4)))", "(((0 - IA) / 2.0) * (((0 - IB) - 1) - (3 + (IC + 4))))");
}

@Test
void testPreserveCastAroundArithmetic() {
executor = new ExpressionRuleExecutor(ImmutableList.of(
bottomUp(SimplifyArithmeticRule.INSTANCE)
));

String castExpression = "cast(LA - 9223372036854775800 as double) + cast(0 as double)";
assertRewriteAfterSimplify(castExpression, castExpression);

String tryCastExpression = "try_cast(LA - 9223372036854775800 as double) + cast(0 as double)";
assertRewriteAfterSimplify(tryCastExpression, tryCastExpression);
}

@Test
void testSimplifyArithmeticComparison() {
executor = new ExpressionRuleExecutor(ImmutableList.of(
Expand Down
2 changes: 1 addition & 1 deletion ...suites/external_table_p0/dialect_compatible/sql/presto/scalar/timestamp/TestOperators.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ SELECT TIMESTAMP '2020-05-01 12:34:56.123456789' BETWEEN TIMESTAMP '2020-05-01 1
SELECT TIMESTAMP '2020-05-01 12:34:56.1234567890' BETWEEN TIMESTAMP '2020-05-01 12:34:56.1234567889' and TIMESTAMP '2020-05-01 12:34:56.1234567891';
SELECT TIMESTAMP '2020-05-01 12:34:56.12345678901' BETWEEN TIMESTAMP '2020-05-01 12:34:56.1234567890' and TIMESTAMP '2020-05-01 12:34:56.12345678902';
SELECT TIMESTAMP '2020-05-01 12:34:56.123456789012' BETWEEN TIMESTAMP '2020-05-01 12:34:56.123456789011' and TIMESTAMP '2020-05-01 12:34:56.123456789013';
set debug_skip_fold_constant=true;
-- SELECT TIMESTAMP '2020-05-01 12:34:56' + INTERVAL '1.123' SECOND; # differ: doris : None, presto : 2020-05-01 12:34:57.123
-- SELECT TIMESTAMP '2020-05-01 12:34:56.1' + INTERVAL '1.123' SECOND; # differ: doris : None, presto : 2020-05-01 12:34:57.223
-- SELECT TIMESTAMP '2020-05-01 12:34:56.12' + INTERVAL '1.123' SECOND; # differ: doris : None, presto : 2020-05-01 12:34:57.243
Expand Down Expand Up @@ -389,7 +390,6 @@ SELECT TIMESTAMP '2020-05-01 12:34:56.123456789012' BETWEEN TIMESTAMP '2020-05-0
-- SELECT TIMESTAMP '2020-05-01 12:34:55.1111111111' - TIMESTAMP '2020-05-01 12:34:56.9999999999'; # differ: doris : -2, presto : -0 00:00:01.889
-- SELECT TIMESTAMP '2020-05-01 12:34:55.11111111111' - TIMESTAMP '2020-05-01 12:34:56.99999999999'; # differ: doris : -2, presto : -0 00:00:01.889
-- SELECT TIMESTAMP '2020-05-01 12:34:55.111111111111' - TIMESTAMP '2020-05-01 12:34:56.999999999999'; # differ: doris : -2, presto : -0 00:00:01.889
set debug_skip_fold_constant=true;
SELECT TIMESTAMP '2020-05-01 12:34:56' = TIMESTAMP '2020-05-01 12:34:56';
SELECT TIMESTAMP '2020-05-01 12:34:56.1' = TIMESTAMP '2020-05-01 12:34:56.1';
SELECT TIMESTAMP '2020-05-01 12:34:56.12' = TIMESTAMP '2020-05-01 12:34:56.12';
Expand Down
Loading