[chore](Nereids): rename pushdown to push_down (#27473)

apache · Nov 23, 2023 · d73b945 · d73b945
1 parent d04a2de
commit d73b945
Show file tree

Hide file tree

Showing 53 changed files with 255 additions and 250 deletions.
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
@@ -91,14 +91,14 @@
 import org.apache.doris.nereids.rules.rewrite.PullUpProjectUnderTopN;
 import org.apache.doris.nereids.rules.rewrite.PushConjunctsIntoEsScan;
 import org.apache.doris.nereids.rules.rewrite.PushConjunctsIntoJdbcScan;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughProject;
+import org.apache.doris.nereids.rules.rewrite.PushDownLimit;
+import org.apache.doris.nereids.rules.rewrite.PushDownLimitDistinctThroughJoin;
+import org.apache.doris.nereids.rules.rewrite.PushDownTopNThroughJoin;
+import org.apache.doris.nereids.rules.rewrite.PushDownTopNThroughWindow;
 import org.apache.doris.nereids.rules.rewrite.PushFilterInsideJoin;
 import org.apache.doris.nereids.rules.rewrite.PushProjectIntoOneRowRelation;
 import org.apache.doris.nereids.rules.rewrite.PushProjectThroughUnion;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughProject;
-import org.apache.doris.nereids.rules.rewrite.PushdownLimit;
-import org.apache.doris.nereids.rules.rewrite.PushdownLimitDistinctThroughJoin;
-import org.apache.doris.nereids.rules.rewrite.PushdownTopNThroughJoin;
-import org.apache.doris.nereids.rules.rewrite.PushdownTopNThroughWindow;
 import org.apache.doris.nereids.rules.rewrite.ReorderJoin;
 import org.apache.doris.nereids.rules.rewrite.RewriteCteChildren;
 import org.apache.doris.nereids.rules.rewrite.SemiJoinCommute;
@@ -152,7 +152,7 @@ public class Rewriter extends AbstractBatchJobExecutor {
                     // after doing NormalizeAggregate in analysis job
                     // we need run the following 2 rules to make AGG_SCALAR_SUBQUERY_TO_WINDOW_FUNCTION work
                     bottomUp(new PullUpProjectUnderApply()),
-                    topDown(new PushdownFilterThroughProject()),
+                    topDown(new PushDownFilterThroughProject()),
                     custom(RuleType.AGG_SCALAR_SUBQUERY_TO_WINDOW_FUNCTION,
                             AggScalarSubQueryToWindowFunction::new),
                     bottomUp(
@@ -236,13 +236,13 @@ public class Rewriter extends AbstractBatchJobExecutor {
                     topDown(new ConvertInnerOrCrossJoin())
             ),
             topic("LEADING JOIN",
-                bottomUp(
-                    new CollectJoinConstraint()
-                ),
-                custom(RuleType.LEADING_JOIN, LeadingJoin::new),
-                bottomUp(
-                    new ExpressionRewrite(CheckLegalityAfterRewrite.INSTANCE)
-                )
+                    bottomUp(
+                            new CollectJoinConstraint()
+                    ),
+                    custom(RuleType.LEADING_JOIN, LeadingJoin::new),
+                    bottomUp(
+                            new ExpressionRewrite(CheckLegalityAfterRewrite.INSTANCE)
+                    )
             ),
             topic("Column pruning and infer predicate",
                     custom(RuleType.COLUMN_PRUNING, ColumnPruning::new),
@@ -272,8 +272,13 @@ public class Rewriter extends AbstractBatchJobExecutor {
                     topDown(new BuildAggForUnion())
             ),
 
-            // topic("Distinct",
-            //         costBased(custom(RuleType.PUSH_DOWN_DISTINCT_THROUGH_JOIN, PushdownDistinctThroughJoin::new))
+            // topic("Eager aggregation",
+            //         topDown(
+            //                 new PushDownSumThroughJoin(),
+            //                 new PushDownMinMaxThroughJoin(),
+            //                 new PushDownCountThroughJoin()
+            //         ),
+            //         custom(RuleType.PUSH_DOWN_DISTINCT_THROUGH_JOIN, PushDownDistinctThroughJoin::new)
             // ),
 
             topic("Limit optimization",
@@ -284,10 +289,10 @@ public class Rewriter extends AbstractBatchJobExecutor {
                     topDown(new LimitSortToTopN()),
                     topDown(new SplitLimit()),
                     topDown(
-                            new PushdownLimit(),
-                            new PushdownTopNThroughJoin(),
-                            new PushdownLimitDistinctThroughJoin(),
-                            new PushdownTopNThroughWindow()
+                            new PushDownLimit(),
+                            new PushDownTopNThroughJoin(),
+                            new PushDownLimitDistinctThroughJoin(),
+                            new PushDownTopNThroughWindow()
                     ),
                     topDown(new CreatePartitionTopNFromWindow()),
                     topDown(
@@ -310,7 +315,7 @@ public class Rewriter extends AbstractBatchJobExecutor {
                             new SelectMaterializedIndexWithAggregate(),
                             new SelectMaterializedIndexWithoutAggregate(),
                             new EliminateFilter(),
-                            new PushdownFilterThroughProject(),
+                            new PushDownFilterThroughProject(),
                             new MergeProjects(),
                             new PruneOlapScanTablet()
                     ),
@@ -330,7 +335,7 @@ public class Rewriter extends AbstractBatchJobExecutor {
             topic("Final rewrite and check",
                     custom(RuleType.CHECK_DATA_TYPES, CheckDataTypes::new),
                     custom(RuleType.ENSURE_PROJECT_ON_TOP_JOIN, EnsureProjectOnTopJoin::new),
-                    topDown(new PushdownFilterThroughProject(), new MergeProjects()),
+                    topDown(new PushDownFilterThroughProject(), new MergeProjects()),
                     custom(RuleType.ADJUST_CONJUNCTS_RETURN_TYPE, AdjustConjunctsReturnType::new),
                     bottomUp(
                             new ExpressionRewrite(CheckLegalityAfterRewrite.INSTANCE),
@@ -378,8 +383,8 @@ public static Rewriter getWholeTreeRewriterWithCustomJobs(CascadesContext cascad
 
     private static List<RewriteJob> getWholeTreeRewriteJobs(boolean withCostBased) {
         List<RewriteJob> withoutCostBased = Rewriter.CTE_CHILDREN_REWRITE_JOBS.stream()
-                    .filter(j -> !(j instanceof CostBasedRewriteJob))
-                    .collect(Collectors.toList());
+                .filter(j -> !(j instanceof CostBasedRewriteJob))
+                .collect(Collectors.toList());
         return getWholeTreeRewriteJobs(withCostBased ? CTE_CHILDREN_REWRITE_JOBS : withoutCostBased);
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/PlanPostProcessors.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/PlanPostProcessors.java
@@ -58,7 +58,7 @@ public PhysicalPlan process(PhysicalPlan physicalPlan) {
     public List<PlanPostProcessor> getProcessors() {
         // add processor if we need
         Builder<PlanPostProcessor> builder = ImmutableList.builder();
-        builder.add(new PushdownFilterThroughProject());
+        builder.add(new PushDownFilterThroughProject());
         builder.add(new MergeProjectPostProcessor());
         builder.add(new RecomputeLogicalPropertiesProcessor());
         builder.add(new TopNScanOpt());

diff --git a/...or/post/PushdownFilterThroughProject.java → ...or/post/PushDownFilterThroughProject.java b/...or/post/PushdownFilterThroughProject.java → ...or/post/PushDownFilterThroughProject.java
@@ -27,7 +27,7 @@
 /**
  * merge consecutive projects
  */
-public class PushdownFilterThroughProject extends PlanPostProcessor {
+public class PushDownFilterThroughProject extends PlanPostProcessor {
     @Override
     public Plan visitPhysicalFilter(PhysicalFilter<? extends Plan> filter, CascadesContext context) {
         Plan child = filter.child();

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java
@@ -36,8 +36,8 @@
 import org.apache.doris.nereids.rules.exploration.join.OuterJoinAssocProject;
 import org.apache.doris.nereids.rules.exploration.join.OuterJoinLAsscom;
 import org.apache.doris.nereids.rules.exploration.join.OuterJoinLAsscomProject;
-import org.apache.doris.nereids.rules.exploration.join.PushdownProjectThroughInnerOuterJoin;
-import org.apache.doris.nereids.rules.exploration.join.PushdownProjectThroughSemiJoin;
+import org.apache.doris.nereids.rules.exploration.join.PushDownProjectThroughInnerOuterJoin;
+import org.apache.doris.nereids.rules.exploration.join.PushDownProjectThroughSemiJoin;
 import org.apache.doris.nereids.rules.exploration.join.SemiJoinSemiJoinTranspose;
 import org.apache.doris.nereids.rules.exploration.join.SemiJoinSemiJoinTransposeProject;
 import org.apache.doris.nereids.rules.implementation.AggregateStrategies;
@@ -80,18 +80,18 @@
 import org.apache.doris.nereids.rules.rewrite.MergeGenerates;
 import org.apache.doris.nereids.rules.rewrite.MergeLimits;
 import org.apache.doris.nereids.rules.rewrite.MergeProjects;
-import org.apache.doris.nereids.rules.rewrite.PushdownAliasThroughJoin;
-import org.apache.doris.nereids.rules.rewrite.PushdownExpressionsInHashCondition;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughAggregation;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughJoin;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughPartitionTopN;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughProject;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughRepeat;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughSetOperation;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughSort;
-import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughWindow;
-import org.apache.doris.nereids.rules.rewrite.PushdownJoinOtherCondition;
-import org.apache.doris.nereids.rules.rewrite.PushdownProjectThroughLimit;
+import org.apache.doris.nereids.rules.rewrite.PushDownAliasThroughJoin;
+import org.apache.doris.nereids.rules.rewrite.PushDownExpressionsInHashCondition;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughAggregation;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughJoin;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughPartitionTopN;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughProject;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughRepeat;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughSetOperation;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughSort;
+import org.apache.doris.nereids.rules.rewrite.PushDownFilterThroughWindow;
+import org.apache.doris.nereids.rules.rewrite.PushDownJoinOtherCondition;
+import org.apache.doris.nereids.rules.rewrite.PushDownProjectThroughLimit;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
@@ -115,33 +115,33 @@ public class RuleSet {
             .add(SemiJoinSemiJoinTransposeProject.INSTANCE)
             .add(LogicalJoinSemiJoinTranspose.INSTANCE)
             .add(LogicalJoinSemiJoinTransposeProject.INSTANCE)
-            .add(PushdownProjectThroughInnerOuterJoin.INSTANCE)
-            .add(PushdownProjectThroughSemiJoin.INSTANCE)
+            .add(PushDownProjectThroughInnerOuterJoin.INSTANCE)
+            .add(PushDownProjectThroughSemiJoin.INSTANCE)
             .add(TransposeAggSemiJoin.INSTANCE)
             .add(TransposeAggSemiJoinProject.INSTANCE)
             .add(OrExpansion.INSTANCE)
             .build();
 
     public static final List<RuleFactory> PUSH_DOWN_FILTERS = ImmutableList.of(
             new CreatePartitionTopNFromWindow(),
-            new PushdownFilterThroughProject(),
-            new PushdownFilterThroughSort(),
-            new PushdownJoinOtherCondition(),
-            new PushdownFilterThroughJoin(),
-            new PushdownExpressionsInHashCondition(),
-            new PushdownFilterThroughAggregation(),
-            new PushdownFilterThroughRepeat(),
-            new PushdownFilterThroughSetOperation(),
-            new PushdownProjectThroughLimit(),
+            new PushDownFilterThroughProject(),
+            new PushDownFilterThroughSort(),
+            new PushDownJoinOtherCondition(),
+            new PushDownFilterThroughJoin(),
+            new PushDownExpressionsInHashCondition(),
+            new PushDownFilterThroughAggregation(),
+            new PushDownFilterThroughRepeat(),
+            new PushDownFilterThroughSetOperation(),
+            new PushDownProjectThroughLimit(),
             new EliminateOuterJoin(),
             new ConvertOuterJoinToAntiJoin(),
             new MergeProjects(),
             new MergeFilters(),
             new MergeGenerates(),
             new MergeLimits(),
-            new PushdownAliasThroughJoin(),
-            new PushdownFilterThroughWindow(),
-            new PushdownFilterThroughPartitionTopN()
+            new PushDownAliasThroughJoin(),
+            new PushDownFilterThroughWindow(),
+            new PushDownFilterThroughPartitionTopN()
     );
 
     public static final List<Rule> IMPLEMENTATION_RULES = planRuleFactories()

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleType.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleType.java
@@ -142,35 +142,35 @@ public enum RuleType {
     IN_APPLY_TO_JOIN(RuleTypeClass.REWRITE),
     EXISTS_APPLY_TO_JOIN(RuleTypeClass.REWRITE),
     // predicate push down rules
-    PUSHDOWN_JOIN_OTHER_CONDITION(RuleTypeClass.REWRITE),
-    PUSHDOWN_PREDICATE_THROUGH_AGGREGATION(RuleTypeClass.REWRITE),
-    PUSHDOWN_PREDICATE_THROUGH_REPEAT(RuleTypeClass.REWRITE),
-    PUSHDOWN_EXPRESSIONS_IN_HASH_CONDITIONS(RuleTypeClass.REWRITE),
+    PUSH_DOWN_JOIN_OTHER_CONDITION(RuleTypeClass.REWRITE),
+    PUSH_DOWN_PREDICATE_THROUGH_AGGREGATION(RuleTypeClass.REWRITE),
+    PUSH_DOWN_PREDICATE_THROUGH_REPEAT(RuleTypeClass.REWRITE),
+    PUSH_DOWN_EXPRESSIONS_IN_HASH_CONDITIONS(RuleTypeClass.REWRITE),
     // Pushdown filter
-    PUSHDOWN_FILTER_THROUGH_JOIN(RuleTypeClass.REWRITE),
-    PUSHDOWN_FILTER_THROUGH_LEFT_SEMI_JOIN(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_JOIN(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_LEFT_SEMI_JOIN(RuleTypeClass.REWRITE),
     PUSH_FILTER_INSIDE_JOIN(RuleTypeClass.REWRITE),
-    PUSHDOWN_FILTER_THROUGH_PROJECT(RuleTypeClass.REWRITE),
-    PUSHDOWN_FILTER_THROUGH_PROJECT_UNDER_LIMIT(RuleTypeClass.REWRITE),
-    PUSHDOWN_FILTER_THROUGH_WINDOW(RuleTypeClass.REWRITE),
-    PUSHDOWN_FILTER_THROUGH_PARTITION_TOPN(RuleTypeClass.REWRITE),
-    PUSHDOWN_PROJECT_THROUGH_LIMIT(RuleTypeClass.REWRITE),
-    PUSHDOWN_ALIAS_THROUGH_JOIN(RuleTypeClass.REWRITE),
-    PUSHDOWN_ALIAS_INTO_UNION_ALL(RuleTypeClass.REWRITE),
-    PUSHDOWN_FILTER_THROUGH_SET_OPERATION(RuleTypeClass.REWRITE),
-    PUSHDOWN_FILTER_THROUGH_SORT(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_PROJECT(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_PROJECT_UNDER_LIMIT(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_WINDOW(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_PARTITION_TOPN(RuleTypeClass.REWRITE),
+    PUSH_DOWN_PROJECT_THROUGH_LIMIT(RuleTypeClass.REWRITE),
+    PUSH_DOWN_ALIAS_THROUGH_JOIN(RuleTypeClass.REWRITE),
+    PUSH_DOWN_ALIAS_INTO_UNION_ALL(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_SET_OPERATION(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_SORT(RuleTypeClass.REWRITE),
 
-    PUSHDOWN_FILTER_THROUGH_CTE(RuleTypeClass.REWRITE),
-    PUSHDOWN_FILTER_THROUGH_CTE_ANCHOR(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_CTE(RuleTypeClass.REWRITE),
+    PUSH_DOWN_FILTER_THROUGH_CTE_ANCHOR(RuleTypeClass.REWRITE),
 
-    PUSHDOWN_DISTINCT_THROUGH_JOIN(RuleTypeClass.REWRITE),
+    PUSH_DOWN_DISTINCT_THROUGH_JOIN(RuleTypeClass.REWRITE),
 
     COLUMN_PRUNING(RuleTypeClass.REWRITE),
     ELIMINATE_SORT(RuleTypeClass.REWRITE),
 
-    PUSHDOWN_MIN_MAX_THROUGH_JOIN(RuleTypeClass.REWRITE),
-    PUSHDOWN_SUM_THROUGH_JOIN(RuleTypeClass.REWRITE),
-    PUSHDOWN_COUNT_THROUGH_JOIN(RuleTypeClass.REWRITE),
+    PUSH_DOWN_MIN_MAX_THROUGH_JOIN(RuleTypeClass.REWRITE),
+    PUSH_DOWN_SUM_THROUGH_JOIN(RuleTypeClass.REWRITE),
+    PUSH_DOWN_COUNT_THROUGH_JOIN(RuleTypeClass.REWRITE),
 
     TRANSPOSE_LOGICAL_SEMI_JOIN_LOGICAL_JOIN(RuleTypeClass.REWRITE),
     TRANSPOSE_LOGICAL_SEMI_JOIN_LOGICAL_JOIN_PROJECT(RuleTypeClass.REWRITE),
@@ -311,10 +311,10 @@ public enum RuleType {
     TRANSPOSE_LOGICAL_AGG_SEMI_JOIN(RuleTypeClass.EXPLORATION),
     TRANSPOSE_LOGICAL_AGG_SEMI_JOIN_PROJECT(RuleTypeClass.EXPLORATION),
     TRANSPOSE_LOGICAL_JOIN_UNION(RuleTypeClass.EXPLORATION),
-    PUSHDOWN_PROJECT_THROUGH_SEMI_JOIN_LEFT(RuleTypeClass.EXPLORATION),
-    PUSHDOWN_PROJECT_THROUGH_SEMI_JOIN_RIGHT(RuleTypeClass.EXPLORATION),
-    PUSHDOWN_PROJECT_THROUGH_INNER_OUTER_JOIN_LEFT(RuleTypeClass.EXPLORATION),
-    PUSHDOWN_PROJECT_THROUGH_INNER_OUTER_JOIN_RIGHT(RuleTypeClass.EXPLORATION),
+    PUSH_DOWN_PROJECT_THROUGH_SEMI_JOIN_LEFT(RuleTypeClass.EXPLORATION),
+    PUSH_DOWN_PROJECT_THROUGH_SEMI_JOIN_RIGHT(RuleTypeClass.EXPLORATION),
+    PUSH_DOWN_PROJECT_THROUGH_INNER_OUTER_JOIN_LEFT(RuleTypeClass.EXPLORATION),
+    PUSH_DOWN_PROJECT_THROUGH_INNER_OUTER_JOIN_RIGHT(RuleTypeClass.EXPLORATION),
     EAGER_COUNT(RuleTypeClass.EXPLORATION),
     EAGER_GROUP_BY(RuleTypeClass.EXPLORATION),
     EAGER_GROUP_BY_COUNT(RuleTypeClass.EXPLORATION),

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/OrExpansion.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/OrExpansion.java
@@ -21,7 +21,7 @@
 import org.apache.doris.nereids.CascadesContext;
 import org.apache.doris.nereids.rules.Rule;
 import org.apache.doris.nereids.rules.RuleType;
-import org.apache.doris.nereids.rules.rewrite.PushdownExpressionsInHashCondition;
+import org.apache.doris.nereids.rules.rewrite.PushDownExpressionsInHashCondition;
 import org.apache.doris.nereids.trees.expressions.Alias;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.NamedExpression;
@@ -178,7 +178,7 @@ private Plan expandLeftAntiJoin(CascadesContext ctx,
                 otherConditions, originJoin.getHint(),
                 originJoin.getMarkJoinSlotReference(), left, right);
         if (hashCond.children().stream().anyMatch(e -> !(e instanceof Slot))) {
-            Plan normalizedPlan = PushdownExpressionsInHashCondition.pushDownHashExpression(
+            Plan normalizedPlan = PushDownExpressionsInHashCondition.pushDownHashExpression(
                     (LogicalJoin<? extends Plan, ? extends Plan>) newPlan);
             newPlan = new LogicalProject<>(new ArrayList<>(newPlan.getOutput()), normalizedPlan);
         }
@@ -195,7 +195,7 @@ private Plan expandLeftAntiJoin(CascadesContext ctx,
                     new ArrayList<>(), originJoin.getHint(),
                     originJoin.getMarkJoinSlotReference(), newPlan, newRight);
             if (hashCond.children().stream().anyMatch(e -> !(e instanceof Slot))) {
-                newPlan = PushdownExpressionsInHashCondition.pushDownHashExpression(
+                newPlan = PushDownExpressionsInHashCondition.pushDownHashExpression(
                         (LogicalJoin<? extends Plan, ? extends Plan>) newPlan);
             }
         }
@@ -252,7 +252,7 @@ private List<Plan> expandInnerJoin(CascadesContext ctx, Pair<List<Expression>,
                     join.getMarkJoinSlotReference(), left, right);
             if (newJoin.getHashJoinConjuncts().stream()
                     .anyMatch(equalTo -> equalTo.children().stream().anyMatch(e -> !(e instanceof Slot)))) {
-                Plan plan = PushdownExpressionsInHashCondition.pushDownHashExpression(newJoin);
+                Plan plan = PushDownExpressionsInHashCondition.pushDownHashExpression(newJoin);
                 plan = new LogicalProject<>(new ArrayList<>(newJoin.getOutput()), plan);
                 joins.add(plan);
             } else {