[fix] (nereids) Catch exception when mv fail and fix the npe (#28932)

apache · Dec 24, 2023 · b8de5cf · b8de5cf
1 parent 1545c36
commit b8de5cf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/HyperGraph.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/HyperGraph.java
@@ -52,6 +52,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -691,7 +692,7 @@ private boolean compareEdgeWithExpr(Edge t, Edge o, Map<Expression, Expression>
         }
         int size = t.getExpressions().size();
         for (int i = 0; i < size; i++) {
-            if (!expressionMap.get(t.getExpression(i)).equals(o.getExpression(i))) {
+            if (!Objects.equals(expressionMap.get(t.getExpression(i)), o.getExpression(i))) {
                 return false;
             }
         }

diff --git a/...in/java/org/apache/doris/nereids/rules/exploration/mv/MaterializedViewFilterJoinRule.java b/...in/java/org/apache/doris/nereids/rules/exploration/mv/MaterializedViewFilterJoinRule.java
@@ -37,7 +37,7 @@ public class MaterializedViewFilterJoinRule extends AbstractMaterializedViewJoin
     @Override
     public List<Rule> buildRules() {
         return ImmutableList.of(
-                logicalFilter(logicalJoin(any(), any())).thenApplyMulti(ctx -> {
+                logicalFilter(logicalJoin(any(), any())).thenApplyMultiNoThrow(ctx -> {
                     LogicalFilter<LogicalJoin<Plan, Plan>> root = ctx.root;
                     return rewrite(root, ctx.cascadesContext);
                 }).toRule(RuleType.MATERIALIZED_VIEW_FILTER_JOIN));

diff --git a/.../org/apache/doris/nereids/rules/exploration/mv/MaterializedViewFilterProjectJoinRule.java b/.../org/apache/doris/nereids/rules/exploration/mv/MaterializedViewFilterProjectJoinRule.java
@@ -38,7 +38,7 @@ public class MaterializedViewFilterProjectJoinRule extends AbstractMaterializedV
     @Override
     public List<Rule> buildRules() {
         return ImmutableList.of(
-                logicalFilter(logicalProject(logicalJoin(any(), any()))).thenApplyMulti(ctx -> {
+                logicalFilter(logicalProject(logicalJoin(any(), any()))).thenApplyMultiNoThrow(ctx -> {
                     LogicalFilter<LogicalProject<LogicalJoin<Plan, Plan>>> root = ctx.root;
                     return rewrite(root, ctx.cascadesContext);
                 }).toRule(RuleType.MATERIALIZED_VIEW_FILTER_PROJECT_JOIN));

diff --git a/...main/java/org/apache/doris/nereids/rules/exploration/mv/MaterializedViewOnlyJoinRule.java b/...main/java/org/apache/doris/nereids/rules/exploration/mv/MaterializedViewOnlyJoinRule.java
@@ -36,7 +36,7 @@ public class MaterializedViewOnlyJoinRule extends AbstractMaterializedViewJoinRu
     @Override
     public List<Rule> buildRules() {
         return ImmutableList.of(
-                logicalJoin(any(), any()).thenApplyMulti(ctx -> {
+                logicalJoin(any(), any()).thenApplyMultiNoThrow(ctx -> {
                     LogicalJoin<Plan, Plan> root = ctx.root;
                     return rewrite(root, ctx.cascadesContext);
                 }).toRule(RuleType.MATERIALIZED_VIEW_ONLY_JOIN));

diff --git a/.../org/apache/doris/nereids/rules/exploration/mv/MaterializedViewProjectFilterJoinRule.java b/.../org/apache/doris/nereids/rules/exploration/mv/MaterializedViewProjectFilterJoinRule.java
@@ -38,7 +38,7 @@ public class MaterializedViewProjectFilterJoinRule extends AbstractMaterializedV
     @Override
     public List<Rule> buildRules() {
         return ImmutableList.of(
-                logicalProject(logicalFilter(logicalJoin(any(), any()))).thenApplyMulti(ctx -> {
+                logicalProject(logicalFilter(logicalJoin(any(), any()))).thenApplyMultiNoThrow(ctx -> {
                     LogicalProject<LogicalFilter<LogicalJoin<Plan, Plan>>> root = ctx.root;
                     return rewrite(root, ctx.cascadesContext);
                 }).toRule(RuleType.MATERIALIZED_VIEW_PROJECT_FILTER_JOIN));