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

[fix](Nereids): DefaultPlanRewriter visit plan children. (#21395)

Browse Source
This commit is contained in:
jakevin
2023-07-03 13:20:01 +08:00
committed by GitHub
parent 17af099dc3
commit 9fa2dac352
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/AggScalarSubQueryToWindowFunction.java
View File

@ -109,7 +109,8 @@ public class AggScalarSubQueryToWindowFunction extends DefaultPlanRewriter<JobCo
* is used to project apply output to original output, it is not affect this rule at all. so we ignore it.
*/
@Override
public Plan visitLogicalFilter(LogicalFilter<? extends Plan> filter, JobContext context) {
public Plan visitLogicalFilter(LogicalFilter<? extends Plan> plan, JobContext context) {
LogicalFilter<? extends Plan> filter = visitChildren(this, plan, context);
return findApply(filter)
.filter(a -> check(filter, a))
.map(a -> rewrite(filter, a))

1
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/EnsureProjectOnTopJoin.java
View File

@ -32,7 +32,6 @@ import java.util.stream.Collectors;
/**
* The rule add an explicit project at the top join to ensure the output of whole plan is stable
* and avoid generate circle in memo.
*
*/
public class EnsureProjectOnTopJoin extends DefaultPlanRewriter<Void> implements CustomRewriter {

4
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferPredicates.java
View File

@ -61,7 +61,7 @@ public class InferPredicates extends DefaultPlanRewriter<JobContext> implements
@Override
public Plan visitLogicalJoin(LogicalJoin<? extends Plan, ? extends Plan> join, JobContext context) {
join = (LogicalJoin<? extends Plan, ? extends Plan>) super.visit(join, context);
join = visitChildren(this, join, context);
Plan left = join.left();
Plan right = join.right();
Set<Expression> expressions = getAllExpressions(left, right, join.getOnClauseCondition());
@ -91,7 +91,7 @@ public class InferPredicates extends DefaultPlanRewriter<JobContext> implements
@Override
public Plan visitLogicalFilter(LogicalFilter<? extends Plan> filter, JobContext context) {
filter = (LogicalFilter<? extends Plan>) super.visit(filter, context);
filter = visitChildren(this, filter, context);
Set<Expression> filterPredicates = pullUpPredicates(filter);
filterPredicates.removeAll(pullUpPredicates(filter.child()));
filter.getConjuncts().forEach(filterPredicates::remove);