tmp modify some comments

seawinde · Dec 4, 2023 · 03af108 · 03af108
1 parent e8f1bca
commit 03af108
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 33 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/mv/Predicates.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/mv/Predicates.java
@@ -62,26 +62,26 @@ public static SplitPredicate splitPredicates(Expression expression) {
      * The split different representation for predicate expression, such as equal, range and residual predicate.
      * */
     public static final class SplitPredicate {
-        private final Expression equalPredicates;
-        private final Expression rangePredicates;
-        private final Expression residualPredicates;
-
-        public SplitPredicate(Expression equalPredicates, Expression rangePredicates, Expression residualPredicates) {
-            this.equalPredicates = equalPredicates;
-            this.rangePredicates = rangePredicates;
-            this.residualPredicates = residualPredicates;
+        private final Expression equalPredicate;
+        private final Expression rangePredicate;
+        private final Expression residualPredicate;
+
+        public SplitPredicate(Expression equalPredicate, Expression rangePredicate, Expression residualPredicate) {
+            this.equalPredicate = equalPredicate;
+            this.rangePredicate = rangePredicate;
+            this.residualPredicate = residualPredicate;
         }
 
         public Expression getEqualPredicate() {
-            return equalPredicates;
+            return equalPredicate;
         }
 
         public Expression getRangePredicate() {
-            return rangePredicates;
+            return rangePredicate;
         }
 
         public Expression getResidualPredicate() {
-            return residualPredicates;
+            return residualPredicate;
         }
 
         public static SplitPredicate empty() {
@@ -101,25 +101,25 @@ public static SplitPredicate of(Expression equalPredicates,
          * isEmpty
          * */
         public boolean isEmpty() {
-            return equalPredicates == null
-                    && rangePredicates == null
-                    && residualPredicates == null;
+            return equalPredicate == null
+                    && rangePredicate == null
+                    && residualPredicate == null;
         }
 
         public List<Expression> toList() {
-            return ImmutableList.of(equalPredicates, rangePredicates, residualPredicates);
+            return ImmutableList.of(equalPredicate, rangePredicate, residualPredicate);
         }
 
         /**
          * Check the predicates in SplitPredicate is whether all true or not
          */
         public boolean isAlwaysTrue() {
-            return equalPredicates instanceof BooleanLiteral
-                    && rangePredicates instanceof BooleanLiteral
-                    && residualPredicates instanceof BooleanLiteral
-                    && ((BooleanLiteral) equalPredicates).getValue()
-                    && ((BooleanLiteral) rangePredicates).getValue()
-                    && ((BooleanLiteral) residualPredicates).getValue();
+            return equalPredicate instanceof BooleanLiteral
+                    && rangePredicate instanceof BooleanLiteral
+                    && residualPredicate instanceof BooleanLiteral
+                    && ((BooleanLiteral) equalPredicate).getValue()
+                    && ((BooleanLiteral) rangePredicate).getValue()
+                    && ((BooleanLiteral) residualPredicate).getValue();
         }
     }
 }
diff --git a/...-core/src/main/java/org/apache/doris/nereids/rules/exploration/mv/PredicatesSplitter.java b/...-core/src/main/java/org/apache/doris/nereids/rules/exploration/mv/PredicatesSplitter.java
@@ -21,6 +21,7 @@
 import org.apache.doris.nereids.trees.expressions.Cast;
 import org.apache.doris.nereids.trees.expressions.ComparisonPredicate;
 import org.apache.doris.nereids.trees.expressions.CompoundPredicate;
+import org.apache.doris.nereids.trees.expressions.EqualPredicate;
 import org.apache.doris.nereids.trees.expressions.EqualTo;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.NullSafeEqual;
@@ -40,10 +41,10 @@
  */
 public class PredicatesSplitter {
 
-    private List<Expression> equalPredicates = new ArrayList<>();
-    private List<Expression> rangePredicates = new ArrayList<>();
-    private List<Expression> residualPredicates = new ArrayList<>();
-    private List<Expression> conjunctExpressions;
+    private final List<Expression> equalPredicates = new ArrayList<>();
+    private final List<Expression> rangePredicates = new ArrayList<>();
+    private final List<Expression> residualPredicates = new ArrayList<>();
+    private final List<Expression> conjunctExpressions;
 
     private final PredicateExtract instance = new PredicateExtract();
 
@@ -63,7 +64,7 @@ public Void visitComparisonPredicate(ComparisonPredicate comparisonPredicate, Ex
             Expression rightArg = comparisonPredicate.getArgument(1);
             boolean leftArgOnlyContainsColumnRef = containOnlyColumnRef(leftArg, true);
             boolean rightArgOnlyContainsColumnRef = containOnlyColumnRef(rightArg, true);
-            if (comparisonPredicate instanceof EqualTo || comparisonPredicate instanceof NullSafeEqual) {
+            if (comparisonPredicate instanceof EqualPredicate) {
                 if (leftArgOnlyContainsColumnRef && rightArgOnlyContainsColumnRef) {
                     equalPredicates.add(comparisonPredicate);
                     return null;
@@ -85,7 +86,7 @@ public Void visitCompoundPredicate(CompoundPredicate compoundPredicate, Expressi
                 residualPredicates.add(compoundPredicate);
                 return null;
             }
-            return super.visitCompoundPredicate(compoundPredicate, context);
+            return super.visit(compoundPredicate, context);
         }
     }
 

diff --git a/.../src/main/java/org/apache/doris/nereids/rules/exploration/mv/mapping/RelationMapping.java b/.../src/main/java/org/apache/doris/nereids/rules/exploration/mv/mapping/RelationMapping.java
@@ -116,11 +116,12 @@ public static List<RelationMapping> generate(List<CatalogRelation> sources, List
     }
 
     private static String getTableQualifier(TableIf tableIf) {
-        String tableName = tableIf.getName();
-        DatabaseIf database = tableIf.getDatabase();
-        if (database == null) {
-            return null;
-        }
-        return database.getFullName() + ":" + tableName;
+        return String.valueOf(tableIf.getId());
+        // String tableName = tableIf.getName();
+        // DatabaseIf database = tableIf.getDatabase();
+        // if (database == null) {
+        //     return null;
+        // }
+        // return database.getFullName() + ":" + tableName;
     }
 }