diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java index 75954dc408..688c331f4d 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java @@ -1827,7 +1827,7 @@ public class Config extends ConfigBase { /* * mtmv scheduler framework is still under dev, remove this config when it is graduate. */ - @ConfField(mutable = true) + @ConfField(mutable = true, masterOnly = true) public static boolean enable_mtmv_scheduler_framework = false; /* Max running task num at the same time, otherwise the submitted task will still be keep in pending poll*/ diff --git a/regression-test/pipeline/p0/conf/fe.conf b/regression-test/pipeline/p0/conf/fe.conf index f305c13eff..caa1ab7b2b 100644 --- a/regression-test/pipeline/p0/conf/fe.conf +++ b/regression-test/pipeline/p0/conf/fe.conf @@ -76,3 +76,6 @@ use_fuzzy_session_variable=true enable_map_type=true enable_struct_type=true + +# enable mtmv job +enable_mtmv_scheduler_framework = true diff --git a/regression-test/pipeline/p1/conf/fe.conf b/regression-test/pipeline/p1/conf/fe.conf index 0613d4b263..623b5e5a4c 100644 --- a/regression-test/pipeline/p1/conf/fe.conf +++ b/regression-test/pipeline/p1/conf/fe.conf @@ -74,3 +74,6 @@ tablet_create_timeout_second=100 remote_fragment_exec_timeout_ms=60000 fuzzy_test_type=p1 use_fuzzy_session_variable=true + +# enable mtmv job +enable_mtmv_scheduler_framework = true diff --git a/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q41_create.sql b/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q41_create.sql index 244b9f94cb..20f6b1248d 100644 --- a/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q41_create.sql +++ b/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q41_create.sql @@ -3,7 +3,7 @@ BUILD IMMEDIATE REFRESH COMPLETE DISTRIBUTED BY HASH(c_nation) BUCKETS 6 PROPERTIES ('replication_num' = '1') AS -SELECT /*+SET_VAR(parallel_fragment_exec_instance_num=4, enable_vectorized_engine=true, batch_size=4096, enable_cost_based_join_reorder=true, enable_projection=true) */ +SELECT /*+SET_VAR(parallel_fragment_exec_instance_num=4, batch_size=4096) */ d_year, c_nation, SUM(lo_revenue - lo_supplycost) AS PROFIT diff --git a/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q42_create.sql b/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q42_create.sql index 044dea2086..f7cb84d01a 100644 --- a/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q42_create.sql +++ b/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q42_create.sql @@ -3,7 +3,7 @@ BUILD IMMEDIATE REFRESH COMPLETE DISTRIBUTED BY HASH(s_nation, p_category) BUCKETS 6 PROPERTIES ('replication_num' = '1') AS -SELECT /*+SET_VAR(parallel_fragment_exec_instance_num=2, enable_vectorized_engine=true, batch_size=4096, enable_cost_based_join_reorder=true, enable_projection=true) */ +SELECT /*+SET_VAR(parallel_fragment_exec_instance_num=2, batch_size=4096) */ d_year, s_nation, p_category, diff --git a/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q43_create.sql b/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q43_create.sql index 0d60a20c37..264fa42279 100644 --- a/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q43_create.sql +++ b/regression-test/suites/mtmv_p0/ssb/ddl/ssb_q43_create.sql @@ -3,7 +3,7 @@ BUILD IMMEDIATE REFRESH COMPLETE DISTRIBUTED BY HASH(s_city, p_brand) BUCKETS 6 PROPERTIES ('replication_num' = '1') AS -SELECT /*+SET_VAR(parallel_fragment_exec_instance_num=2, enable_vectorized_engine=true, batch_size=4096, enable_cost_based_join_reorder=true, enable_projection=true) */ +SELECT /*+SET_VAR(parallel_fragment_exec_instance_num=2, batch_size=4096) */ d_year, s_city, p_brand, diff --git a/regression-test/suites/mtmv_p0/ssb/test_mtmv_ssb_ddl.groovy b/regression-test/suites/mtmv_p0/ssb/test_mtmv_ssb_ddl.groovy index 838855e6b0..0305dccf3a 100644 --- a/regression-test/suites/mtmv_p0/ssb/test_mtmv_ssb_ddl.groovy +++ b/regression-test/suites/mtmv_p0/ssb/test_mtmv_ssb_ddl.groovy @@ -17,9 +17,6 @@ suite("test_mtmv_ssb_ddl") { def ssb_tables = ["customer", "lineorder", "part", "date", "supplier"] - sql """ - ADMIN SET FRONTEND CONFIG("enable_mtmv_scheduler_framework"="true"); - """ for (String table in ssb_tables) { sql new File("""${context.file.parent}/ddl/${table}_create.sql""").text diff --git a/regression-test/suites/mtmv_p0/test_alter_mtmv.groovy b/regression-test/suites/mtmv_p0/test_alter_mtmv.groovy index 498663e8c8..53f90aeffa 100644 --- a/regression-test/suites/mtmv_p0/test_alter_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_alter_mtmv.groovy @@ -19,9 +19,6 @@ suite("test_alter_mtmv") { def tableName = "t_test_alter_mtmv_user" def tableNamePv = "t_test_alter_mtmv_pv" def mvName = "multi_mv_test_alter_mtmv" - sql """ - ADMIN SET FRONTEND CONFIG("enable_mtmv_scheduler_framework"="true"); - """ sql """drop table if exists `${tableName}`""" sql """drop table if exists `${tableNamePv}`""" diff --git a/regression-test/suites/mtmv_p0/test_create_both_mtmv.groovy b/regression-test/suites/mtmv_p0/test_create_both_mtmv.groovy index 9b09e4d906..4eb9ad2cde 100644 --- a/regression-test/suites/mtmv_p0/test_create_both_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_create_both_mtmv.groovy @@ -19,9 +19,6 @@ suite("test_create_both_mtmv") { def tableName = "t_test_create_both_mtmv_user" def tableNamePv = "t_test_create_both_mtmv_user_pv" def mvName = "multi_mv_test_create_both_mtmv" - sql """ - ADMIN SET FRONTEND CONFIG("enable_mtmv_scheduler_framework"="true"); - """ sql """drop table if exists `${tableName}`""" sql """drop table if exists `${tableNamePv}`""" diff --git a/regression-test/suites/mtmv_p0/test_create_mtmv.groovy b/regression-test/suites/mtmv_p0/test_create_mtmv.groovy index c015574149..c3aba28a9e 100644 --- a/regression-test/suites/mtmv_p0/test_create_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_create_mtmv.groovy @@ -19,9 +19,6 @@ suite("test_create_mtmv") { def tableName = "t_test_create_mtmv_user" def tableNamePv = "t_test_create_mtmv_user_pv" def mvName = "multi_mv_test_create_mtmv" - sql """ - ADMIN SET FRONTEND CONFIG("enable_mtmv_scheduler_framework"="true"); - """ sql """drop table if exists `${tableName}`""" sql """drop table if exists `${tableNamePv}`""" diff --git a/regression-test/suites/mtmv_p0/test_refresh_mtmv.groovy b/regression-test/suites/mtmv_p0/test_refresh_mtmv.groovy index 62c6d72efd..9fd47107a9 100644 --- a/regression-test/suites/mtmv_p0/test_refresh_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_refresh_mtmv.groovy @@ -19,9 +19,6 @@ suite("test_refresh_mtmv") { def tableName = "t_test_refresh_mtmv_user" def tableNamePv = "t_test_refresh_mtmv_user_pv" def mvName = "multi_mv_test_refresh_mtmv" - sql """ - ADMIN SET FRONTEND CONFIG("enable_mtmv_scheduler_framework"="true"); - """ sql """drop table if exists `${tableName}`""" sql """drop table if exists `${tableNamePv}`"""