fix regression test

seawinde · Oct 22, 2024 · a2bbddf · a2bbddf
1 parent 779d25f
commit a2bbddf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -1607,7 +1607,7 @@ class Suite implements GroovyInterceptable {
                     for (String mv_name : mv_names) {
                         def splitResult = result.split("MaterializedViewRewriteFail")
                         def each_result =  splitResult.length == 2 ? splitResult[0].contains(mv_name) : false
-                        success = success && each_result
+                        success = success && (result.contains"(${mv_name})" || each_result)
                     }
                     Assert.assertEquals(true, success)
                 }
@@ -1640,7 +1640,7 @@ class Suite implements GroovyInterceptable {
                     for (String mv_name : mv_names) {
                         def splitResult = result.split("MaterializedViewRewriteFail")
                         def each_result =  splitResult.length == 2 ? splitResult[0].contains(mv_name) : false
-                        success = success || each_result
+                        success = success || (result.contains"(${mv_name})" || each_result)
                     }
                     Assert.assertEquals(true, success)
                 }
@@ -1669,7 +1669,7 @@ class Suite implements GroovyInterceptable {
                 sql("${query_sql}")
                 check { result ->
                     def splitResult = result.split("MaterializedViewRewriteFail")
-                    splitResult.length == 2 ? splitResult[0].contains(mv_name) : false
+                    result.contains"(${mv_name})" || (splitResult.length == 2 ? splitResult[0].contains(mv_name) : false)
                 }
             }
             return

diff --git a/regression-test/suites/mtmv_p0/test_create_mv_mtmv.groovy b/regression-test/suites/mtmv_p0/test_create_mv_mtmv.groovy
@@ -77,7 +77,7 @@ suite("test_create_mv_mtmv","mtmv") {
     order_qt_refresh_mv "SELECT * FROM ${mvName}"
     order_qt_sync_mv "SELECT k2 FROM ${mvName}"
 
-    mv_rewrite_success_without_check_chosen("""SELECT k2 FROM ${mvName}""", "mv_mtmv1", true)
+    mv_rewrite_success_without_check_chosen("""SELECT k2 FROM ${mvName}""", "mv_mtmv1")
 
     sql """DROP MATERIALIZED VIEW  mv_mtmv1 ON ${mvName};"""
 

diff --git a/regression-test/suites/nereids_rules_p0/mv/agg_on_none_agg/agg_on_none_agg.groovy b/regression-test/suites/nereids_rules_p0/mv/agg_on_none_agg/agg_on_none_agg.groovy
@@ -267,7 +267,7 @@ suite("agg_on_none_agg") {
              bin(o_orderkey);
             """
     order_qt_query3_0_before "${query3_0}"
-    async_mv_rewrite_success(db, mv3_0, query3_0, "mv3_0")
+    async_mv_rewrite_success_without_check_chosen(db, mv3_0, query3_0, "mv3_0", true)
     order_qt_query3_0_after "${query3_0}"
     sql """ DROP MATERIALIZED VIEW IF EXISTS mv3_0"""
 

diff --git a/regression-test/suites/nereids_rules_p0/mv/variant/variant_mv.groovy b/regression-test/suites/nereids_rules_p0/mv/variant/variant_mv.groovy
@@ -279,7 +279,7 @@ suite("variant_mv") {
     cast(repo['name'] as varchar(100));
     """
     order_qt_query2_1_before "${query2_1}"
-    async_mv_rewrite_success(db, mv2_1, query2_1, "mv2_1")
+    async_mv_rewrite_success_without_check_chosen(db, mv2_1, query2_1, "mv2_1", true)
     order_qt_query2_1_after "${query2_1}"
     sql """ DROP MATERIALIZED VIEW IF EXISTS mv2_1"""