[fix](Nereids) mv in select materialized_view should disable show tab…

…le (#24104) mv in select materialized_view should disable show table, because Nereids planner can output the string such as slot#[0] in toSql() of SlotRef. Note this is only a temporary solution, will use an expression translator later
apache · Sep 11, 2023 · 3624057 · 3624057
1 parent 2bede8d
commit 3624057
Show file tree

Hide file tree

Showing 2 changed files with 123 additions and 84 deletions.
diff --git a/...n/java/org/apache/doris/nereids/rules/rewrite/mv/AbstractSelectMaterializedIndexRule.java b/...n/java/org/apache/doris/nereids/rules/rewrite/mv/AbstractSelectMaterializedIndexRule.java
@@ -37,6 +37,7 @@
 import org.apache.doris.nereids.trees.expressions.Slot;
 import org.apache.doris.nereids.trees.expressions.SlotReference;
 import org.apache.doris.nereids.trees.expressions.WhenClause;
+import org.apache.doris.nereids.trees.expressions.functions.ExpressionTrait;
 import org.apache.doris.nereids.trees.expressions.functions.agg.AggregateFunction;
 import org.apache.doris.nereids.trees.expressions.functions.agg.Count;
 import org.apache.doris.nereids.trees.expressions.functions.agg.Ndv;
@@ -98,10 +99,16 @@ protected boolean containAllRequiredColumns(MaterializedIndex index, LogicalOlap
         OlapTable table = scan.getTable();
         MaterializedIndexMeta meta = table.getIndexMetaByIndexId(index.getId());
 
-        Set<String> predicateExprSql = predicateExpr.stream().map(e -> e.toSql()).collect(Collectors.toSet());
+        Set<String> predicateExprSql = predicateExpr.stream().map(ExpressionTrait::toSql).collect(Collectors.toSet());
+
+        // Here we use toSqlWithoutTbl because the output of toSql() is slot#[0] in Nereids
         Set<String> indexConjuncts = PlanNode.splitAndCompoundPredicateToConjuncts(meta.getWhereClause()).stream()
+                .map(e -> {
+                    e.setDisableTableName(true);
+                    return e;
+                })
                 .map(e -> new NereidsParser().parseExpression(e.toSql()).toSql()).collect(Collectors.toSet());
-        Set<String> commonConjuncts = indexConjuncts.stream().filter(e -> predicateExprSql.contains(e))
+        Set<String> commonConjuncts = indexConjuncts.stream().filter(predicateExprSql::contains)
                 .collect(Collectors.toSet());
         if (commonConjuncts.size() != indexConjuncts.size()) {
             return false;
@@ -425,7 +432,12 @@ protected SlotContext generateBaseScanExprToMvExpr(LogicalOlapScan mvPlan) {
 
         return new SlotContext(baseSlotToMvSlot, mvNameToMvSlot,
                 PlanNode.splitAndCompoundPredicateToConjuncts(meta.getWhereClause()).stream()
-                        .map(e -> new NereidsParser().parseExpression(e.toSql())).collect(Collectors.toSet()));
+                        .map(e -> {
+                            e.setDisableTableName(true);
+                            return e;
+                        })
+                        .map(e -> new NereidsParser().parseExpression(e.toSql()))
+                        .collect(Collectors.toSet()));
     }
 
     /** SlotContext */