fmt

englefly · Nov 8, 2023 · 93dd5ad · 93dd5ad
1 parent 1619589
commit 93dd5ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 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
@@ -73,14 +73,14 @@ private List<Rule> getExplorationRules() {
                 .getSessionVariable().getMaxJoinNumBushyTree();
         if (isDisableJoinReorder) {
             return Collections.emptyList();
-        } else if (enableLeftZigZag || !groupExpression.getOwnerGroup().isStatsReliable()) {
-            return getRuleSet().getLeftZigZagTreeJoinReorder();
         } else if (isDpHyp) {
             if (isOtherJoinReorder) {
                 return getRuleSet().getDPHypReorderRules();
             } else {
                 return Collections.emptyList();
             }
+        } else if (enableLeftZigZag || !groupExpression.getOwnerGroup().isStatsReliable()) {
+            return getRuleSet().getLeftZigZagTreeJoinReorder();
         } else if (isEnableBushyTree) {
             return getRuleSet().getBushyTreeJoinReorder();
         } else if (context.getCascadesContext().getStatementContext().getMaxNAryInnerJoin() <= joinNumBushyTree) {

diff --git a/...src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/GraphSimplifierTest.java b/...src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/GraphSimplifierTest.java
@@ -89,10 +89,10 @@ void testStarQuery() {
                 .add(Pair.of(17L, 2L))   // 04   - 1
                 .add(Pair.of(17L, 4L))   // 04   - 2
                 .add(Pair.of(17L, 8L))   // 04   - 3
-                .add(Pair.of(25L, 2L))   // 034  - 1
-                .add(Pair.of(25L, 4L))   // 034  - 2
-                .add(Pair.of(29L, 2L))   // 0234 - 1
-                .build(); // 0-4-3-2-1 : big left deep tree
+                .add(Pair.of(19L, 8L))   // 041  - 2
+                .add(Pair.of(21L, 2L))   // 042  - 1
+                .add(Pair.of(23L, 8L))   // 0134 - 2
+                .build(); // 0-4-3-1-2 : big left deep tree
         for (Pair<Long, Long> step : steps) {
             if (!graphSimplifier.applySimplificationStep()) {
                 break;

diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/memo/RankTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/memo/RankTest.java
@@ -55,7 +55,7 @@ void test() {
             shape.add(memo.unrank(memo.rank(i + 1).first).shape(""));
         }
         System.out.println(shape);
-        Assertions.assertEquals(4, shape.size());
+        Assertions.assertEquals(1, shape.size());
         Assertions.assertEquals(bestPlan.shape(""), memo.unrank(memo.rank(1).first).shape(""));
     }
 }