This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 39fdc9ba0c2 [refactor](executor)Rename workload schedule policy #34497
39fdc9ba0c2 is described below
commit 39fdc9ba0c224a2f164b126aec1e095af949a8e0
Author: wangbo <[email protected]>
AuthorDate: Wed May 8 08:34:31 2024 +0800
[refactor](executor)Rename workload schedule policy #34497
---
be/src/exec/schema_scanner.cpp | 2 +-
.../schema_workload_sched_policy_scanner.cpp | 2 +-
fe/fe-core/src/main/cup/sql_parser.cup | 6 +-
.../org/apache/doris/analysis/SchemaTableType.java | 4 +-
.../java/org/apache/doris/catalog/SchemaTable.java | 4 +-
.../doris/tablefunction/MetadataGenerator.java | 2 +-
gensrc/thrift/Descriptors.thrift | 2 +-
.../jdbc/test_mariadb_jdbc_catalog.out | 2 +-
.../jdbc/test_mysql_jdbc_catalog.out | 2 +-
.../jdbc/test_mysql_jdbc_catalog_nereids.out | 2 +-
.../jdbc/test_mysql_jdbc_driver5_catalog.out | 2 +-
.../test_workload_sched_policy.groovy | 102 ++++++++++-----------
12 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/be/src/exec/schema_scanner.cpp b/be/src/exec/schema_scanner.cpp
index 5250d8f1b01..c233c6f83fd 100644
--- a/be/src/exec/schema_scanner.cpp
+++ b/be/src/exec/schema_scanner.cpp
@@ -168,7 +168,7 @@ std::unique_ptr<SchemaScanner>
SchemaScanner::create(TSchemaTableType::type type
return SchemaRoutinesScanner::create_unique();
case TSchemaTableType::SCH_USER:
return SchemaUserScanner::create_unique();
- case TSchemaTableType::SCH_WORKLOAD_SCHEDULE_POLICY:
+ case TSchemaTableType::SCH_WORKLOAD_POLICY:
return SchemaWorkloadSchedulePolicyScanner::create_unique();
default:
return SchemaDummyScanner::create_unique();
diff --git
a/be/src/exec/schema_scanner/schema_workload_sched_policy_scanner.cpp
b/be/src/exec/schema_scanner/schema_workload_sched_policy_scanner.cpp
index 3dae2714f02..b1a717228c8 100644
--- a/be/src/exec/schema_scanner/schema_workload_sched_policy_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_workload_sched_policy_scanner.cpp
@@ -38,7 +38,7 @@ std::vector<SchemaScanner::ColumnDesc>
SchemaWorkloadSchedulePolicyScanner::_s_t
};
SchemaWorkloadSchedulePolicyScanner::SchemaWorkloadSchedulePolicyScanner()
- : SchemaScanner(_s_tbls_columns,
TSchemaTableType::SCH_WORKLOAD_SCHEDULE_POLICY) {}
+ : SchemaScanner(_s_tbls_columns,
TSchemaTableType::SCH_WORKLOAD_POLICY) {}
SchemaWorkloadSchedulePolicyScanner::~SchemaWorkloadSchedulePolicyScanner() {}
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index f40c612e20d..a0564670bb2 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -1390,7 +1390,7 @@ alter_stmt ::=
{:
RESULT = new AlterWorkloadGroupStmt(workloadGroupName, properties);
:}
- | KW_ALTER KW_WORKLOAD KW_SCHEDULE KW_POLICY ident_or_text:policyName
opt_properties:properties
+ | KW_ALTER KW_WORKLOAD KW_POLICY ident_or_text:policyName
opt_properties:properties
{:
RESULT = new AlterWorkloadSchedPolicyStmt(policyName, properties);
:}
@@ -1932,7 +1932,7 @@ create_stmt ::=
RESULT = new CreateWorkloadGroupStmt(ifNotExists, workloadGroupName,
properties);
:}
/* workload schedule policy */
- | KW_CREATE KW_WORKLOAD KW_SCHEDULE KW_POLICY
opt_if_not_exists:ifNotExists ident_or_text:workloadPolicyName
opt_conditions:conditions opt_actions:actions opt_properties:properties
+ | KW_CREATE KW_WORKLOAD KW_POLICY opt_if_not_exists:ifNotExists
ident_or_text:workloadPolicyName opt_conditions:conditions opt_actions:actions
opt_properties:properties
{:
RESULT = new CreateWorkloadSchedPolicyStmt(ifNotExists,
workloadPolicyName, conditions, actions, properties);
:}
@@ -3053,7 +3053,7 @@ drop_stmt ::=
{:
RESULT = new DropWorkloadGroupStmt(ifExists, workloadGroupName);
:}
- | KW_DROP KW_WORKLOAD KW_SCHEDULE KW_POLICY opt_if_exists:ifExists
ident_or_text:policyName
+ | KW_DROP KW_WORKLOAD KW_POLICY opt_if_exists:ifExists
ident_or_text:policyName
{:
RESULT = new DropWorkloadSchedPolicyStmt(ifExists, policyName);
:}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
index 93d6e3e55a2..8ec426cbf5e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
@@ -76,8 +76,8 @@ public enum SchemaTableType {
SCHE_USER("user", "user", TSchemaTableType.SCH_USER),
SCH_PROCS_PRIV("procs_priv", "procs_priv",
TSchemaTableType.SCH_PROCS_PRIV),
- SCH_WORKLOAD_SCHEDULE_POLICY("WORKLOAD_SCHEDULE_POLICY",
"WORKLOAD_SCHEDULE_POLICY",
- TSchemaTableType.SCH_WORKLOAD_SCHEDULE_POLICY);
+ SCH_WORKLOAD_POLICY("WORKLOAD_POLICY", "WORKLOAD_POLICY",
+ TSchemaTableType.SCH_WORKLOAD_POLICY);
private static final String dbName = "INFORMATION_SCHEMA";
private static SelectList fullSelectLists;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
index d0b828fdba2..a77532cef1e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
@@ -499,8 +499,8 @@ public class SchemaTable extends Table {
.column("STATE", ScalarType.createVarchar(64))
.column("INFO",
ScalarType.createVarchar(ScalarType.MAX_VARCHAR_LENGTH))
.build()))
- .put("workload_schedule_policy",
- new SchemaTable(SystemIdGenerator.getNextId(),
"workload_schedule_policy", TableType.SCHEMA,
+ .put("workload_policy",
+ new SchemaTable(SystemIdGenerator.getNextId(),
"workload_policy", TableType.SCHEMA,
builder().column("ID",
ScalarType.createType(PrimitiveType.BIGINT))
.column("NAME",
ScalarType.createVarchar(256))
.column("CONDITION",
ScalarType.createStringType())
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java
b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java
index d5b43b6cfff..42b76d3c057 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java
@@ -121,7 +121,7 @@ public class MetadataGenerator {
ROUTINE_INFO_COLUMN_TO_INDEX = routineInfoBuilder.build();
ImmutableMap.Builder<String, Integer> policyBuilder = new
ImmutableMap.Builder();
- List<Column> policyColList =
SchemaTable.TABLE_MAP.get("workload_schedule_policy").getFullSchema();
+ List<Column> policyColList =
SchemaTable.TABLE_MAP.get("workload_policy").getFullSchema();
for (int i = 0; i < policyColList.size(); i++) {
policyBuilder.put(policyColList.get(i).getName().toLowerCase(), i);
}
diff --git a/gensrc/thrift/Descriptors.thrift b/gensrc/thrift/Descriptors.thrift
index 2e92ffe0ba3..d82f74d771c 100644
--- a/gensrc/thrift/Descriptors.thrift
+++ b/gensrc/thrift/Descriptors.thrift
@@ -131,7 +131,7 @@ enum TSchemaTableType {
SCH_WORKLOAD_GROUPS,
SCH_USER,
SCH_PROCS_PRIV,
- SCH_WORKLOAD_SCHEDULE_POLICY;
+ SCH_WORKLOAD_POLICY;
}
enum THdfsCompression {
diff --git
a/regression-test/data/external_table_p0/jdbc/test_mariadb_jdbc_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_mariadb_jdbc_catalog.out
index b7113c06cbd..d8bfffd9125 100644
--- a/regression-test/data/external_table_p0/jdbc/test_mariadb_jdbc_catalog.out
+++ b/regression-test/data/external_table_p0/jdbc/test_mariadb_jdbc_catalog.out
@@ -59,7 +59,7 @@ triggers
user_privileges
views
workload_groups
-workload_schedule_policy
+workload_policy
-- !auto_default_t --
0
diff --git
a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
index 300c28b25d9..3cc6a9a580e 100644
--- a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
+++ b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
@@ -223,7 +223,7 @@ triggers
user_privileges
views
workload_groups
-workload_schedule_policy
+workload_policy
-- !dt --
2023-06-17T10:00 2023-06-17T10:00:01.100 2023-06-17T10:00:02.220
2023-06-17T10:00:03.333 2023-06-17T10:00:04.444400
2023-06-17T10:00:05.555550 2023-06-17T10:00:06.666666
diff --git
a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog_nereids.out
b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog_nereids.out
index 7a6399f87a2..22bc4e8279d 100644
---
a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog_nereids.out
+++
b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog_nereids.out
@@ -191,7 +191,7 @@ triggers
user_privileges
views
workload_groups
-workload_schedule_policy
+workload_policy
-- !test_insert1 --
doris1 18
diff --git
a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_driver5_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_driver5_catalog.out
index 6dee70583c1..a451ecf9b91 100644
---
a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_driver5_catalog.out
+++
b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_driver5_catalog.out
@@ -233,7 +233,7 @@ triggers
user_privileges
views
workload_groups
-workload_schedule_policy
+workload_policy
-- !dt --
2023-06-17T10:00 2023-06-17T10:00:01 2023-06-17T10:00:02
2023-06-17T10:00:03 2023-06-17T10:00:04 2023-06-17T10:00:05
2023-06-17T10:00:06
diff --git
a/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
b/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
index 776209fa11e..c51a10f89b5 100644
---
a/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
+++
b/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
@@ -19,23 +19,23 @@ suite("test_workload_sched_policy") {
sql "set experimental_enable_nereids_planner = false;"
- sql "drop workload schedule policy if exists test_cancel_policy;"
- sql "drop workload schedule policy if exists set_action_policy;"
- sql "drop workload schedule policy if exists fe_policy;"
- sql "drop workload schedule policy if exists be_policy;"
+ sql "drop workload policy if exists test_cancel_policy;"
+ sql "drop workload policy if exists set_action_policy;"
+ sql "drop workload policy if exists fe_policy;"
+ sql "drop workload policy if exists be_policy;"
// 1 create cancel policy
- sql "create workload schedule policy test_cancel_policy " +
+ sql "create workload policy test_cancel_policy " +
" conditions(query_time > 10) " +
" actions(cancel_query) properties('enabled'='false'); "
// 2 create set policy
- sql "create workload schedule policy set_action_policy " +
+ sql "create workload policy set_action_policy " +
"conditions(username='root') " +
"actions(set_session_variable 'workload_group=normal')
properties('enabled'='false');"
// 3 create policy run in fe
- sql "create workload schedule policy fe_policy " +
+ sql "create workload policy fe_policy " +
"conditions(username='root') " +
"actions(set_session_variable 'workload_group=normal') " +
"properties( " +
@@ -44,7 +44,7 @@ suite("test_workload_sched_policy") {
");"
// 4 create policy run in be
- sql "create workload schedule policy be_policy " +
+ sql "create workload policy be_policy " +
"conditions(query_time > 10) " +
"actions(cancel_query) " +
"properties( " +
@@ -52,46 +52,46 @@ suite("test_workload_sched_policy") {
"'priority'='10' " +
");"
- qt_select_policy_tvf "select
name,condition,action,priority,enabled,version from
information_schema.workload_schedule_policy where name
in('be_policy','fe_policy','set_action_policy','test_cancel_policy') order by
name;"
+ qt_select_policy_tvf "select
name,condition,action,priority,enabled,version from
information_schema.workload_policy where name
in('be_policy','fe_policy','set_action_policy','test_cancel_policy') order by
name;"
// test_alter
- sql "alter workload schedule policy fe_policy properties('priority'='2',
'enabled'='false');"
+ sql "alter workload policy fe_policy properties('priority'='2',
'enabled'='false');"
// create failed check
test {
- sql "create workload schedule policy failed_policy " +
+ sql "create workload policy failed_policy " +
"conditions(abc > 123) actions(cancel_query);"
exception "invalid metric name"
}
test {
- sql "create workload schedule policy failed_policy " +
+ sql "create workload policy failed_policy " +
"conditions(query_time > 123) actions(abc);"
exception "invalid action type"
}
test {
- sql "alter workload schedule policy fe_policy
properties('priority'='abc');"
+ sql "alter workload policy fe_policy properties('priority'='abc');"
exception "invalid priority property value"
}
test {
- sql "alter workload schedule policy fe_policy
properties('enabled'='abc');"
+ sql "alter workload policy fe_policy properties('enabled'='abc');"
exception "invalid enabled property value"
}
test {
- sql "alter workload schedule policy fe_policy
properties('priority'='10000');"
+ sql "alter workload policy fe_policy properties('priority'='10000');"
exception "priority can only between"
}
test {
- sql "create workload schedule policy conflict_policy " +
+ sql "create workload policy conflict_policy " +
"conditions (query_time > 0) " +
"actions(cancel_query, cancel_query);"
@@ -99,7 +99,7 @@ suite("test_workload_sched_policy") {
}
test {
- sql "create workload schedule policy conflict_policy " +
+ sql "create workload policy conflict_policy " +
"conditions (username = 'root') " +
"actions(set_session_variable 'workload_group=normal',
set_session_variable 'workload_group=abc');"
@@ -107,21 +107,21 @@ suite("test_workload_sched_policy") {
}
// drop
- sql "drop workload schedule policy test_cancel_policy;"
- sql "drop workload schedule policy set_action_policy;"
- sql "drop workload schedule policy fe_policy;"
- sql "drop workload schedule policy be_policy;"
+ sql "drop workload policy test_cancel_policy;"
+ sql "drop workload policy set_action_policy;"
+ sql "drop workload policy fe_policy;"
+ sql "drop workload policy be_policy;"
- qt_select_policy_tvf_after_drop "select
name,condition,action,priority,enabled,version from
information_schema.workload_schedule_policy where name
in('be_policy','fe_policy','set_action_policy','test_cancel_policy') order by
name;"
+ qt_select_policy_tvf_after_drop "select
name,condition,action,priority,enabled,version from
information_schema.workload_policy where name
in('be_policy','fe_policy','set_action_policy','test_cancel_policy') order by
name;"
- // test workload schedule policy
+ // test workload policy
sql "ADMIN SET FRONTEND CONFIG ('workload_sched_policy_interval_ms' =
'500');"
sql """drop user if exists test_workload_sched_user"""
sql """create user test_workload_sched_user identified by '12345'"""
sql """grant ADMIN_PRIV on *.*.* to test_workload_sched_user"""
// 1 create test_set_var_policy
- sql "create workload schedule policy test_set_var_policy
conditions(username='test_workload_sched_user')" +
+ sql "create workload policy test_set_var_policy
conditions(username='test_workload_sched_user')" +
"actions(set_session_variable 'parallel_pipeline_task_num=33');"
def result1 = connect(user = 'test_workload_sched_user', password =
'12345', url = context.config.jdbcUrl) {
logger.info("begin sleep 15s to wait")
@@ -132,7 +132,7 @@ suite("test_workload_sched_policy") {
assertEquals("33", result1[0][1])
// 2 create test_set_var_policy2 with higher priority
- sql "create workload schedule policy test_set_var_policy2
conditions(username='test_workload_sched_user') " +
+ sql "create workload policy test_set_var_policy2
conditions(username='test_workload_sched_user') " +
"actions(set_session_variable 'parallel_pipeline_task_num=22')
properties('priority'='10');"
def result2 = connect(user = 'test_workload_sched_user', password =
'12345', url = context.config.jdbcUrl) {
Thread.sleep(3000)
@@ -142,7 +142,7 @@ suite("test_workload_sched_policy") {
assertEquals("22", result2[0][1])
// 3 disable test_set_var_policy2
- sql "alter workload schedule policy test_set_var_policy2
properties('enabled'='false');"
+ sql "alter workload policy test_set_var_policy2
properties('enabled'='false');"
def result3 = connect(user = 'test_workload_sched_user', password =
'12345', url = context.config.jdbcUrl) {
Thread.sleep(3000)
sql "show variables like '%parallel_pipeline_task_num%';"
@@ -152,13 +152,13 @@ suite("test_workload_sched_policy") {
sql "ADMIN SET FRONTEND CONFIG ('workload_sched_policy_interval_ms' =
'10000');"
- sql "drop workload schedule policy if exists test_set_var_policy;"
- sql "drop workload schedule policy if exists test_set_var_policy2;"
+ sql "drop workload policy if exists test_set_var_policy;"
+ sql "drop workload policy if exists test_set_var_policy2;"
sql "drop user if exists test_policy_user"
- sql "drop workload schedule policy if exists test_cancel_query_policy"
- sql "drop workload schedule policy if exists test_cancel_query_policy2"
- sql "drop workload schedule policy if exists test_set_session"
+ sql "drop workload policy if exists test_cancel_query_policy"
+ sql "drop workload policy if exists test_cancel_query_policy2"
+ sql "drop workload policy if exists test_set_session"
sql "drop workload group if exists policy_group;"
sql "CREATE USER 'test_policy_user'@'%' IDENTIFIED BY '12345';"
sql """grant SELECT_PRIV on *.*.* to test_policy_user;"""
@@ -166,9 +166,9 @@ suite("test_workload_sched_policy") {
sql "create workload group if not exists policy_group2 properties
('cpu_share'='1024');"
sql "GRANT USAGE_PRIV ON WORKLOAD GROUP 'policy_group' TO
'test_policy_user'@'%';"
sql "GRANT USAGE_PRIV ON WORKLOAD GROUP 'policy_group2' TO
'test_policy_user'@'%';"
- sql "create workload schedule policy test_cancel_query_policy
conditions(query_time > 1000) actions(cancel_query)
properties('workload_group'='policy_group')"
- sql "create workload schedule policy test_cancel_query_policy2
conditions(query_time > 0, be_scan_rows>1) actions(cancel_query)
properties('workload_group'='policy_group')"
- sql "create workload schedule policy test_set_session
conditions(username='test_policy_user') actions(set_session_variable
'parallel_pipeline_task_num=1')"
+ sql "create workload policy test_cancel_query_policy conditions(query_time
> 1000) actions(cancel_query) properties('workload_group'='policy_group')"
+ sql "create workload policy test_cancel_query_policy2
conditions(query_time > 0, be_scan_rows>1) actions(cancel_query)
properties('workload_group'='policy_group')"
+ sql "create workload policy test_set_session
conditions(username='test_policy_user') actions(set_session_variable
'parallel_pipeline_task_num=1')"
test {
sql "drop workload group policy_group;"
@@ -176,31 +176,31 @@ suite("test_workload_sched_policy") {
}
test {
- sql "alter workload schedule policy test_cancel_query_policy
properties('workload_group'='invalid_gorup');"
+ sql "alter workload policy test_cancel_query_policy
properties('workload_group'='invalid_gorup');"
exception "unknown workload group"
}
// test alter policy property
sql "drop user if exists test_alter_policy_user"
sql "CREATE USER 'test_alter_policy_user'@'%' IDENTIFIED BY '12345';"
- sql "drop workload schedule policy if exists test_alter_policy;"
- sql "create workload schedule policy test_alter_policy
conditions(username='test_alter_policy_user') actions(set_session_variable
'parallel_pipeline_task_num=0') properties('workload_group'='normal');"
- qt_select_alter_1 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_schedule_policy where name='test_alter_policy'"
+ sql "drop workload policy if exists test_alter_policy;"
+ sql "create workload policy test_alter_policy
conditions(username='test_alter_policy_user') actions(set_session_variable
'parallel_pipeline_task_num=0') properties('workload_group'='normal');"
+ qt_select_alter_1 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_policy where name='test_alter_policy'"
- sql "alter workload schedule policy test_alter_policy
properties('workload_group'='');"
- qt_select_alter_2 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_schedule_policy where name='test_alter_policy'"
+ sql "alter workload policy test_alter_policy
properties('workload_group'='');"
+ qt_select_alter_2 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_policy where name='test_alter_policy'"
- sql "alter workload schedule policy test_alter_policy
properties('enabled'='false');"
- qt_select_alter_3 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_schedule_policy where name='test_alter_policy'"
+ sql "alter workload policy test_alter_policy
properties('enabled'='false');"
+ qt_select_alter_3 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_policy where name='test_alter_policy'"
- sql "alter workload schedule policy test_alter_policy
properties('priority'='9');"
- qt_select_alter_4 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_schedule_policy where name='test_alter_policy'"
+ sql "alter workload policy test_alter_policy properties('priority'='9');"
+ qt_select_alter_4 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_policy where name='test_alter_policy'"
- sql "alter workload schedule policy test_alter_policy
properties('workload_group'='normal');"
- qt_select_alter_5 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_schedule_policy where name='test_alter_policy'"
+ sql "alter workload policy test_alter_policy
properties('workload_group'='normal');"
+ qt_select_alter_5 "select
name,condition,action,PRIORITY,ENABLED,VERSION,WORKLOAD_GROUP from
information_schema.workload_policy where name='test_alter_policy'"
sql "drop user test_alter_policy_user"
- sql "drop workload schedule policy test_alter_policy"
+ sql "drop workload policy test_alter_policy"
// daemon thread alter test
def thread1 = new Thread({
@@ -217,14 +217,14 @@ suite("test_workload_sched_policy") {
if (curTime - lastTime > 20000) {
if (flag) {
connect(user = 'root', password = '', url =
context.config.jdbcUrl) {
- sql "alter workload schedule policy
test_cancel_query_policy properties('workload_group'='policy_group2');"
- sql "alter workload schedule policy
test_cancel_query_policy2 properties('workload_group'='policy_group');"
+ sql "alter workload policy
test_cancel_query_policy properties('workload_group'='policy_group2');"
+ sql "alter workload policy
test_cancel_query_policy2 properties('workload_group'='policy_group');"
}
flag = false
} else {
connect(user = 'root', password = '', url =
context.config.jdbcUrl) {
- sql "alter workload schedule policy
test_cancel_query_policy properties('workload_group'='policy_group');"
- sql "alter workload schedule policy
test_cancel_query_policy2 properties('workload_group'='policy_group2');"
+ sql "alter workload policy
test_cancel_query_policy properties('workload_group'='policy_group');"
+ sql "alter workload policy
test_cancel_query_policy2 properties('workload_group'='policy_group2');"
}
flag = true
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
