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 index a1b24adb28b34c..b7cbd5ec7e254a 100644 --- 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 @@ -1648,41 +1648,6 @@ class Suite implements GroovyInterceptable { return debugPoint } - // get follower ip - def get_follower_ip = { - def result = sql """show frontends;""" - if (result.size() == 1) { - return null - } - for (int i = 0; i < result.size(); i++) { - if (result[i][7] == "FOLLOWER" && result[i][8] == "false" && result[i][11] == "true") { - return result[i][1] - } - } - return null - } - - // get master ip - def get_master_ip = { - def result = sql """show frontends;""" - for (int i = 0; i < result.size(); i++) { - if (result[i][7] == "FOLLOWER" && result[i][8] == "true" && result[i][11] == "true") { - return result[i][1] - } - } - return null - } - - def run_on_follower_and_master = { test_fn -> - for (def ip in [get_follower_ip(), get_master_ip()]) { - if (ip != null) { - def jdbc_url = context.config.jdbcUrl.replaceAll(/\/\/[0-9.]+:/, "//${ip}:") - logger.info("jdbc_url: " + jdbc_url) - test_fn(jdbc_url) - } - } - } - def waitingMTMVTaskFinishedByMvName = { mvName, dbName = context.dbName -> Thread.sleep(2000); String showTasks = "select TaskId,JobId,JobName,MvId,Status,MvName,MvDatabaseName,ErrorMsg from tasks('type'='mv') where MvDatabaseName = '${dbName}' and MvName = '${mvName}' order by CreateTime ASC" diff --git a/regression-test/suites/mtmv_p0/test_base_add_col_multi_level_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_add_col_multi_level_mtmv.groovy index 21fdca199cdbef..1d079661968b49 100644 --- a/regression-test/suites/mtmv_p0/test_base_add_col_multi_level_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_add_col_multi_level_mtmv.groovy @@ -127,26 +127,14 @@ suite("test_base_add_col_multi_level_mtmv","mtmv") { sql """ alter table ${tableName1} add COLUMN new_col INT AFTER k2; """ + assertEquals("FINISHED", getAlterColumnFinalState("${tableName1}")) + order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - - assertEquals("FINISHED", getAlterColumnFinalState("${tableName1}")) - - order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - - mv_rewrite_success_without_check_chosen(querySql, mvName1) - mv_rewrite_success_without_check_chosen(querySql, mvName2) - mv_rewrite_success_without_check_chosen(querySql, mvName3) - mv_rewrite_success_without_check_chosen(querySql, mvName4) - } - }) - - + mv_rewrite_success_without_check_chosen(querySql, mvName1) + mv_rewrite_success_without_check_chosen(querySql, mvName2) + mv_rewrite_success_without_check_chosen(querySql, mvName3) + mv_rewrite_success_without_check_chosen(querySql, mvName4) } diff --git a/regression-test/suites/mtmv_p0/test_base_alter_col_comment_multi_level_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_alter_col_comment_multi_level_mtmv.groovy index 690bd1a317a34d..6bb2eba17adb41 100644 --- a/regression-test/suites/mtmv_p0/test_base_alter_col_comment_multi_level_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_alter_col_comment_multi_level_mtmv.groovy @@ -128,21 +128,13 @@ suite("test_base_alter_col_comment_multi_level_mtmv","mtmv") { sql """ alter table ${tableName1} modify COLUMN k3 COMMENT 'new comment'; """ + order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - - mv_rewrite_success_without_check_chosen(querySql, mvName1) - mv_rewrite_success_without_check_chosen(querySql, mvName2) - mv_rewrite_success_without_check_chosen(querySql, mvName3) - mv_rewrite_success_without_check_chosen(querySql, mvName4) - } - }) + mv_rewrite_success_without_check_chosen(querySql, mvName1) + mv_rewrite_success_without_check_chosen(querySql, mvName2) + mv_rewrite_success_without_check_chosen(querySql, mvName3) + mv_rewrite_success_without_check_chosen(querySql, mvName4) } 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 0bd4d645edddef..83abd73dde56bc 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 @@ -128,20 +128,13 @@ suite("test_base_alter_col_type_multi_level_mtmv","mtmv") { sql """ alter table ${tableName1} modify COLUMN k3 VARCHAR(100); """ - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" + order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - 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_success_without_check_chosen(querySql, mvName2) + mv_not_part_in(querySql, mvName1) + mv_not_part_in(querySql, mvName3) + mv_not_part_in(querySql, mvName4) } diff --git a/regression-test/suites/mtmv_p0/test_base_comment_multi_level_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_comment_multi_level_mtmv.groovy index 462f23c445f1d9..5636c7dbcb4fa9 100644 --- a/regression-test/suites/mtmv_p0/test_base_comment_multi_level_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_comment_multi_level_mtmv.groovy @@ -127,20 +127,13 @@ suite("test_base_comment_multi_level_mtmv","mtmv") { sql """ alter table ${tableName1} MODIFY COMMENT "new table comment"; """ - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_comment_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_comment_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_comment_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_comment_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" + order_qt_comment_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_comment_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_comment_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_comment_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - mv_rewrite_success_without_check_chosen(querySql, mvName1) - mv_rewrite_success_without_check_chosen(querySql, mvName2) - mv_rewrite_success_without_check_chosen(querySql, mvName3) - mv_rewrite_success_without_check_chosen(querySql, mvName4) - } - }) + mv_rewrite_success_without_check_chosen(querySql, mvName1) + mv_rewrite_success_without_check_chosen(querySql, mvName2) + mv_rewrite_success_without_check_chosen(querySql, mvName3) + mv_rewrite_success_without_check_chosen(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 8e65da0bbe9371..3f0b77e6073416 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 @@ -128,21 +128,14 @@ suite("test_base_drop_col_multi_level_mtmv","mtmv") { sql """ alter table ${tableName1} drop COLUMN k3; """ - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - assertEquals("FINISHED", getAlterColumnFinalState("${tableName1}")) - order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" + assertEquals("FINISHED", getAlterColumnFinalState("${tableName1}")) + order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - 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_success_without_check_chosen(querySql, mvName2) + mv_not_part_in(querySql, mvName1) + mv_not_part_in(querySql, mvName3) + mv_not_part_in(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 d6a983ff06142b..e81f1799ec50ed 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 @@ -125,17 +125,10 @@ suite("test_base_drop_multi_level_mtmv","mtmv") { // drop t1 sql """drop table if exists `${tableName1}`""" - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_drop_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_drop_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_drop_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_drop_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - } - }) + order_qt_drop_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_drop_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_drop_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_drop_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" sql """ CREATE TABLE ${tableName1} @@ -152,15 +145,8 @@ suite("test_base_drop_multi_level_mtmv","mtmv") { INSERT INTO ${tableName1} VALUES(1,"a"); """ - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - 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_success_without_check_chosen(querySql, mvName2) + mv_not_part_in(querySql, mvName1) + mv_not_part_in(querySql, mvName3) + mv_not_part_in(querySql, mvName4) } diff --git a/regression-test/suites/mtmv_p0/test_base_recreate_on_commit_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_recreate_on_commit_mtmv.groovy index adb707fc982e9e..c2011952a52730 100644 --- a/regression-test/suites/mtmv_p0/test_base_recreate_on_commit_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_recreate_on_commit_mtmv.groovy @@ -58,25 +58,11 @@ suite("test_base_recreate_on_commit_mtmv","mtmv") { REFRESH MATERIALIZED VIEW ${mvName} auto """ waitingMTMVTaskFinishedByMvName(mvName) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_select_init "select * from ${mvName}" - } - }) + order_qt_select_init "select * from ${mvName}" // drop and recreate sql """drop table if exists `${tableName1}`""" - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_drop "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" - } - }) + order_qt_drop "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" sql """ CREATE TABLE ${tableName1} @@ -95,14 +81,6 @@ suite("test_base_recreate_on_commit_mtmv","mtmv") { """ waitingMTMVTaskFinishedByMvName(mvName) - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_recreate "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" - order_qt_select_recreate "select * from ${mvName}" - } - }) + order_qt_recreate "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" + order_qt_select_recreate "select * from ${mvName}" } 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 9a2c104490f9ee..2e803efa5d2389 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 @@ -128,21 +128,13 @@ suite("test_base_rename_col_multi_level_mtmv","mtmv") { sql """ alter table ${tableName1} rename COLUMN k3 k4; """ + order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_add_col_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_add_col_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_add_col_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_add_col_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - - 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_success_without_check_chosen(querySql, mvName2) + mv_not_part_in(querySql, mvName1) + mv_not_part_in(querySql, mvName3) + mv_not_part_in(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 876e14dccb667c..0f967ec096aec1 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 @@ -129,21 +129,13 @@ suite("test_base_rename_multi_level_mtmv","mtmv") { sql """ ALTER TABLE ${tableName1} rename ${tableName1Rename}; """ + order_qt_drop_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_drop_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_drop_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_drop_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_drop_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_drop_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_drop_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_drop_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - - 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_success_without_check_chosen(querySql, mvName2) + mv_not_part_in(querySql, mvName1) + mv_not_part_in(querySql, mvName3) + mv_not_part_in(querySql, mvName4) } diff --git a/regression-test/suites/mtmv_p0/test_base_rename_mv_multi_level_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_rename_mv_multi_level_mtmv.groovy index e4640f052904ed..db95b0e412c5f2 100644 --- a/regression-test/suites/mtmv_p0/test_base_rename_mv_multi_level_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_rename_mv_multi_level_mtmv.groovy @@ -129,36 +129,20 @@ suite("test_base_rename_mv_multi_level_mtmv","mtmv") { sql """ ALTER MATERIALIZED VIEW ${mvName1} rename ${mvName1Rename}; """ - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_rename_mv_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1Rename}'" - order_qt_rename_mv_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_rename_mv_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_rename_mv_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - // rename table will rename default partition name, so will change to async - mv_not_part_in(querySql, mvName1Rename) - mv_rewrite_success_without_check_chosen(querySql, mvName2) - mv_rewrite_success_without_check_chosen(querySql, mvName3) - mv_not_part_in(querySql, mvName4) - } - }) + order_qt_rename_mv_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1Rename}'" + order_qt_rename_mv_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_rename_mv_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_rename_mv_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" + // rename table will rename default partition name, so will change to async + mv_not_part_in(querySql, mvName1Rename) + mv_rewrite_success_without_check_chosen(querySql, mvName2) + mv_rewrite_success_without_check_chosen(querySql, mvName3) + mv_not_part_in(querySql, mvName4) // after refresh,should can rewrite sql """ REFRESH MATERIALIZED VIEW ${mvName1Rename} auto """ waitingMTMVTaskFinishedByMvName(mvName1Rename) - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - mv_rewrite_success_without_check_chosen(querySql, mvName1Rename) - } - }) + mv_rewrite_success_without_check_chosen(querySql, mvName1Rename) } diff --git a/regression-test/suites/mtmv_p0/test_base_rename_on_commit_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_rename_on_commit_mtmv.groovy index 4b72ebf92a7650..02aca18c0f33e4 100644 --- a/regression-test/suites/mtmv_p0/test_base_rename_on_commit_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_rename_on_commit_mtmv.groovy @@ -58,27 +58,13 @@ suite("test_base_rename_on_commit_mtmv","mtmv") { REFRESH MATERIALIZED VIEW ${mvName} auto """ waitingMTMVTaskFinishedByMvName(mvName) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_select_init "select * from ${mvName}" - } - }) + order_qt_select_init "select * from ${mvName}" // rename and recreate sql """ ALTER TABLE ${tableName1} rename ${tableName2}; """ - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_rename "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" - } - }) + order_qt_rename "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" sql """ INSERT INTO ${tableName2} VALUES(2,2); @@ -86,15 +72,8 @@ suite("test_base_rename_on_commit_mtmv","mtmv") { // after rename, should not refresh auto waitingMTMVTaskFinishedByMvName(mvName) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_rename "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" - order_qt_select_rename "select * from ${mvName}" - } - }) + order_qt_rename "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" + order_qt_select_rename "select * from ${mvName}" // create t1 sql """ @@ -113,30 +92,14 @@ suite("test_base_rename_on_commit_mtmv","mtmv") { """ waitingMTMVTaskFinishedByMvName(mvName) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_recreate_auto "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" - order_qt_select_recreate_auto "select * from ${mvName}" - - // t2 should not trigger refresh - order_qt_before_trigger "select count(*) from tasks('type'='mv') where MvName='${mvName}'" - } - }) + order_qt_recreate_auto "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" + order_qt_select_recreate_auto "select * from ${mvName}" + // t2 should not trigger refresh + order_qt_before_trigger "select count(*) from tasks('type'='mv') where MvName='${mvName}'" sql """ INSERT INTO ${tableName2} VALUES(4,4); """ waitingMTMVTaskFinishedByMvName(mvName) - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_after_trigger "select count(*) from tasks('type'='mv') where MvName='${mvName}'" - } - }) + order_qt_after_trigger "select count(*) from tasks('type'='mv') where MvName='${mvName}'" } diff --git a/regression-test/suites/mtmv_p0/test_base_rename_p_mv_multi_level_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_rename_p_mv_multi_level_mtmv.groovy index f3a66e5704a299..e7ba67650f99cf 100644 --- a/regression-test/suites/mtmv_p0/test_base_rename_p_mv_multi_level_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_rename_p_mv_multi_level_mtmv.groovy @@ -142,21 +142,13 @@ suite("test_base_rename_p_mv_multi_level_mtmv","mtmv") { sql """ ALTER MATERIALIZED VIEW ${mvName1} rename ${mvName1Rename}; """ - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_rename_mv_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1Rename}'" - order_qt_rename_mv_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_rename_mv_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_rename_mv_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - mv_rewrite_success_without_check_chosen(querySql, mvName1Rename) - mv_rewrite_success_without_check_chosen(querySql, mvName2) - mv_rewrite_success_without_check_chosen(querySql, mvName3) - mv_not_part_in(querySql, mvName4) - mv_not_part_in(querySql, mvName1) - } - }) + order_qt_rename_mv_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1Rename}'" + order_qt_rename_mv_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_rename_mv_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_rename_mv_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" + mv_rewrite_success_without_check_chosen(querySql, mvName1Rename) + mv_rewrite_success_without_check_chosen(querySql, mvName2) + mv_rewrite_success_without_check_chosen(querySql, mvName3) + mv_not_part_in(querySql, mvName4) + mv_not_part_in(querySql, mvName1) } 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 a3d791e5337c1d..d572a818a9b108 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 @@ -127,23 +127,15 @@ suite("test_base_replace_multi_level_mtmv","mtmv") { sql """ ALTER TABLE ${tableName1} REPLACE WITH TABLE ${tableName2} PROPERTIES('swap' = 'true'); """ + order_qt_replace_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_replace_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_replace_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_replace_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_replace_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_replace_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_replace_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_replace_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - - 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_not_part_in(querySql, mvName2) + mv_not_part_in(querySql, mvName1) + mv_not_part_in(querySql, mvName3) + mv_not_part_in(querySql, mvName4) sql """ REFRESH MATERIALIZED VIEW ${mvName1} auto @@ -165,39 +157,24 @@ suite("test_base_replace_multi_level_mtmv","mtmv") { """ waitingMTMVTaskFinishedByMvName(mvName4) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_refresh_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_refresh_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_refresh_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_refresh_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" + order_qt_refresh_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_refresh_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_refresh_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_refresh_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - mv_rewrite_success_without_check_chosen(querySql, mvName1) - mv_rewrite_success_without_check_chosen(querySql, mvName2) - mv_rewrite_success_without_check_chosen(querySql, mvName3) - mv_rewrite_success_without_check_chosen(querySql, mvName4) - } - }) + mv_rewrite_success_without_check_chosen(querySql, mvName1) + mv_rewrite_success_without_check_chosen(querySql, mvName2) + mv_rewrite_success_without_check_chosen(querySql, mvName3) + mv_rewrite_success_without_check_chosen(querySql, mvName4) // replace t1 swap false sql """ ALTER TABLE ${tableName1} REPLACE WITH TABLE ${tableName2} PROPERTIES('swap' = 'false'); """ - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_replace_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_replace_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_replace_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_replace_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - } - }) + order_qt_replace_t1_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_replace_t1_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_replace_t1_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_replace_t1_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" } diff --git a/regression-test/suites/mtmv_p0/test_base_replace_mv_multi_level_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_replace_mv_multi_level_mtmv.groovy index 4602673975cb25..410f28afd02343 100644 --- a/regression-test/suites/mtmv_p0/test_base_replace_mv_multi_level_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_replace_mv_multi_level_mtmv.groovy @@ -144,87 +144,51 @@ suite("test_base_replace_mv_multi_level_mtmv","mtmv") { sql """ ALTER MATERIALIZED VIEW ${mvName1} REPLACE WITH MATERIALIZED VIEW ${mvName11} PROPERTIES('swap' = 'true');; """ - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_replace_true_mv_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_replace_true_mv_mv11 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName11}'" - order_qt_replace_true_mv_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_replace_true_mv_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_replace_true_mv_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - // replace table will rename default partition name, so will change to async - mv_not_part_in(querySql, mvName1) - mv_not_part_in(querySql, mvName11) - mv_rewrite_success_without_check_chosen(querySql, mvName2) - mv_rewrite_success_without_check_chosen(querySql, mvName3) - mv_not_part_in(querySql, mvName4) - } - }) + order_qt_replace_true_mv_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_replace_true_mv_mv11 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName11}'" + order_qt_replace_true_mv_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_replace_true_mv_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_replace_true_mv_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" + // replace table will rename default partition name, so will change to async + mv_not_part_in(querySql, mvName1) + mv_not_part_in(querySql, mvName11) + mv_rewrite_success_without_check_chosen(querySql, mvName2) + mv_rewrite_success_without_check_chosen(querySql, mvName3) + mv_not_part_in(querySql, mvName4) // after refresh,should can rewrite sql """ REFRESH MATERIALIZED VIEW ${mvName1} auto """ waitingMTMVTaskFinishedByMvName(mvName1) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - mv_rewrite_success_without_check_chosen(querySql, mvName1) - } - }) + mv_rewrite_success_without_check_chosen(querySql, mvName1) // after refresh,should can rewrite sql """ REFRESH MATERIALIZED VIEW ${mvName11} auto """ waitingMTMVTaskFinishedByMvName(mvName11) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - mv_rewrite_success_without_check_chosen(querySql, mvName11) - } - }) + mv_rewrite_success_without_check_chosen(querySql, mvName11) // replace mv1 sql """ ALTER MATERIALIZED VIEW ${mvName1} REPLACE WITH MATERIALIZED VIEW ${mvName11} PROPERTIES('swap' = 'false');; """ - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_replace_false_mv_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" - order_qt_replace_false_mv_mv11 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName11}'" - order_qt_replace_false_mv_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" - order_qt_replace_false_mv_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" - order_qt_replace_false_mv_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" - // replace table will rename default partition name, so will change to async - mv_not_part_in(querySql, mvName1) - mv_rewrite_success_without_check_chosen(querySql, mvName2) - mv_rewrite_success_without_check_chosen(querySql, mvName3) - mv_not_part_in(querySql, mvName4) - } - }) + order_qt_replace_false_mv_mv1 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName1}'" + order_qt_replace_false_mv_mv11 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName11}'" + order_qt_replace_false_mv_mv2 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName2}'" + order_qt_replace_false_mv_mv3 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName3}'" + order_qt_replace_false_mv_mv4 "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName4}'" + // replace table will rename default partition name, so will change to async + mv_not_part_in(querySql, mvName1) + mv_rewrite_success_without_check_chosen(querySql, mvName2) + mv_rewrite_success_without_check_chosen(querySql, mvName3) + mv_not_part_in(querySql, mvName4) // after refresh,should can rewrite sql """ REFRESH MATERIALIZED VIEW ${mvName1} auto """ waitingMTMVTaskFinishedByMvName(mvName1) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - mv_rewrite_success_without_check_chosen(querySql, mvName1) - } - }) + mv_rewrite_success_without_check_chosen(querySql, mvName1) } diff --git a/regression-test/suites/mtmv_p0/test_base_replace_on_commit_mtmv.groovy b/regression-test/suites/mtmv_p0/test_base_replace_on_commit_mtmv.groovy index 5d8a4f3eb3d7f3..4139d73bb3d405 100644 --- a/regression-test/suites/mtmv_p0/test_base_replace_on_commit_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_base_replace_on_commit_mtmv.groovy @@ -74,58 +74,27 @@ suite("test_base_replace_on_commit_mtmv","mtmv") { REFRESH MATERIALIZED VIEW ${mvName} auto """ waitingMTMVTaskFinishedByMvName(mvName) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_select_init "select * from ${mvName}" - } - }) + order_qt_select_init "select * from ${mvName}" // replace sql """ ALTER TABLE ${tableName1} REPLACE WITH TABLE ${tableName2} PROPERTIES('swap' = 'true'); """ - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_replace "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" - } - }) + order_qt_replace "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" sql """ INSERT INTO ${tableName1} VALUES(2,2); """ waitingMTMVTaskFinishedByMvName(mvName) - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_replace_normal "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" - order_qt_select_replace "select * from ${mvName}" + order_qt_replace_normal "select Name,State,RefreshState from mv_infos('database'='${dbName}') where Name='${mvName}'" + order_qt_select_replace "select * from ${mvName}" - - // t2 should not trigger refresh - order_qt_before_trigger "select count(*) from tasks('type'='mv') where MvName='${mvName}'" - - } - }) + // t2 should not trigger refresh + order_qt_before_trigger "select count(*) from tasks('type'='mv') where MvName='${mvName}'" sql """ INSERT INTO ${tableName2} VALUES(20,20); """ waitingMTMVTaskFinishedByMvName(mvName) - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_after_trigger "select count(*) from tasks('type'='mv') where MvName='${mvName}'" - } - }) + order_qt_after_trigger "select count(*) from tasks('type'='mv') where MvName='${mvName}'" } diff --git a/regression-test/suites/mtmv_p0/test_column_type_mtmv.groovy b/regression-test/suites/mtmv_p0/test_column_type_mtmv.groovy index 867623f0acbe07..fdf03ad19da692 100644 --- a/regression-test/suites/mtmv_p0/test_column_type_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_column_type_mtmv.groovy @@ -18,7 +18,6 @@ import org.junit.Assert; suite("test_column_type_mtmv","mtmv") { - String dbName = context.config.getDbNameByFile(context.file) String suiteName = "test_column_type_mtmv" String tableName = "${suiteName}_table" String mvName = "${suiteName}_mv" @@ -48,38 +47,15 @@ suite("test_column_type_mtmv","mtmv") { """ waitingMTMVTaskFinishedByMvName(mvName) - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_normal "select Name,State,RefreshState from mv_infos('database'='regression_test_mtmv_p0') where Name='${mvName}'" - } - }) + order_qt_normal "select Name,State,RefreshState from mv_infos('database'='regression_test_mtmv_p0') where Name='${mvName}'" sql """alter table ${tableName} modify column class_id bigint;""" assertEquals("FINISHED", getAlterColumnFinalState("${tableName}")) - - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_after_schema_change "select Name,State,RefreshState from mv_infos('database'='regression_test_mtmv_p0') where Name='${mvName}'" - } - }) + order_qt_after_schema_change "select Name,State,RefreshState from mv_infos('database'='regression_test_mtmv_p0') where Name='${mvName}'" sql """ REFRESH MATERIALIZED VIEW ${mvName} auto; """ def jobName = getJobName("regression_test_mtmv_p0", mvName); waitingMTMVTaskFinishedNotNeedSuccess(jobName) // can not be rewrite - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_after_refresh "select Name,State,RefreshState from mv_infos('database'='regression_test_mtmv_p0') where Name='${mvName}'" - } - }) + order_qt_after_refresh "select Name,State,RefreshState from mv_infos('database'='regression_test_mtmv_p0') where Name='${mvName}'" } diff --git a/regression-test/suites/mtmv_p0/test_recreate_table_mtmv.groovy b/regression-test/suites/mtmv_p0/test_recreate_table_mtmv.groovy index 7ff44e27850753..ffae7398e3ab0c 100644 --- a/regression-test/suites/mtmv_p0/test_recreate_table_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_recreate_table_mtmv.groovy @@ -18,7 +18,6 @@ import org.junit.Assert; suite("test_recreate_table_mtmv","mtmv") { - String dbName = context.config.getDbNameByFile(context.file) String suiteName = "test_recreate_table_mtmv" String tableName1 = "${suiteName}_table1" String tableName2 = "${suiteName}_table2" @@ -64,14 +63,7 @@ suite("test_recreate_table_mtmv","mtmv") { ) AS (SELECT * FROM ${tableName1} ); """ waitingMTMVTaskFinishedByMvName(mvName1); - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_mv1 "SELECT * FROM ${mvName1}" - } - }) + order_qt_mv1 "SELECT * FROM ${mvName1}" sql """ CREATE MATERIALIZED VIEW IF NOT EXISTS ${mvName2} BUILD IMMEDIATE REFRESH AUTO ON COMMIT DISTRIBUTED BY RANDOM BUCKETS 2 PROPERTIES ( @@ -79,14 +71,7 @@ suite("test_recreate_table_mtmv","mtmv") { ) AS (SELECT first_name,count(last_name) FROM ${mvName1} GROUP BY first_name); """ waitingMTMVTaskFinishedByMvName(mvName2); - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_mv2 "SELECT * FROM ${mvName2}" - } - }) + order_qt_mv2 "SELECT * FROM ${mvName2}" sql """drop materialized view if exists ${mvName1};""" sql """ CREATE MATERIALIZED VIEW IF NOT EXISTS ${mvName1} BUILD IMMEDIATE REFRESH AUTO ON COMMIT DISTRIBUTED BY RANDOM BUCKETS 2 @@ -95,26 +80,12 @@ suite("test_recreate_table_mtmv","mtmv") { ) AS (SELECT * FROM ${tableName2} ); """ waitingMTMVTaskFinishedByMvName(mvName1); - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_mv1_recreate "SELECT * FROM ${mvName1}" - } - }) + order_qt_mv1_recreate "SELECT * FROM ${mvName1}" sql """ REFRESH MATERIALIZED VIEW ${mvName2} auto """ waitingMTMVTaskFinishedByMvName(mvName2); - run_on_follower_and_master({ jdbc_url -> - connect(context.config.jdbcUser, context.config.jdbcPassword, jdbc_url) { - sql "sync" - sql """set enable_materialized_view_nest_rewrite = true;""" - sql "use ${dbName}" - order_qt_mv2_recreate "SELECT * FROM ${mvName2}" - } - }) + order_qt_mv2_recreate "SELECT * FROM ${mvName2}" sql """drop table if exists `${tableName1}`""" sql """drop table if exists `${tableName2}`"""