Skip to content
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

Jump to bottom

[Feat](nereids) add pull up literal when infer predicates #37314

Merged
merged 9 commits into from
Jul 17, 2024
Merged

[Feat](nereids) add pull up literal when infer predicates #37314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9aee00
[Feat](nereids) add pull up literal when infer predicates
feiniaofeiafei Jul 4, 2024
7b7412e
[Feat](nereids) add pull up literal when infer predicates
feiniaofeiafei Jul 4, 2024
cc6707b
[Feat](nereids) add pull up literal when infer predicates cases
feiniaofeiafei Jul 9, 2024
1c8a008
[Feat](nereids) add pull up literal when infer predicates cases
feiniaofeiafei Jul 14, 2024
10511d6
[Feat](nereids) add pull up literal when infer predicates
feiniaofeiafei Jul 15, 2024
4cb391c
add feut
feiniaofeiafei Jul 15, 2024
c1db34b
fix regression
feiniaofeiafei Jul 16, 2024
7ba966a
fix regression
feiniaofeiafei Jul 16, 2024
8175ff5
fix regression
feiniaofeiafei Jul 17, 2024
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
7 changes: 7 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/PullUpPredicates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
package org.apache.doris.nereids.rules.rewrite;

import org.apache.doris.nereids.trees.expressions.Alias;
import org.apache.doris.nereids.trees.expressions.EqualTo;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.NamedExpression;
import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.expressions.functions.agg.AggregateFunction;
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate;
import org.apache.doris.nereids.trees.plans.logical.LogicalFilter;
Expand Down Expand Up @@ -91,6 +93,11 @@ public ImmutableSet<Expression> visitLogicalProject(LogicalProject<? extends Pla
allPredicates.add(childPredicate.rewriteDownShortCircuit(c -> c.equals(v) ? k : c));
}
}
for (NamedExpression expr : project.getProjects()) {
if (expr instanceof Alias && expr.child(0) instanceof Literal) {
allPredicates.add(new EqualTo(expr.toSlot(), expr.child(0)));
}
}
return getAvailableExpressions(allPredicates, project);
});
}
Expand Down
22 changes: 21 additions & 1 deletion fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/InferPredicatesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ void innerJoinShouldNotInferUnderLeftJoinOnClausePredicates() {
PlanChecker.from(connectContext)
.analyze(sql)
.rewrite()
.matches(
.matches(logicalProject(
logicalJoin(
logicalFilter(
logicalOlapScan()
Expand All @@ -623,6 +623,26 @@ void innerJoinShouldNotInferUnderLeftJoinOnClausePredicates() {
&& filter.getPredicate().toSql().contains("id = 2")),
any()
).when(join -> join.getJoinType() == JoinType.LEFT_OUTER_JOIN)
));
}

@Test
void inferPredicateByConstValue() {
String sql = "select c1 from (select 1 c1 from student) t inner join score t2 on t.c1=t2.sid";
PlanChecker.from(connectContext).analyze(sql).rewrite().printlnTree();
PlanChecker.from(connectContext)
.analyze(sql)
.rewrite()
.matches(logicalProject(
logicalJoin(any(),
logicalProject(
logicalFilter(
logicalOlapScan()
).when(filter -> filter.getConjuncts().size() == 1
&& ExpressionUtils.isInferred(filter.getPredicate())
&& filter.getPredicate().toSql().contains("sid = 1"))
)
))
);
}
}
Loading
Loading