This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new e33a0c379a2 branch-3.1: [enhance](mtmv)Base table changes should not
cause nested MTMV to schema change status #56244 (#56298)
e33a0c379a2 is described below
commit e33a0c379a2d835f29ecd1235eea46ce62d96bdc
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Sep 25 17:28:07 2025 +0800
branch-3.1: [enhance](mtmv)Base table changes should not cause nested MTMV
to schema change status #56244 (#56298)
Cherry-picked from #56244
Co-authored-by: zhangdong <[email protected]>
---
.../src/main/java/org/apache/doris/mtmv/MTMVRelationManager.java | 2 +-
.../data/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.out | 2 +-
regression-test/data/mtmv_p0/test_base_drop_col_multi_level_mtmv.out | 2 +-
regression-test/data/mtmv_p0/test_base_drop_multi_level_mtmv.out | 2 +-
.../data/mtmv_p0/test_base_rename_col_multi_level_mtmv.out | 2 +-
regression-test/data/mtmv_p0/test_base_rename_multi_level_mtmv.out | 2 +-
regression-test/data/mtmv_p0/test_base_replace_multi_level_mtmv.out | 4 ++--
regression-test/data/mtmv_p0/test_multi_level_mtmv.out | 2 +-
.../suites/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.groovy | 2 +-
.../suites/mtmv_p0/test_base_drop_col_multi_level_mtmv.groovy | 2 +-
regression-test/suites/mtmv_p0/test_base_drop_multi_level_mtmv.groovy | 2 +-
.../suites/mtmv_p0/test_base_rename_col_multi_level_mtmv.groovy | 2 +-
.../suites/mtmv_p0/test_base_rename_multi_level_mtmv.groovy | 2 +-
.../suites/mtmv_p0/test_base_replace_multi_level_mtmv.groovy | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelationManager.java
b/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelationManager.java
index 05ab6eb01f1..b4ac9df6a3f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelationManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelationManager.java
@@ -298,7 +298,7 @@ public class MTMVRelationManager implements MTMVHookService
{
}
private void processBaseTableChange(BaseTableInfo baseTableInfo, String
msgPrefix) {
- Set<BaseTableInfo> mtmvsByBaseTable =
getMtmvsByBaseTable(baseTableInfo);
+ Set<BaseTableInfo> mtmvsByBaseTable =
getMtmvsByBaseTableOneLevel(baseTableInfo);
if (CollectionUtils.isEmpty(mtmvsByBaseTable)) {
return;
}
diff --git
a/regression-test/data/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.out
b/regression-test/data/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.out
index 10c71d60f7c..1812d276d4b 100644
--- a/regression-test/data/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.out
+++ b/regression-test/data/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.out
@@ -9,5 +9,5 @@ test_base_alter_col_type_multi_level_mtmv_mv2 NORMAL SUCCESS
test_base_alter_col_type_multi_level_mtmv_mv3 SCHEMA_CHANGE SUCCESS
-- !add_col_t1_mv4 --
-test_base_alter_col_type_multi_level_mtmv_mv4 SCHEMA_CHANGE SUCCESS
+test_base_alter_col_type_multi_level_mtmv_mv4 NORMAL SUCCESS
diff --git
a/regression-test/data/mtmv_p0/test_base_drop_col_multi_level_mtmv.out
b/regression-test/data/mtmv_p0/test_base_drop_col_multi_level_mtmv.out
index c9a16bf56f6..fade3c023bb 100644
--- a/regression-test/data/mtmv_p0/test_base_drop_col_multi_level_mtmv.out
+++ b/regression-test/data/mtmv_p0/test_base_drop_col_multi_level_mtmv.out
@@ -9,5 +9,5 @@ test_base_drop_col_multi_level_mtmv_mv2 NORMAL SUCCESS
test_base_drop_col_multi_level_mtmv_mv3 SCHEMA_CHANGE SUCCESS
-- !add_col_t1_mv4 --
-test_base_drop_col_multi_level_mtmv_mv4 SCHEMA_CHANGE SUCCESS
+test_base_drop_col_multi_level_mtmv_mv4 NORMAL SUCCESS
diff --git a/regression-test/data/mtmv_p0/test_base_drop_multi_level_mtmv.out
b/regression-test/data/mtmv_p0/test_base_drop_multi_level_mtmv.out
index f04ea1d8b30..c4f375184c2 100644
--- a/regression-test/data/mtmv_p0/test_base_drop_multi_level_mtmv.out
+++ b/regression-test/data/mtmv_p0/test_base_drop_multi_level_mtmv.out
@@ -9,5 +9,5 @@ test_base_drop_multi_level_mtmv_mv2 NORMAL SUCCESS
test_base_drop_multi_level_mtmv_mv3 SCHEMA_CHANGE SUCCESS
-- !drop_t1_mv4 --
-test_base_drop_multi_level_mtmv_mv4 SCHEMA_CHANGE SUCCESS
+test_base_drop_multi_level_mtmv_mv4 NORMAL SUCCESS
diff --git
a/regression-test/data/mtmv_p0/test_base_rename_col_multi_level_mtmv.out
b/regression-test/data/mtmv_p0/test_base_rename_col_multi_level_mtmv.out
index 4976d963cd6..3432e2a264c 100644
--- a/regression-test/data/mtmv_p0/test_base_rename_col_multi_level_mtmv.out
+++ b/regression-test/data/mtmv_p0/test_base_rename_col_multi_level_mtmv.out
@@ -9,5 +9,5 @@ test_base_rename_col_multi_level_mtmv_mv2 NORMAL SUCCESS
test_base_rename_col_multi_level_mtmv_mv3 SCHEMA_CHANGE SUCCESS
-- !add_col_t1_mv4 --
-test_base_rename_col_multi_level_mtmv_mv4 SCHEMA_CHANGE SUCCESS
+test_base_rename_col_multi_level_mtmv_mv4 NORMAL SUCCESS
diff --git a/regression-test/data/mtmv_p0/test_base_rename_multi_level_mtmv.out
b/regression-test/data/mtmv_p0/test_base_rename_multi_level_mtmv.out
index 8bbccdee4ce..bdfa62f5aa6 100644
--- a/regression-test/data/mtmv_p0/test_base_rename_multi_level_mtmv.out
+++ b/regression-test/data/mtmv_p0/test_base_rename_multi_level_mtmv.out
@@ -9,5 +9,5 @@ test_base_rename_multi_level_mtmv_mv2 NORMAL SUCCESS
test_base_rename_multi_level_mtmv_mv3 SCHEMA_CHANGE SUCCESS
-- !drop_t1_mv4 --
-test_base_rename_multi_level_mtmv_mv4 SCHEMA_CHANGE SUCCESS
+test_base_rename_multi_level_mtmv_mv4 NORMAL SUCCESS
diff --git
a/regression-test/data/mtmv_p0/test_base_replace_multi_level_mtmv.out
b/regression-test/data/mtmv_p0/test_base_replace_multi_level_mtmv.out
index 147506ca708..dde579609a1 100644
--- a/regression-test/data/mtmv_p0/test_base_replace_multi_level_mtmv.out
+++ b/regression-test/data/mtmv_p0/test_base_replace_multi_level_mtmv.out
@@ -9,7 +9,7 @@ test_base_replace_multi_level_mtmv_mv2 SCHEMA_CHANGE SUCCESS
test_base_replace_multi_level_mtmv_mv3 SCHEMA_CHANGE SUCCESS
-- !replace_t1_mv4 --
-test_base_replace_multi_level_mtmv_mv4 SCHEMA_CHANGE SUCCESS
+test_base_replace_multi_level_mtmv_mv4 NORMAL SUCCESS
-- !refresh_t1_mv1 --
test_base_replace_multi_level_mtmv_mv1 NORMAL SUCCESS
@@ -33,5 +33,5 @@ test_base_replace_multi_level_mtmv_mv2 SCHEMA_CHANGE
SUCCESS
test_base_replace_multi_level_mtmv_mv3 SCHEMA_CHANGE SUCCESS
-- !replace_t1_mv4 --
-test_base_replace_multi_level_mtmv_mv4 SCHEMA_CHANGE SUCCESS
+test_base_replace_multi_level_mtmv_mv4 NORMAL SUCCESS
diff --git a/regression-test/data/mtmv_p0/test_multi_level_mtmv.out
b/regression-test/data/mtmv_p0/test_multi_level_mtmv.out
index 7d44e381cc8..42b39cacea1 100644
--- a/regression-test/data/mtmv_p0/test_multi_level_mtmv.out
+++ b/regression-test/data/mtmv_p0/test_multi_level_mtmv.out
@@ -26,5 +26,5 @@
multi_level_mtmv1 SCHEMA_CHANGE SUCCESS
-- !status2 --
-multi_level_mtmv2 SCHEMA_CHANGE SUCCESS
+multi_level_mtmv2 NORMAL SUCCESS
diff --git
a/regression-test/suites/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.groovy
index 83abd73dde5..df068e59c55 100644
---
a/regression-test/suites/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.groovy
+++
b/regression-test/suites/mtmv_p0/test_base_alter_col_type_multi_level_mtmv.groovy
@@ -136,5 +136,5 @@ suite("test_base_alter_col_type_multi_level_mtmv","mtmv") {
mv_rewrite_success_without_check_chosen(querySql, mvName2)
mv_not_part_in(querySql, mvName1)
mv_not_part_in(querySql, mvName3)
- mv_not_part_in(querySql, mvName4)
+ mv_rewrite_fail(querySql, mvName4)
}
diff --git
a/regression-test/suites/mtmv_p0/test_base_drop_col_multi_level_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_base_drop_col_multi_level_mtmv.groovy
index 3f0b77e6073..e47f6e26964 100644
--- a/regression-test/suites/mtmv_p0/test_base_drop_col_multi_level_mtmv.groovy
+++ b/regression-test/suites/mtmv_p0/test_base_drop_col_multi_level_mtmv.groovy
@@ -137,5 +137,5 @@ suite("test_base_drop_col_multi_level_mtmv","mtmv") {
mv_rewrite_success_without_check_chosen(querySql, mvName2)
mv_not_part_in(querySql, mvName1)
mv_not_part_in(querySql, mvName3)
- mv_not_part_in(querySql, mvName4)
+ mv_rewrite_fail(querySql, mvName4)
}
diff --git
a/regression-test/suites/mtmv_p0/test_base_drop_multi_level_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_base_drop_multi_level_mtmv.groovy
index e81f1799ec5..970aa81b437 100644
--- a/regression-test/suites/mtmv_p0/test_base_drop_multi_level_mtmv.groovy
+++ b/regression-test/suites/mtmv_p0/test_base_drop_multi_level_mtmv.groovy
@@ -148,5 +148,5 @@ suite("test_base_drop_multi_level_mtmv","mtmv") {
mv_rewrite_success_without_check_chosen(querySql, mvName2)
mv_not_part_in(querySql, mvName1)
mv_not_part_in(querySql, mvName3)
- mv_not_part_in(querySql, mvName4)
+ mv_rewrite_fail(querySql, mvName4)
}
diff --git
a/regression-test/suites/mtmv_p0/test_base_rename_col_multi_level_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_base_rename_col_multi_level_mtmv.groovy
index 2e803efa5d2..a88df4c0336 100644
---
a/regression-test/suites/mtmv_p0/test_base_rename_col_multi_level_mtmv.groovy
+++
b/regression-test/suites/mtmv_p0/test_base_rename_col_multi_level_mtmv.groovy
@@ -136,5 +136,5 @@ suite("test_base_rename_col_multi_level_mtmv","mtmv") {
mv_rewrite_success_without_check_chosen(querySql, mvName2)
mv_not_part_in(querySql, mvName1)
mv_not_part_in(querySql, mvName3)
- mv_not_part_in(querySql, mvName4)
+ mv_rewrite_fail(querySql, mvName4)
}
diff --git
a/regression-test/suites/mtmv_p0/test_base_rename_multi_level_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_base_rename_multi_level_mtmv.groovy
index 0f967ec096a..284116b0efd 100644
--- a/regression-test/suites/mtmv_p0/test_base_rename_multi_level_mtmv.groovy
+++ b/regression-test/suites/mtmv_p0/test_base_rename_multi_level_mtmv.groovy
@@ -137,5 +137,5 @@ suite("test_base_rename_multi_level_mtmv","mtmv") {
mv_rewrite_success_without_check_chosen(querySql, mvName2)
mv_not_part_in(querySql, mvName1)
mv_not_part_in(querySql, mvName3)
- mv_not_part_in(querySql, mvName4)
+ mv_rewrite_fail(querySql, mvName4)
}
diff --git
a/regression-test/suites/mtmv_p0/test_base_replace_multi_level_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_base_replace_multi_level_mtmv.groovy
index d572a818a9b..52f88907532 100644
--- a/regression-test/suites/mtmv_p0/test_base_replace_multi_level_mtmv.groovy
+++ b/regression-test/suites/mtmv_p0/test_base_replace_multi_level_mtmv.groovy
@@ -135,7 +135,7 @@ suite("test_base_replace_multi_level_mtmv","mtmv") {
mv_not_part_in(querySql, mvName2)
mv_not_part_in(querySql, mvName1)
mv_not_part_in(querySql, mvName3)
- mv_not_part_in(querySql, mvName4)
+ mv_rewrite_fail(querySql, mvName4)
sql """
REFRESH MATERIALIZED VIEW ${mvName1} auto
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
