[opt](nereids) refine operator estimation

xzj7019 · Sep 24, 2024 · e4d4e91 · e4d4e91
1 parent 8d075e2
commit e4d4e91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
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
@@ -289,7 +289,6 @@ private static Statistics estimateSemiOrAnti(Statistics leftStats, Statistics ri
                         .putColumnStatistics(rightStats.columnStatistics())
                         .build();
             }
-            updateJoinConditionColumnStatistics(result, join);
             result.normalizeColumnStatistics();
             return result;
         }
@@ -306,7 +305,6 @@ private static Statistics estimateSemiOrAnti(Statistics leftStats, Statistics ri
             double baseRowCount =
                     join.getJoinType().isLeftSemiOrAntiJoin() ? leftStats.getRowCount() : rightStats.getRowCount();
             rowCount = Math.min(innerJoinStats.getRowCount(), baseRowCount);
-            updateJoinConditionColumnStatistics(innerJoinStats, join);
             return innerJoinStats.withRowCountAndEnforceValid(rowCount);
         } else {
             /*double crossRowCount = Math.max(1, leftStats.getRowCount()) * Math.max(1, rightStats.getRowCount());
@@ -336,7 +334,6 @@ private static Statistics estimateSemiOrAnti(Statistics leftStats, Statistics ri
             }
             builder.setRowCount(outputRowCount);
             Statistics outputStats = builder.build();
-            updateJoinConditionColumnStatistics(outputStats, join);
             outputStats.normalizeColumnStatistics();
             return outputStats;*/
             StatisticsBuilder builder;
@@ -366,7 +363,9 @@ public static Statistics estimate(Statistics leftStats, Statistics rightStats, J
                 .build();
         Statistics innerJoinStats = estimateInnerJoin(leftStats, rightStats, join);
         if (joinType.isSemiOrAntiJoin()) {
-            return estimateSemiOrAnti(leftStats, rightStats, innerJoinStats, join);
+            Statistics outputStats = estimateSemiOrAnti(leftStats, rightStats, innerJoinStats, join);
+            updateJoinConditionColumnStatistics(outputStats, join);
+            return outputStats;
         } else if (joinType == JoinType.INNER_JOIN) {
             updateJoinConditionColumnStatistics(innerJoinStats, join);
             return innerJoinStats;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/Statistics.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/Statistics.java
@@ -119,10 +119,10 @@ public void normalizeColumnStatistics(double inputRowCount, boolean isNumNullsDe
             // the following columnStatistic.isUnKnown() judgment is loop inside since current doris
             // supports partial stats deriving, i.e, allowing part of tables have stats and other parts don't,
             // or part of columns have stats but other parts don't, especially join and filter estimation.
-            if (!checkColumnStatsValid(columnStatistic, inputRowCount) && !columnStatistic.isUnKnown()) {
+            if (!checkColumnStatsValid(columnStatistic, rowCount) && !columnStatistic.isUnKnown()) {
                 ColumnStatisticBuilder columnStatisticBuilder = new ColumnStatisticBuilder(columnStatistic);
-                double ndv = Math.min(columnStatistic.ndv, inputRowCount);
-                double numNulls = Math.min(columnStatistic.numNulls * factor, inputRowCount - ndv);
+                double ndv = Math.min(columnStatistic.ndv, rowCount);
+                double numNulls = Math.min(columnStatistic.numNulls * factor, rowCount - ndv);
                 columnStatisticBuilder.setNumNulls(numNulls);
                 columnStatisticBuilder.setNdv(Math.min(ndv, rowCount - numNulls));
                 columnStatistic = columnStatisticBuilder.build();