This is an automated email from the ASF dual-hosted git repository.
morningman 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 879c08d1e96 branch-4.0: [fix](test) fix 4.0 hudi mtmv flaky test cases
(#64996)
879c08d1e96 is described below
commit 879c08d1e964244b784e03b74beb2855fd822d02
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Tue Jun 30 17:10:11 2026 +0800
branch-4.0: [fix](test) fix 4.0 hudi mtmv flaky test cases (#64996)
---
.../hudi/test_hudi_olap_rewrite_mtmv.groovy | 14 +++++++-------
.../external_table_p2/hudi/test_hudi_rewrite_mtmv.groovy | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/regression-test/suites/external_table_p2/hudi/test_hudi_olap_rewrite_mtmv.groovy
b/regression-test/suites/external_table_p2/hudi/test_hudi_olap_rewrite_mtmv.groovy
index 484fe4c60ae..fe80d3c9b6e 100644
---
a/regression-test/suites/external_table_p2/hudi/test_hudi_olap_rewrite_mtmv.groovy
+++
b/regression-test/suites/external_table_p2/hudi/test_hudi_olap_rewrite_mtmv.groovy
@@ -51,6 +51,7 @@ suite("test_hudi_olap_rewrite_mtmv", "p2,external,hudi") {
sql """set materialized_view_rewrite_enable_contain_external_table=true;"""
String mvSql = "SELECT a.id, a.age, a.par, b.user_id, b.num FROM
${catalogName}.`hudi_mtmv_regression_test`.hudi_table_1 a left join
${tableName} b on a.id=b.user_id;";
+ String rewriteSql = mvSql.replaceFirst("(?i)^\\s*SELECT", "SELECT
/*+use_mv(${mvName})*/")
sql """drop catalog if exists ${catalogName}"""
sql """
@@ -91,12 +92,12 @@ suite("test_hudi_olap_rewrite_mtmv", "p2,external,hudi") {
waitingMTMVTaskFinishedByMvName(mvName)
order_qt_refresh_one_partition "SELECT id, age, par, user_id, num FROM
${mvName} "
- def explainOnePartition = sql """ explain ${mvSql} """
+ def explainOnePartition = sql """ explain ${rewriteSql} """
logger.info("explainOnePartition: " + explainOnePartition.toString())
assertTrue(explainOnePartition.toString().contains("VUNION"))
- order_qt_refresh_one_partition_rewrite "${mvSql}"
+ order_qt_refresh_one_partition_rewrite "${rewriteSql}"
- mv_rewrite_success("${mvSql}", "${mvName}")
+ mv_rewrite_success("${rewriteSql}", "${mvName}")
// select p_b should not rewrite
mv_not_part_in("SELECT a.id, a.age, a.par, b.user_id, b.num FROM
${catalogName}.`hudi_mtmv_regression_test`.hudi_table_1 a left join
${tableName} b on a.id=b.user_id where a.par='b';", "${mvName}")
@@ -108,14 +109,13 @@ suite("test_hudi_olap_rewrite_mtmv", "p2,external,hudi") {
waitingMTMVTaskFinishedByMvName(mvName)
order_qt_refresh_auto "SELECT id, age, par, user_id, num FROM ${mvName} "
- def explainAllPartition = sql """ explain ${mvSql}; """
+ def explainAllPartition = sql """ explain ${rewriteSql}; """
logger.info("explainAllPartition: " + explainAllPartition.toString())
assertTrue(explainAllPartition.toString().contains("VOlapScanNode"))
- order_qt_refresh_all_partition_rewrite "${mvSql}"
+ order_qt_refresh_all_partition_rewrite "${rewriteSql}"
- mv_rewrite_success("${mvSql}", "${mvName}")
+ mv_rewrite_success("${rewriteSql}", "${mvName}")
sql """drop materialized view if exists ${mvName};"""
sql """drop catalog if exists ${catalogName}"""
}
-
diff --git
a/regression-test/suites/external_table_p2/hudi/test_hudi_rewrite_mtmv.groovy
b/regression-test/suites/external_table_p2/hudi/test_hudi_rewrite_mtmv.groovy
index c08ed9fa06e..3d6ade24d5d 100644
---
a/regression-test/suites/external_table_p2/hudi/test_hudi_rewrite_mtmv.groovy
+++
b/regression-test/suites/external_table_p2/hudi/test_hudi_rewrite_mtmv.groovy
@@ -34,6 +34,7 @@ suite("test_hudi_rewrite_mtmv", "p2,external,hudi") {
sql """set materialized_view_rewrite_enable_contain_external_table=true;"""
String mvSql = "SELECT par,count(*) as num FROM
${catalogName}.`hudi_mtmv_regression_test`.hudi_table_1 group by par;";
+ String rewriteSql = mvSql.replaceFirst("(?i)^\\s*SELECT", "SELECT
/*+use_mv(${mvName})*/")
sql """drop catalog if exists ${catalogName}"""
sql """
@@ -152,10 +153,10 @@ modify column _hoodie_commit_time set stats (
sql """alter table ${mvName} modify column par set stats
('row_count'='1');"""
- mv_rewrite_success(mvSql, mvName)
- order_qt_refresh_one_partition_rewrite "${mvSql}"
+ mv_rewrite_success(rewriteSql, mvName)
+ order_qt_refresh_one_partition_rewrite "${rewriteSql}"
- mv_rewrite_success("${mvSql}", "${mvName}")
+ mv_rewrite_success("${rewriteSql}", "${mvName}")
// select p_b should not rewrite
mv_not_part_in("SELECT par,count(*) as num FROM
${catalogName}.`hudi_mtmv_regression_test`.hudi_table_1 where par='b' group by
par;", "${mvName}")
@@ -169,12 +170,11 @@ modify column _hoodie_commit_time set stats (
sql """alter table ${mvName} modify column par set stats
('row_count'='2');"""
order_qt_refresh_auto "SELECT par, num FROM ${mvName} "
- mv_rewrite_success(mvSql, mvName)
- order_qt_refresh_all_partition_rewrite "${mvSql}"
+ mv_rewrite_success(rewriteSql, mvName)
+ order_qt_refresh_all_partition_rewrite "${rewriteSql}"
- mv_rewrite_success("${mvSql}", "${mvName}")
+ mv_rewrite_success("${rewriteSql}", "${mvName}")
sql """drop materialized view if exists ${mvName};"""
sql """drop catalog if exists ${catalogName}"""
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
