skip if ut or hint

englefly · Sep 10, 2024 · 6d2b2e8 · 6d2b2e8
1 parent 2c9998a
commit 6d2b2e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java
@@ -22,6 +22,7 @@
 import org.apache.doris.analysis.StatementBase;
 import org.apache.doris.catalog.Column;
 import org.apache.doris.catalog.TableIf;
+import org.apache.doris.common.FeConstants;
 import org.apache.doris.common.FormatOptions;
 import org.apache.doris.common.NereidsException;
 import org.apache.doris.common.Pair;
@@ -257,8 +258,11 @@ private Plan planWithoutLock(
                 return rewrittenPlan;
             }
         }
-        List<LogicalOlapScan> scans = getAllOlapScans(cascadesContext.getRewritePlan());
-        StatsCalculator.disableJoinReorderIfTableRowCountNotAvailable(scans, cascadesContext);
+
+        if (!FeConstants.runningUnitTest && !cascadesContext.isLeadingDisableJoinReorder()) {
+            List<LogicalOlapScan> scans = getAllOlapScans(cascadesContext.getRewritePlan());
+            StatsCalculator.disableJoinReorderIfTableRowCountNotAvailable(scans, cascadesContext);
+        }
 
         optimize();
         if (statementContext.getConnectContext().getExecutor() != null) {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/StatsCalculator.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/StatsCalculator.java
@@ -222,6 +222,7 @@ public static void disableJoinReorderIfTableRowCountNotAvailable(
                 LOG.info("disable join reorder since row count not available: "
                         + scan.getTable().getNameWithFullQualifiers());
                 ConnectContext.get().getSessionVariable().setDisableJoinReorder(true);
+                return;
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     LOG.info("disable join reorder since row count not available: "
                             + scan.getTable().getNameWithFullQualifiers());
                     ConnectContext.get().getSessionVariable().setDisableJoinReorder(true);
+                    return;
                 }
             }
         }
@@ Expand Down @@