left zigzag

englefly · Nov 2, 2023 · c5c5606 · c5c5606
1 parent 00eba56
commit c5c5606
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
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
@@ -87,9 +87,12 @@ public Rule build() {
 
     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()
+        // 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());
+        return !bottomJoin.getJoinReorderContext().hasCommuteZigZag()
                 && !topJoin.getJoinReorderContext().hasLAsscom()
                 && (!bottomJoin.isMarkJoin() && !topJoin.isMarkJoin());
     }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/JoinEstimation.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/JoinEstimation.java
@@ -171,7 +171,7 @@ private static Statistics estimateNestLoopJoin(Statistics leftStats, Statistics
 
     private static Statistics estimateInnerJoin(Statistics leftStats, Statistics rightStats, Join join) {
         if (hashJoinConditionContainsUnknownColumnStats(leftStats, rightStats, join)) {
-            double rowCount = leftStats.getRowCount() + rightStats.getRowCount();
+            double rowCount = Math.max(leftStats.getRowCount(), rightStats.getRowCount());
             rowCount = Math.max(1, rowCount);
             return new StatisticsBuilder()
                 .setRowCount(rowCount)