v8: 1. remove aggcostFactor. 2. DEFAULT_AGGREGATE_RATIO=1/3

englefly · Aug 27, 2024 · 7327a4b · 7327a4b
1 parent ffa0b85
commit 7327a4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/cost/CostModelV1.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/cost/CostModelV1.java
@@ -338,16 +338,15 @@ public Cost visitPhysicalHashAggregate(
             PhysicalHashAggregate<? extends Plan> aggregate, PlanContext context) {
         Statistics inputStatistics = context.getChildStatistics(0);
         double exprCost = expressionTreeCost(aggregate.getExpressions());
-        double aggCostBaseFactor = 3;
         if (aggregate.getAggPhase().isLocal()) {
             return CostV1.of(context.getSessionVariable(),
-                    exprCost / 100 + aggCostBaseFactor * inputStatistics.getRowCount() / beNumber,
-                    aggCostBaseFactor * inputStatistics.getRowCount() / beNumber, 0);
+                    exprCost / 100 + inputStatistics.getRowCount() / beNumber,
+                    inputStatistics.getRowCount() / beNumber, 0);
         } else {
             // global
             return CostV1.of(context.getSessionVariable(), exprCost / 100
-                            + aggCostBaseFactor * inputStatistics.getRowCount(),
-                    aggCostBaseFactor * inputStatistics.getRowCount(), 0);
+                            + inputStatistics.getRowCount(),
+                    inputStatistics.getRowCount(), 0);
         }
     }
 

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
@@ -164,7 +164,7 @@
  * Used to calculate the stats for each plan
  */
 public class StatsCalculator extends DefaultPlanVisitor<Statistics, Void> {
-    public static double DEFAULT_AGGREGATE_RATIO = 0.45;
+    public static double DEFAULT_AGGREGATE_RATIO = 1 / 3.0;
     public static double AGGREGATE_COLUMN_CORRELATION_COEFFICIENT = 0.75;
     public static double DEFAULT_COLUMN_NDV_RATIO = 0.5;