[fix](mtmv) Fix partition trace wrong when partition name is same fro…

…m both side of join (apache#40485) This is brought by apache#35562 if partition mv def is as following: CREATE MATERIALIZED VIEW mv1 BUILD IMMEDIATE REFRESH COMPLETE ON MANUAL PARTITION BY (upgrade_day) DISTRIBUTED BY RANDOM BUCKETS 2 PROPERTIES ('replication_num' = '1') AS select t1.upgrade_day, t2.batch_no, count(*) from test2 t2 join test1 t1 on t1.upgrade_day = t2.upgrade_day group by t1.upgrade_day, t2.batch_no; the mv related partition table should `test1`, but now is `test2`, this pr fix this.
seawinde · Sep 14, 2024 · 6ee4abc · 6ee4abc
1 parent c6c1e2a
commit 6ee4abc
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 8 deletions.
diff --git a/...re/src/main/java/org/apache/doris/nereids/rules/exploration/mv/MaterializedViewUtils.java b/...re/src/main/java/org/apache/doris/nereids/rules/exploration/mv/MaterializedViewUtils.java
@@ -374,6 +374,20 @@ public Void visitLogicalRelation(LogicalRelation relation, IncrementCheckerConte
                         + "but now is %s", relation.getClass().getSimpleName()));
                 return null;
             }
+            SlotReference contextPartitionColumn = getContextPartitionColumn(context);
+            if (contextPartitionColumn == null) {
+                context.addFailReason(String.format("mv partition column is not from table when relation check, "
+                        + "mv partition column is %s", context.getMvPartitionColumn()));
+                return null;
+            }
+            // Check the table which mv partition column belonged to is same as the current check relation or not
+            if (!((LogicalCatalogRelation) relation).getTable().getFullQualifiers().equals(
+                    contextPartitionColumn.getTable().map(TableIf::getFullQualifiers).orElse(ImmutableList.of()))) {
+                context.addFailReason(String.format("mv partition column name is not belonged to current check , "
+                                + "table, current table is %s",
+                        ((LogicalCatalogRelation) relation).getTable().getFullQualifiers()));
+                return null;
+            }
             LogicalCatalogRelation logicalCatalogRelation = (LogicalCatalogRelation) relation;
             TableIf table = logicalCatalogRelation.getTable();
             // if self join, self join can not partition track now, remove the partition column correspondingly
@@ -402,10 +416,6 @@ public Void visitLogicalRelation(LogicalRelation relation, IncrementCheckerConte
                 return null;
             }
             Set<Column> partitionColumnSet = new HashSet<>(relatedTable.getPartitionColumns());
-            SlotReference contextPartitionColumn = getContextPartitionColumn(context);
-            if (contextPartitionColumn == null) {
-                return null;
-            }
             Column mvReferenceColumn = contextPartitionColumn.getColumn().get();
             Expr definExpr = mvReferenceColumn.getDefineExpr();
             if (definExpr instanceof SlotRef) {

diff --git a/...core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java b/...core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java
@@ -359,7 +359,9 @@ private void analyzeExpressions(Plan plan, Map<String, String> mvProperties) {
         List<Expression> functionCollectResult = MaterializedViewUtils.extractNondeterministicFunction(plan);
         if (!CollectionUtils.isEmpty(functionCollectResult)) {
             throw new AnalysisException(String.format(
-                    "can not contain invalid expression, the expression is %s",
+                    "can not contain nonDeterministic expression, the expression is %s. "
+                            + "Should add 'enable_nondeterministic_function'  = 'true' property "
+                            + "when create materialized view if you know the property real meaning entirely",
                     functionCollectResult.stream().map(Expression::toString).collect(Collectors.joining(","))));
         }
     }

diff --git a/...rc/test/java/org/apache/doris/nereids/rules/exploration/mv/MaterializedViewUtilsTest.java b/...rc/test/java/org/apache/doris/nereids/rules/exploration/mv/MaterializedViewUtilsTest.java
@@ -251,6 +251,26 @@ protected void runBeforeAll() throws Exception {
         connectContext.getSessionVariable().setDisableNereidsRules("OLAP_SCAN_PARTITION_PRUNE,PRUNE_EMPTY_PARTITION");
     }
 
+    // Test when join both side are all partition table and partition column name is same
+    @Test
+    public void joinPartitionNameSameTest() {
+        PlanChecker.from(connectContext)
+                .checkExplain("select t1.upgrade_day, t2.batch_no, count(*) "
+                                + "from test2 t2 join test1 t1 on "
+                                + "t1.upgrade_day = t2.upgrade_day "
+                                + "group by t1.upgrade_day, t2.batch_no;",
+                        nereidsPlanner -> {
+                            Plan rewrittenPlan = nereidsPlanner.getRewrittenPlan();
+                            RelatedTableInfo relatedTableInfo =
+                                    MaterializedViewUtils.getRelatedTableInfo("upgrade_day", null,
+                                            rewrittenPlan, nereidsPlanner.getCascadesContext());
+                            checkRelatedTableInfo(relatedTableInfo,
+                                    "test1",
+                                    "upgrade_day",
+                                    true);
+                        });
+    }
+
     @Test
     public void getRelatedTableInfoWhenAutoPartitionTest() {
         PlanChecker.from(connectContext)

diff --git a/regression-test/suites/mtmv_p0/test_enable_date_non_deterministic_function_mtmv.groovy b/regression-test/suites/mtmv_p0/test_enable_date_non_deterministic_function_mtmv.groovy
@@ -57,7 +57,7 @@ suite("test_enable_date_non_deterministic_function_mtmv","mtmv") {
         Assert.fail();
     } catch (Exception e) {
         logger.info(e.getMessage())
-        assertTrue(e.getMessage().contains("can not contain invalid expression"));
+        assertTrue(e.getMessage().contains("can not contain nonDeterministic expression"));
     }
     sql """drop materialized view if exists ${mvName};"""
 
@@ -75,7 +75,7 @@ suite("test_enable_date_non_deterministic_function_mtmv","mtmv") {
         Assert.fail();
     } catch (Exception e) {
         logger.info(e.getMessage())
-        assertTrue(e.getMessage().contains("can not contain invalid expression"));
+        assertTrue(e.getMessage().contains("can not contain nonDeterministic expression"));
     }
     sql """drop materialized view if exists ${mvName};"""
 
@@ -128,7 +128,7 @@ suite("test_enable_date_non_deterministic_function_mtmv","mtmv") {
         Assert.fail();
     } catch (Exception e) {
         logger.info(e.getMessage())
-        assertTrue(e.getMessage().contains("can not contain invalid expression"));
+        assertTrue(e.getMessage().contains("can not contain nonDeterministic expression"));
     }
 
     sql """drop table if exists `${tableName}`"""