diff --git ql/src/test/queries/clientpositive/resourceplan.q ql/src/test/queries/clientpositive/resourceplan.q index 009816d5b7..bb5266a785 100644 --- ql/src/test/queries/clientpositive/resourceplan.q +++ ql/src/test/queries/clientpositive/resourceplan.q @@ -397,6 +397,7 @@ SELECT * FROM SYS.WM_MAPPINGS; REPLACE RESOURCE PLAN plan_4a WITH plan_4b; SELECT * FROM SYS.WM_RESOURCEPLANS; SELECT * FROM SYS.WM_POOLS; +SHOW RESOURCE PLAN plan_4a_old_0; REPLACE ACTIVE RESOURCE PLAN WITH plan_4a; SELECT * FROM SYS.WM_RESOURCEPLANS; CREATE RESOURCE PLAN plan_4a LIKE plan_4; diff --git ql/src/test/results/clientpositive/llap/resourceplan.q.out ql/src/test/results/clientpositive/llap/resourceplan.q.out index 96ed8c67c5..9850276f49 100644 --- ql/src/test/results/clientpositive/llap/resourceplan.q.out +++ ql/src/test/results/clientpositive/llap/resourceplan.q.out @@ -4511,7 +4511,7 @@ plan_1 ENABLED NULL default plan_2 DISABLED NULL default plan_4 ACTIVE NULL default plan_4a DISABLED NULL default -plan_4a-old-0 DISABLED NULL default +plan_4a_old_0 DISABLED NULL default table DISABLED 1 NULL PREHOOK: query: SELECT * FROM SYS.WM_POOLS PREHOOK: type: QUERY @@ -4527,10 +4527,23 @@ plan_4 default 1.0 4 NULL plan_4a default 1.0 4 NULL plan_4a pool1 0.0 2 fair plan_4a pool2 0.0 3 fair -plan_4a-old-0 default 1.0 4 NULL -plan_4a-old-0 pool1 0.0 2 fair +plan_4a_old_0 default 1.0 4 NULL +plan_4a_old_0 pool1 0.0 2 fair table table 0.0 1 fifo table table.pool 0.9 3 fair +PREHOOK: query: SHOW RESOURCE PLAN plan_4a_old_0 +PREHOOK: type: SHOW RESOURCEPLAN +PREHOOK: Output: dummyHostnameForTest +POSTHOOK: query: SHOW RESOURCE PLAN plan_4a_old_0 +POSTHOOK: type: SHOW RESOURCEPLAN +plan_4a_old_0[status=DISABLED,parallelism=null,defaultPool=default] + + default[allocFraction=1.0,schedulingPolicy=null,parallelism=4] + | mapped for default + + pool1[allocFraction=0.0,schedulingPolicy=fair,parallelism=2] + | trigger trigger_2: if (BYTES_READ > 11GB) { KILL } + | mapped for users: user1 + + + | trigger trigger_1: if (BYTES_READ > 10GB) { KILL } PREHOOK: query: REPLACE ACTIVE RESOURCE PLAN WITH plan_4a PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -4547,8 +4560,8 @@ POSTHOOK: Input: sys@wm_resourceplans plan_1 ENABLED NULL default plan_2 DISABLED NULL default plan_4 ACTIVE NULL default -plan_4-old-0 DISABLED NULL default -plan_4a-old-0 DISABLED NULL default +plan_4_old_0 DISABLED NULL default +plan_4a_old_0 DISABLED NULL default table DISABLED 1 NULL PREHOOK: query: CREATE RESOURCE PLAN plan_4a LIKE plan_4 PREHOOK: type: CREATE RESOURCEPLAN @@ -4576,9 +4589,9 @@ POSTHOOK: Input: sys@wm_resourceplans plan_1 ENABLED NULL default plan_2 DISABLED NULL default plan_4 ACTIVE NULL default -plan_4-old-0 DISABLED NULL default -plan_4-old-1 DISABLED NULL default -plan_4a-old-0 DISABLED NULL default +plan_4_old_0 DISABLED NULL default +plan_4_old_1 DISABLED NULL default +plan_4a_old_0 DISABLED NULL default table DISABLED 1 NULL PREHOOK: query: SELECT * FROM SYS.WM_POOLS PREHOOK: type: QUERY @@ -4594,11 +4607,11 @@ plan_4 default 1.0 4 NULL plan_4 pool1 0.0 2 fair plan_4 pool2 0.0 3 fair plan_4 pool3 0.0 3 fair -plan_4-old-0 default 1.0 4 NULL -plan_4-old-1 default 1.0 4 NULL -plan_4-old-1 pool1 0.0 2 fair -plan_4-old-1 pool2 0.0 3 fair -plan_4a-old-0 default 1.0 4 NULL -plan_4a-old-0 pool1 0.0 2 fair +plan_4_old_0 default 1.0 4 NULL +plan_4_old_1 default 1.0 4 NULL +plan_4_old_1 pool1 0.0 2 fair +plan_4_old_1 pool2 0.0 3 fair +plan_4a_old_0 default 1.0 4 NULL +plan_4a_old_0 pool1 0.0 2 fair table table 0.0 1 fifo table table.pool 0.9 3 fair diff --git standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java index 3e1fea9d4f..0dd6b51b5e 100644 --- standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java +++ standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java @@ -10516,10 +10516,10 @@ private WMFullResourcePlan handleAlterReplace(String name, WMNullableResourcePla private String generateOldPlanName(String newName, int i) { if (MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEST)) { // Do not use datetime in tests to avoid result changes. - return newName + "-old-" + i; + return newName + "_old_" + i; } else { - return newName + "-old-" - + LocalDateTime.now().format(YMDHMS_FORMAT) + (i == 0 ? "" : ("-" + i)); + return newName + "_old_" + + LocalDateTime.now().format(YMDHMS_FORMAT) + (i == 0 ? "" : ("_" + i)); } }