left zig zag

englefly · Nov 3, 2023 · 188001d · 188001d
1 parent eb24f51
commit 188001d
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 33 deletions.
diff --git a/...core/src/main/java/org/apache/doris/nereids/jobs/cascades/OptimizeGroupExpressionJob.java b/...core/src/main/java/org/apache/doris/nereids/jobs/cascades/OptimizeGroupExpressionJob.java
@@ -71,22 +71,22 @@ private List<Rule> getExplorationRules() {
                 .getSessionVariable().isEnableLeftZigZag();
         int joinNumBushyTree = context.getCascadesContext().getConnectContext()
                 .getSessionVariable().getMaxJoinNumBushyTree();
-       if (isDisableJoinReorder) {
-           return Collections.emptyList();
-       } else if (enableLeftZigZag) {
-           return getRuleSet().getLeftZigZagTreeJoinReorder();
-       } else if (isDpHyp) {
-           if (isOtherJoinReorder) {
-               return getRuleSet().getDPHypReorderRules();
-           } else {
-               return Collections.emptyList();
-           }
-       } else if (isEnableBushyTree) {
-           return getRuleSet().getBushyTreeJoinReorder();
-       } else if (context.getCascadesContext().getStatementContext().getMaxNAryInnerJoin() <= joinNumBushyTree) {
-           return getRuleSet().getBushyTreeJoinReorder();
-       } else {
-           return getRuleSet().getZigZagTreeJoinReorder();
-       }
+        if (isDisableJoinReorder) {
+            return Collections.emptyList();
+        } else if (enableLeftZigZag) {
+            return getRuleSet().getLeftZigZagTreeJoinReorder();
+        } else if (isDpHyp) {
+            if (isOtherJoinReorder) {
+                return getRuleSet().getDPHypReorderRules();
+            } else {
+                return Collections.emptyList();
+            }
+        } else if (isEnableBushyTree) {
+            return getRuleSet().getBushyTreeJoinReorder();
+        } else if (context.getCascadesContext().getStatementContext().getMaxNAryInnerJoin() <= joinNumBushyTree) {
+            return getRuleSet().getBushyTreeJoinReorder();
+        } else {
+            return getRuleSet().getZigZagTreeJoinReorder();
+        }
     }
 }
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
@@ -181,10 +181,10 @@ public class RuleSet {
             .build();
 
     public static final List<Rule> LEFT_ZIG_ZAG_TREE_JOIN_REORDER = planRuleFactories()
-        .add(JoinCommute.LEFT_ZIG_ZAG)
-        .add(InnerJoinLAsscom.INSTANCE)
-        .add(InnerJoinLAsscomProject.INSTANCE)
-        .build();
+            .add(JoinCommute.LEFT_ZIG_ZAG)
+            .add(InnerJoinLAsscom.LEFT_ZIG_ZAG)
+            .add(InnerJoinLAsscomProject.LEFT_ZIG_ZAG)
+            .build();
 
     public static final List<Rule> ZIG_ZAG_TREE_JOIN_REORDER = planRuleFactories()
             .add(JoinCommute.ZIG_ZAG)

diff --git a/...-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/InnerJoinLAsscom.java b/...-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/InnerJoinLAsscom.java
@@ -36,7 +36,13 @@
  * Rule for change inner join LAsscom (associative and commutive).
  */
 public class InnerJoinLAsscom extends OneExplorationRuleFactory {
-    public static final InnerJoinLAsscom INSTANCE = new InnerJoinLAsscom();
+    public static final InnerJoinLAsscom INSTANCE = new InnerJoinLAsscom(false);
+    public static final InnerJoinLAsscom LEFT_ZIG_ZAG = new InnerJoinLAsscom(true);
+    private boolean leftZigZag = false;
+
+    public InnerJoinLAsscom(boolean leftZigZag) {
+        this.leftZigZag = leftZigZag;
+    }
 
     /*
      *      topJoin                newTopJoin
@@ -48,7 +54,7 @@ public class InnerJoinLAsscom extends OneExplorationRuleFactory {
     @Override
     public Rule build() {
         return innerLogicalJoin(innerLogicalJoin(), group())
-                .when(topJoin -> checkReorder(topJoin, topJoin.left()))
+                .when(topJoin -> checkReorder(topJoin, topJoin.left(), leftZigZag))
                 .whenNot(join -> join.hasJoinHint() || join.left().hasJoinHint())
                 .whenNot(join -> join.isMarkJoin() || join.left().isMarkJoin())
                 .then(topJoin -> {
@@ -85,13 +91,22 @@ public Rule build() {
                 }).toRule(RuleType.LOGICAL_INNER_JOIN_LASSCOM);
     }
 
+    /**
+     * trigger rule condition
+     */
     public static boolean checkReorder(LogicalJoin<? extends Plan, GroupPlan> topJoin,
-            LogicalJoin<GroupPlan, GroupPlan> bottomJoin) {
-        double bRows = bottomJoin.right().getGroup().getStatistics().getRowCount();
-        double cRows = topJoin.right().getGroup().getStatistics().getRowCount();
-        return bRows < cRows && !bottomJoin.getJoinReorderContext().hasCommuteZigZag()
-                && !topJoin.getJoinReorderContext().hasLAsscom()
-                && (!bottomJoin.isMarkJoin() && !topJoin.isMarkJoin());
+            LogicalJoin<GroupPlan, GroupPlan> bottomJoin, boolean leftZigZag) {
+        if (leftZigZag) {
+            double bRows = bottomJoin.right().getGroup().getStatistics().getRowCount();
+            double cRows = topJoin.right().getGroup().getStatistics().getRowCount();
+            return bRows < cRows && !bottomJoin.getJoinReorderContext().hasCommuteZigZag()
+                    && !topJoin.getJoinReorderContext().hasLAsscom()
+                    && (!bottomJoin.isMarkJoin() && !topJoin.isMarkJoin());
+        } else {
+            return !bottomJoin.getJoinReorderContext().hasCommuteZigZag()
+                    && !topJoin.getJoinReorderContext().hasLAsscom()
+                    && (!bottomJoin.isMarkJoin() && !topJoin.isMarkJoin());
+        }
     }
 
     /**

diff --git a/...rc/main/java/org/apache/doris/nereids/rules/exploration/join/InnerJoinLAsscomProject.java b/...rc/main/java/org/apache/doris/nereids/rules/exploration/join/InnerJoinLAsscomProject.java
@@ -40,8 +40,13 @@
  * Rule for change inner join LAsscom (associative and commutive).
  */
 public class InnerJoinLAsscomProject extends OneExplorationRuleFactory {
-    public static final InnerJoinLAsscomProject INSTANCE = new InnerJoinLAsscomProject();
+    public static final InnerJoinLAsscomProject INSTANCE = new InnerJoinLAsscomProject(false);
+    public static final InnerJoinLAsscomProject LEFT_ZIG_ZAG = new InnerJoinLAsscomProject(true);
+    private final boolean leftZigZag;
 
+    public InnerJoinLAsscomProject(boolean leftZigZag) {
+        this.leftZigZag = leftZigZag;
+    }
     /*
      *        topJoin                   newTopJoin
      *        /     \                   /        \
@@ -51,10 +56,11 @@ public class InnerJoinLAsscomProject extends OneExplorationRuleFactory {
      *    /   \                     /   \
      *   A     B                   A     C
      */
+
     @Override
     public Rule build() {
         return innerLogicalJoin(logicalProject(innerLogicalJoin()), group())
-                .when(topJoin -> InnerJoinLAsscom.checkReorder(topJoin, topJoin.left().child()))
+                .when(topJoin -> InnerJoinLAsscom.checkReorder(topJoin, topJoin.left().child(), leftZigZag))
                 .whenNot(join -> join.hasJoinHint() || join.left().child().hasJoinHint())
                 .whenNot(join -> join.isMarkJoin() || join.left().child().isMarkJoin())
                 .when(join -> join.left().isAllSlots())

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinCommute.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinCommute.java
@@ -87,7 +87,7 @@ public static boolean check(SwapType swapType, LogicalJoin<GroupPlan, GroupPlan>
         }
 
         if (swapType == SwapType.LEFT_ZIG_ZAG) {
-            double leftRows= join.left().getGroup().getStatistics().getRowCount();
+            double leftRows = join.left().getGroup().getStatistics().getRowCount();
             double rightRows = join.right().getGroup().getStatistics().getRowCount();
             return leftRows < rightRows && isZigZagJoin(join);
         }

diff --git a/...ava/org/apache/doris/nereids/rules/exploration/join/SemiJoinSemiJoinTransposeProject.java b/...ava/org/apache/doris/nereids/rules/exploration/join/SemiJoinSemiJoinTransposeProject.java
@@ -53,7 +53,7 @@ public class SemiJoinSemiJoinTransposeProject extends OneExplorationRuleFactory
     public Rule build() {
         return logicalJoin(logicalProject(logicalJoin()), group())
                 .when(this::typeChecker)
-                .when(topSemi -> InnerJoinLAsscom.checkReorder(topSemi, topSemi.left().child()))
+                .when(topSemi -> InnerJoinLAsscom.checkReorder(topSemi, topSemi.left().child(), false))
                 .whenNot(join -> join.hasJoinHint() || join.left().child().hasJoinHint())
                 .whenNot(join -> join.isMarkJoin() || join.left().child().isMarkJoin())
                 .when(join -> join.left().isAllSlots())