keep origin join order if join reorder failed

apache · Jun 16, 2022 · 28bc291 · 28bc291
1 parent 8a5a1ea
commit 28bc291
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
@@ -735,7 +735,7 @@ public void materializeRequiredSlots(Analyzer analyzer) throws AnalysisException
 
     protected void reorderTable(Analyzer analyzer) throws AnalysisException {
         List<Pair<TableRef, Long>> candidates = Lists.newArrayList();
-
+        List<TableRef> originOrderBackUp = Lists.newArrayList(fromClause.getTableRefs());
         // New pair of table ref and row count
         for (TableRef tblRef : fromClause) {
             if (tblRef.getJoinOp() != JoinOperator.INNER_JOIN || tblRef.hasJoinHints()) {
@@ -773,8 +773,8 @@ protected void reorderTable(Analyzer analyzer) throws AnalysisException {
 
         // can not get AST only with equal join, MayBe cross join can help
         fromClause.clear();
-        for (Pair<TableRef, Long> candidate : candidates) {
-            fromClause.add(candidate.first);
+        for (TableRef tableRef : originOrderBackUp) {
+            fromClause.add(tableRef);
         }
     }