Skip to content

[fix](constant folding) avoid folding non-comparable ordered literals #66830

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

Open
Baymine wants to merge 1 commit into
base: master
Choose a base branch
from
+64 −8
Open

[fix](constant folding) avoid folding non-comparable ordered literals #66830

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
30 changes: 22 additions & 8 deletions ...e/src/main/java/org/apache/doris/nereids/rules/expression/rules/FoldConstantRuleOnFE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,11 @@ public Expression visitGreaterThan(GreaterThan greaterThan, ExpressionRewriteCon
if (checkedExpr.isPresent()) {
return checkedExpr.get();
}
return BooleanLiteral.of(((ComparableLiteral) greaterThan.left())
.compareTo((ComparableLiteral) greaterThan.right()) > 0);
if (greaterThan.left() instanceof ComparableLiteral && greaterThan.right() instanceof ComparableLiteral) {
return BooleanLiteral.of(((ComparableLiteral) greaterThan.left())
.compareTo((ComparableLiteral) greaterThan.right()) > 0);
}
return greaterThan;
}

@Override
Expand All @@ -295,8 +298,12 @@ public Expression visitGreaterThanEqual(GreaterThanEqual greaterThanEqual, Expre
if (checkedExpr.isPresent()) {
return checkedExpr.get();
}
return BooleanLiteral.of(((ComparableLiteral) greaterThanEqual.left())
.compareTo((ComparableLiteral) greaterThanEqual.right()) >= 0);
if (greaterThanEqual.left() instanceof ComparableLiteral
&& greaterThanEqual.right() instanceof ComparableLiteral) {
return BooleanLiteral.of(((ComparableLiteral) greaterThanEqual.left())
.compareTo((ComparableLiteral) greaterThanEqual.right()) >= 0);
}
return greaterThanEqual;
}

@Override
Expand All @@ -306,8 +313,11 @@ public Expression visitLessThan(LessThan lessThan, ExpressionRewriteContext cont
if (checkedExpr.isPresent()) {
return checkedExpr.get();
}
return BooleanLiteral.of(((ComparableLiteral) lessThan.left())
.compareTo((ComparableLiteral) lessThan.right()) < 0);
if (lessThan.left() instanceof ComparableLiteral && lessThan.right() instanceof ComparableLiteral) {
return BooleanLiteral.of(((ComparableLiteral) lessThan.left())
.compareTo((ComparableLiteral) lessThan.right()) < 0);
}
return lessThan;
}

@Override
Expand All @@ -317,8 +327,12 @@ public Expression visitLessThanEqual(LessThanEqual lessThanEqual, ExpressionRewr
if (checkedExpr.isPresent()) {
return checkedExpr.get();
}
return BooleanLiteral.of(((ComparableLiteral) lessThanEqual.left())
.compareTo((ComparableLiteral) lessThanEqual.right()) <= 0);
if (lessThanEqual.left() instanceof ComparableLiteral
&& lessThanEqual.right() instanceof ComparableLiteral) {
return BooleanLiteral.of(((ComparableLiteral) lessThanEqual.left())
.compareTo((ComparableLiteral) lessThanEqual.right()) <= 0);
}
return lessThanEqual;
}

@Override
Expand Down
42 changes: 42 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/FoldConstantTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
import org.apache.doris.nereids.trees.expressions.Divide;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.GreaterThan;
import org.apache.doris.nereids.trees.expressions.GreaterThanEqual;
import org.apache.doris.nereids.trees.expressions.LessThan;
import org.apache.doris.nereids.trees.expressions.LessThanEqual;
import org.apache.doris.nereids.trees.expressions.Multiply;
import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.expressions.SlotReference;
Expand Down Expand Up @@ -115,6 +118,7 @@
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.trees.expressions.literal.NullLiteral;
import org.apache.doris.nereids.trees.expressions.literal.StringLiteral;
import org.apache.doris.nereids.trees.expressions.literal.TimeV2Literal;
import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral;
import org.apache.doris.nereids.trees.plans.RelationId;
Expand Down Expand Up @@ -265,6 +269,44 @@ void testNotPredicateFold() {
assertRewriteAfterTypeCoercion("not (1 + 5) / 2 + (10 - 1) * 3 > 3 * 5 + 1", "false");
}

@Test
void testComparisonFoldWithNonComparableLiteral() {
executor = new ExpressionRuleExecutor(ImmutableList.of(
bottomUp(FoldConstantRuleOnFE.VISITOR_INSTANCE)
));

Expression analyzed = ExpressionAnalyzer.analyzeFunction(null, null,
PARSER.parseExpression("curtime() >= '20:00:00'"));
Expression rewritten = executor.rewrite(analyzed, context);
Assertions.assertTrue(rewritten instanceof GreaterThanEqual);
Assertions.assertTrue(rewritten.child(0) instanceof TimeV2Literal);
Assertions.assertTrue(rewritten.child(1) instanceof TimeV2Literal);

analyzed = ExpressionAnalyzer.analyzeFunction(null, null,
PARSER.parseExpression("curtime() > '20:00:00'"));
rewritten = executor.rewrite(analyzed, context);
Assertions.assertTrue(rewritten instanceof GreaterThan);
Assertions.assertTrue(rewritten.child(0) instanceof TimeV2Literal);
Assertions.assertTrue(rewritten.child(1) instanceof TimeV2Literal);

analyzed = ExpressionAnalyzer.analyzeFunction(null, null,
PARSER.parseExpression("curtime() <= '20:00:00'"));
rewritten = executor.rewrite(analyzed, context);
Assertions.assertTrue(rewritten instanceof LessThanEqual);
Assertions.assertTrue(rewritten.child(0) instanceof TimeV2Literal);
Assertions.assertTrue(rewritten.child(1) instanceof TimeV2Literal);

analyzed = ExpressionAnalyzer.analyzeFunction(null, null,
PARSER.parseExpression("curtime() < '20:00:00'"));
rewritten = executor.rewrite(analyzed, context);
Assertions.assertTrue(rewritten instanceof LessThan);
Assertions.assertTrue(rewritten.child(0) instanceof TimeV2Literal);
Assertions.assertTrue(rewritten.child(1) instanceof TimeV2Literal);

assertRewriteAfterTypeCoercion("curtime() = '20:00:00'", "false");
assertRewriteAfterTypeCoercion("curtime() <=> '20:00:00'", "false");
}

@Test
void testCastFold() {
executor = new ExpressionRuleExecutor(ImmutableList.of(
Expand Down
Loading