This is an automated email from the ASF dual-hosted git repository. jakevin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push: new ddcfba0368c [chore](Nereids): remove SemiJoinCommute in rewriter (#28563) ddcfba0368c is described below commit ddcfba0368c9273cc202622318c0db851251f08c Author: jakevin <jakevin...@gmail.com> AuthorDate: Mon Dec 18 20:47:17 2023 +0800 [chore](Nereids): remove SemiJoinCommute in rewriter (#28563) --- .../main/java/org/apache/doris/nereids/jobs/executor/Analyzer.java | 4 ++-- .../main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java | 2 -- .../nereids/rules/rewrite/{JoinCommute.java => SemiJoinCommute.java} | 2 +- .../java/org/apache/doris/nereids/rules/rewrite/ReorderJoinTest.java | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Analyzer.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Analyzer.java index b78cb093600..7f579f35336 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Analyzer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Analyzer.java @@ -43,7 +43,7 @@ import org.apache.doris.nereids.rules.analysis.ReplaceExpressionByChildOutput; import org.apache.doris.nereids.rules.analysis.ResolveOrdinalInOrderByAndGroupBy; import org.apache.doris.nereids.rules.analysis.SubqueryToApply; import org.apache.doris.nereids.rules.analysis.UserAuthentication; -import org.apache.doris.nereids.rules.rewrite.JoinCommute; +import org.apache.doris.nereids.rules.rewrite.SemiJoinCommute; import java.util.List; import java.util.Objects; @@ -124,7 +124,7 @@ public class Analyzer extends AbstractBatchJobExecutor { bottomUp(new CheckAnalysis()), topDown(new EliminateGroupByConstant()), topDown(new NormalizeAggregate()), - bottomUp(new JoinCommute()), + bottomUp(new SemiJoinCommute()), bottomUp( new CollectSubQueryAlias(), new CollectJoinConstraint() diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java index 10da21d7244..9104869387e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java @@ -73,7 +73,6 @@ import org.apache.doris.nereids.rules.rewrite.InferFilterNotNull; import org.apache.doris.nereids.rules.rewrite.InferJoinNotNull; import org.apache.doris.nereids.rules.rewrite.InferPredicates; import org.apache.doris.nereids.rules.rewrite.InferSetOperatorDistinct; -import org.apache.doris.nereids.rules.rewrite.JoinCommute; import org.apache.doris.nereids.rules.rewrite.LimitSortToTopN; import org.apache.doris.nereids.rules.rewrite.MergeFilters; import org.apache.doris.nereids.rules.rewrite.MergeOneRowRelationIntoUnion; @@ -229,7 +228,6 @@ public class Rewriter extends AbstractBatchJobExecutor { ), // push down SEMI Join bottomUp( - new JoinCommute(), new TransposeSemiJoinLogicalJoin(), new TransposeSemiJoinLogicalJoinProject(), new TransposeSemiJoinAgg(), diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/JoinCommute.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/SemiJoinCommute.java similarity index 96% rename from fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/JoinCommute.java rename to fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/SemiJoinCommute.java index 4611851787c..66557535721 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/JoinCommute.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/SemiJoinCommute.java @@ -27,7 +27,7 @@ import org.apache.doris.qe.ConnectContext; * RightAntiJoin -> LeftAntiJoin * RightOuterJoin -> LeftOuterJoin */ -public class JoinCommute extends OneRewriteRuleFactory { +public class SemiJoinCommute extends OneRewriteRuleFactory { @Override public Rule build() { return logicalJoin() diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/ReorderJoinTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/ReorderJoinTest.java index 9e7a1ed9ff7..770181c7ac3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/ReorderJoinTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/ReorderJoinTest.java @@ -124,6 +124,7 @@ class ReorderJoinTest implements MemoPatternMatchSupported { .filter(new EqualTo(scan3.getOutput().get(0), scan1.getOutput().get(0))) .build(); PlanChecker.from(MemoTestUtils.createConnectContext(), plan2) + .applyBottomUp(new SemiJoinCommute()) .rewrite() .matchesFromRoot( logicalProject( --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org