This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 1daddb63bbc branch-4.0: [test](mtmv) Add ut test for session variable
guard when generate mtmv cache #58863 (#59635)
1daddb63bbc is described below
commit 1daddb63bbc9e14a484718f09f225a243d370b0c
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Jan 8 11:28:18 2026 +0800
branch-4.0: [test](mtmv) Add ut test for session variable guard when
generate mtmv cache #58863 (#59635)
Cherry-picked from #58863
Co-authored-by: seawinde <[email protected]>
---
.../doris/nereids/mv/IdStatisticsMapTest.java | 11 ++
.../org/apache/doris/nereids/mv/MTMVCacheTest.java | 132 +++++++++++++++++++++
.../nereids/mv/MtmvCacheNewConnectContextTest.java | 13 +-
.../doris/nereids/mv/MvTableIdIsLongTest.java | 1 +
.../nereids/mv/OptimizeGetAvailableMvsTest.java | 9 ++
.../mv/PointQueryShouldNotMvRewriteTest.java | 5 +-
.../union_all_compensate.groovy | 6 +-
.../partition_curd_union_rewrite.groovy | 6 +-
8 files changed, 173 insertions(+), 10 deletions(-)
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/IdStatisticsMapTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/IdStatisticsMapTest.java
index e60ab621ffe..02dbaf42630 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/IdStatisticsMapTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/IdStatisticsMapTest.java
@@ -67,6 +67,15 @@ public class IdStatisticsMapTest extends SqlTestBase {
return true;
}
};
+
+ new MockUp<MTMV>() {
+ @Mock
+ public boolean canBeCandidate() {
+ return true;
+ }
+ };
+ connectContext.getState().setIsQuery(true);
+
connectContext.getSessionVariable().enableMaterializedViewRewrite =
true;
connectContext.getSessionVariable().enableMaterializedViewNestRewrite
= true;
connectContext.getSessionVariable().setPreMaterializedViewRewriteStrategy(PreRewriteStrategy.NOT_IN_RBO.name());
@@ -124,6 +133,8 @@ public class IdStatisticsMapTest extends SqlTestBase {
return true;
}
};
+ connectContext.getState().setIsQuery(true);
+
connectContext.getSessionVariable().enableMaterializedViewRewrite =
true;
connectContext.getSessionVariable().enableMaterializedViewNestRewrite
= true;
connectContext.getSessionVariable().setPreMaterializedViewRewriteStrategy(
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MTMVCacheTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MTMVCacheTest.java
new file mode 100644
index 00000000000..5cb57665d59
--- /dev/null
+++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MTMVCacheTest.java
@@ -0,0 +1,132 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.mv;
+
+import org.apache.doris.catalog.MTMV;
+import org.apache.doris.mtmv.MTMVCache;
+import org.apache.doris.mtmv.MTMVRelationManager;
+import org.apache.doris.nereids.CascadesContext;
+import
org.apache.doris.nereids.rules.exploration.mv.AsyncMaterializationContext;
+import org.apache.doris.nereids.rules.exploration.mv.MaterializationContext;
+import org.apache.doris.nereids.sqltest.SqlTestBase;
+import org.apache.doris.nereids.trees.expressions.SessionVarGuardExpr;
+import org.apache.doris.nereids.trees.plans.Plan;
+import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate;
+import org.apache.doris.nereids.util.PlanChecker;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.SessionVariable;
+import org.apache.doris.qe.SqlModeHelper;
+
+import mockit.Mock;
+import mockit.MockUp;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.BitSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * Relevant test case about mtmv cache.
+ */
+public class MTMVCacheTest extends SqlTestBase {
+
+ @Test
+ void testMTMVCacheIsCorrect() throws Exception {
+
connectContext.getSessionVariable().setDisableNereidsRules("PRUNE_EMPTY_PARTITION");
+ BitSet disableNereidsRules =
connectContext.getSessionVariable().getDisableNereidsRules();
+ new MockUp<SessionVariable>() {
+ @Mock
+ public BitSet getDisableNereidsRules() {
+ return disableNereidsRules;
+ }
+ };
+ new MockUp<MTMVRelationManager>() {
+ @Mock
+ public boolean isMVPartitionValid(MTMV mtmv, ConnectContext ctx,
boolean forceConsistent,
+ Map<List<String>, Set<String>>
queryUsedPartitions) {
+ return true;
+ }
+ };
+
+ new MockUp<MTMV>() {
+ @Mock
+ public boolean canBeCandidate() {
+ return true;
+ }
+ };
+ connectContext.getState().setIsQuery(true);
+
+ connectContext.getSessionVariable().enableMaterializedViewRewrite =
true;
+ connectContext.getSessionVariable().enableMaterializedViewNestRewrite
= true;
+ createMvByNereids("create materialized view mv1 BUILD IMMEDIATE
REFRESH COMPLETE ON MANUAL\n"
+ + " DISTRIBUTED BY RANDOM BUCKETS 1\n"
+ + " PROPERTIES ('replication_num' = '1') \n"
+ + " as select T1.id, sum(score) from T1 group by
T1.id;");
+ CascadesContext c1 = createCascadesContext(
+ "select T1.id, sum(score) from T1 group by T1.id;",
+ connectContext
+ );
+ PlanChecker.from(c1)
+ .analyze()
+ .rewrite()
+ .optimize()
+ .printlnBestPlanTree();
+ List<MaterializationContext> normalMaterializationContexts =
c1.getMaterializationContexts();
+ Assertions.assertEquals(1, normalMaterializationContexts.size());
+
+ MTMV mtmv = ((AsyncMaterializationContext)
normalMaterializationContexts.get(0)).getMtmv();
+ MTMVCache cacheWithoutGuard = mtmv.getOrGenerateCache(connectContext);
+
+ Optional<LogicalAggregate<? extends Plan>> aggregate =
cacheWithoutGuard.getAllRulesRewrittenPlanAndStructInfo().key()
+ .collectFirst(LogicalAggregate.class::isInstance);
+ Assertions.assertTrue(aggregate.isPresent());
+ // should not contain SessionVarGuardExpr
+ Assertions.assertTrue(aggregate.get().getOutputExpressions().stream()
+ .noneMatch(expr ->
expr.containsType(SessionVarGuardExpr.class)));
+
+ // set guard check session var
+
connectContext.getSessionVariable().setSqlMode(SqlModeHelper.MODE_NO_UNSIGNED_SUBTRACTION);
+ CascadesContext c2 = createCascadesContext(
+ "select T1.id, sum(score) from T1 group by T1.id;",
+ connectContext
+ );
+ connectContext.getState().setIsQuery(true);
+ PlanChecker.from(c2)
+ .analyze()
+ .rewrite()
+ .optimize()
+ .printlnBestPlanTree();
+
+ List<MaterializationContext> sessionChangedMaterializationContexts =
c2.getMaterializationContexts();
+ Assertions.assertEquals(1,
sessionChangedMaterializationContexts.size());
+
+ MTMV mvWithGuard = ((AsyncMaterializationContext)
sessionChangedMaterializationContexts.get(0)).getMtmv();
+ MTMVCache cacheWithGuard =
mvWithGuard.getOrGenerateCache(connectContext);
+
+ aggregate =
cacheWithGuard.getAllRulesRewrittenPlanAndStructInfo().key()
+ .collectFirst(LogicalAggregate.class::isInstance);
+ Assertions.assertTrue(aggregate.isPresent());
+ // should contain SessionVarGuardExpr
+ Assertions.assertTrue(aggregate.get().getOutputExpressions().stream()
+ .anyMatch(expr ->
expr.containsType(SessionVarGuardExpr.class)));
+ dropMvByNereids("drop materialized view mv1");
+ }
+}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MtmvCacheNewConnectContextTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MtmvCacheNewConnectContextTest.java
index a15aad19de4..56c1c128b6a 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MtmvCacheNewConnectContextTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MtmvCacheNewConnectContextTest.java
@@ -18,7 +18,6 @@
package org.apache.doris.nereids.mv;
import org.apache.doris.catalog.MTMV;
-import org.apache.doris.mtmv.BaseTableInfo;
import org.apache.doris.mtmv.MTMVRelationManager;
import org.apache.doris.nereids.CascadesContext;
import org.apache.doris.nereids.sqltest.SqlTestBase;
@@ -32,6 +31,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.BitSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -55,11 +55,18 @@ public class MtmvCacheNewConnectContextTest extends
SqlTestBase {
};
new MockUp<MTMVRelationManager>() {
@Mock
- public boolean isMVPartitionValid(MTMV mtmv, ConnectContext ctx,
boolean isMVPartitionValid,
- Map<BaseTableInfo, Set<String>>
queryUsedRelatedTablePartitionsMap) {
+ public boolean isMVPartitionValid(MTMV mtmv, ConnectContext ctx,
boolean forceConsistent,
+ Map<List<String>, Set<String>>
queryUsedPartitions) {
return true;
}
};
+ new MockUp<MTMV>() {
+ @Mock
+ public boolean canBeCandidate() {
+ return true;
+ }
+ };
+ connectContext.getState().setIsQuery(true);
connectContext.getSessionVariable().enableMaterializedViewRewrite =
true;
connectContext.getSessionVariable().enableMaterializedViewNestRewrite
= true;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MvTableIdIsLongTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MvTableIdIsLongTest.java
index 615107bf992..46676f82c0b 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MvTableIdIsLongTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/MvTableIdIsLongTest.java
@@ -63,6 +63,7 @@ public class MvTableIdIsLongTest extends SqlTestBase {
return true;
}
};
+ connectContext.getState().setIsQuery(true);
connectContext.getSessionVariable().enableMaterializedViewRewrite =
true;
connectContext.getSessionVariable().enableMaterializedViewNestRewrite
= true;
createMvByNereids("create materialized view mv1 BUILD IMMEDIATE
REFRESH COMPLETE ON MANUAL\n"
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/OptimizeGetAvailableMvsTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/OptimizeGetAvailableMvsTest.java
index 44c9cd6b86a..0bd07bddc32 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/OptimizeGetAvailableMvsTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/OptimizeGetAvailableMvsTest.java
@@ -18,6 +18,7 @@
package org.apache.doris.nereids.mv;
import org.apache.doris.catalog.DistributionInfo;
+import org.apache.doris.catalog.MTMV;
import org.apache.doris.catalog.MaterializedIndex;
import org.apache.doris.catalog.MaterializedIndex.IndexState;
import org.apache.doris.catalog.OlapTable;
@@ -112,6 +113,14 @@ public class OptimizeGetAvailableMvsTest extends
SqlTestBase {
}
};
+ new MockUp<MTMV>() {
+ @Mock
+ public boolean canBeCandidate() {
+ return true;
+ }
+ };
+ connectContext.getState().setIsQuery(true);
+
connectContext.getSessionVariable().enableMaterializedViewRewrite =
true;
connectContext.getSessionVariable().enableMaterializedViewNestRewrite
= true;
createMvByNereids("create materialized view mv1 "
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/PointQueryShouldNotMvRewriteTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/PointQueryShouldNotMvRewriteTest.java
index 9b902582f7e..423c996a26b 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/PointQueryShouldNotMvRewriteTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/PointQueryShouldNotMvRewriteTest.java
@@ -33,6 +33,8 @@ import org.junit.jupiter.api.Test;
import java.util.BitSet;
import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -53,7 +55,7 @@ public class PointQueryShouldNotMvRewriteTest extends
SqlTestBase {
new MockUp<MTMVRelationManager>() {
@Mock
public boolean isMVPartitionValid(MTMV mtmv, ConnectContext ctx,
boolean forceConsistent,
- Set<String> relatedPartitions) {
+ Map<List<String>, Set<String>>
queryUsedPartitions) {
return true;
}
};
@@ -63,6 +65,7 @@ public class PointQueryShouldNotMvRewriteTest extends
SqlTestBase {
return true;
}
};
+ connectContext.getState().setIsQuery(true);
connectContext.getSessionVariable().enableMaterializedViewRewrite =
true;
connectContext.getSessionVariable().enableMaterializedViewNestRewrite
= true;
diff --git
a/regression-test/suites/nereids_rules_p0/mv/union_all_compensate/union_all_compensate.groovy
b/regression-test/suites/nereids_rules_p0/mv/union_all_compensate/union_all_compensate.groovy
index b9ebbd9a458..85826b63705 100644
---
a/regression-test/suites/nereids_rules_p0/mv/union_all_compensate/union_all_compensate.groovy
+++
b/regression-test/suites/nereids_rules_p0/mv/union_all_compensate/union_all_compensate.groovy
@@ -125,6 +125,9 @@ suite("union_all_compensate") {
sql """analyze table test_table1 with sync"""
sql """analyze table test_table2 with sync"""
+ sql """alter table test_table1 modify column num set stats
('row_count'='20');"""
+ sql """alter table test_table2 modify column num set stats
('row_count'='16');"""
+
// Aggregate, scalar aggregate, should not compensate union all
sql """ DROP MATERIALIZED VIEW IF EXISTS test_agg_mv"""
sql """
@@ -194,9 +197,6 @@ suite("union_all_compensate") {
sql "set enable_sql_cache=true"
order_qt_query1_1_after_use_sql_cache "${query1_0}"
- sql """alter table test_table1 modify column num set stats
('row_count'='20');"""
- sql """alter table test_table2 modify column num set stats
('row_count'='16');"""
-
// Aggregate, if query group by expression doesn't use the partition
column, but the invalid partition is in the
// grace_period, should not compensate union all, but should rewritten
successfully
diff --git
a/regression-test/suites/nereids_rules_p0/mv/union_rewrite/partition_curd_union_rewrite.groovy
b/regression-test/suites/nereids_rules_p0/mv/union_rewrite/partition_curd_union_rewrite.groovy
index b947f8f24fc..2c6a383d6de 100644
---
a/regression-test/suites/nereids_rules_p0/mv/union_rewrite/partition_curd_union_rewrite.groovy
+++
b/regression-test/suites/nereids_rules_p0/mv/union_rewrite/partition_curd_union_rewrite.groovy
@@ -78,9 +78,6 @@ suite ("partition_curd_union_rewrite") {
);
"""
- sql """alter table orders modify column o_comment set stats
('row_count'='3');"""
- sql """alter table lineitem modify column l_comment set stats
('row_count'='3');"""
-
sql"""
insert into orders values
(1, 1, 'ok', 99.5, '2023-10-17', 'a', 'b', 1, 'yy'),
@@ -107,6 +104,9 @@ suite ("partition_curd_union_rewrite") {
(3, 2, 3, 6, 7.5, 8.5, 9.5, 10.5, 'k', 'o', '2023-10-19', '2023-10-19',
'2023-10-19', 'c', 'd', 'xxxxxxxxx');
"""
+ sql """alter table orders modify column o_comment set stats
('row_count'='9');"""
+ sql """alter table lineitem modify column l_comment set stats
('row_count'='9');"""
+
sql """analyze table orders with sync;"""
sql """analyze table lineitem with sync;"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
