fix

englefly · Jun 26, 2024 · a9b6b52 · a9b6b52
1 parent 44ac33f
commit a9b6b52
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/StatementContext.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/StatementContext.java
@@ -163,6 +163,8 @@ public class StatementContext implements Closeable {
 
     private ShortCircuitQueryContext shortCircuitQueryContext;
 
+    private boolean hasMvCandidates = false;
+
     public StatementContext() {
         this(ConnectContext.get(), null, 0);
     }
@@ -535,4 +537,12 @@ public TableId getTableId(TableIf tableIf) {
         this.tableIdMapping.put(tableIdentifier, tableId);
         return tableId;
     }
+
+    public boolean isHasMvCandidates() {
+        return hasMvCandidates;
+    }
+
+    public void setHasMvCandidates(boolean hasMvCandidates) {
+        this.hasMvCandidates = hasMvCandidates;
+    }
 }
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
@@ -140,7 +140,10 @@ private Set<Column> getColumnForRangePredicate(Set<Expression> expressions) {
 
     @Override
     public Cost visitPhysicalFilter(PhysicalFilter<? extends Plan> filter, PlanContext context) {
-        double exprCost = expressionTreeCost(filter.getExpressions());
+        double exprCost = 0;
+        if (context.getStatementContext().isHasMvCandidates()) {
+            exprCost = expressionTreeCost(filter.getExpressions());
+        }
         double filterCostFactor = 0.0001;
         if (ConnectContext.get() != null) {
             filterCostFactor = ConnectContext.get().getSessionVariable().filterCostFactor;
@@ -349,7 +352,7 @@ public Cost visitPhysicalHashJoin(
 
         double leftRowCount = probeStats.getRowCount();
         double rightRowCount = buildStats.getRowCount();
-        if (leftRowCount == rightRowCount) {
+        if ((long) leftRowCount == (long) rightRowCount) {
             // reorder by connectivity to be friendly to runtime filter.
             if (physicalHashJoin.getGroupExpression().isPresent()
                     && physicalHashJoin.getGroupExpression().get().getOwnerGroup() != null

diff --git a/...in/java/org/apache/doris/nereids/rules/exploration/mv/InitMaterializationContextHook.java b/...in/java/org/apache/doris/nereids/rules/exploration/mv/InitMaterializationContextHook.java
@@ -104,6 +104,7 @@ public void initMaterializationContext(CascadesContext cascadesContext) {
                         mtmvCache.getLogicalPlan(), mtmvCache.getOriginalPlan(), ImmutableList.of(),
                         ImmutableList.of(), cascadesContext,
                         mtmvCache.getStructInfo().withTableBitSet(tableBitSetInCurrentCascadesContext)));
+                cascadesContext.getStatementContext().setHasMvCandidates(true);
             } catch (Exception e) {
                 LOG.warn(String.format("MaterializationContext init mv cache generate fail, current queryId is %s",
                         cascadesContext.getConnectContext().getQueryIdentifier()), e);