diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java index 4076a9f..4b55487 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -735,6 +735,12 @@ private int alterResourcePlan(Hive db, AlterResourcePlanDesc desc) throws HiveEx throw new HiveException("Cannot get a resource plan to apply"); // TODO: shut down HS2? } + + // status did not change, nothing to do + if (appliedRp.isSetPlan() && appliedRp.getPlan().getStatus() == resourcePlan.getStatus()) { + return 0; + } + final String name = resourcePlan.getName(); LOG.info("Activating a new resource plan " + name + ": " + appliedRp); if (wm != null) { diff --git a/ql/src/test/queries/clientpositive/resourceplan.q b/ql/src/test/queries/clientpositive/resourceplan.q index afb9ceb..018612c 100644 --- a/ql/src/test/queries/clientpositive/resourceplan.q +++ b/ql/src/test/queries/clientpositive/resourceplan.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + -- Continue on errors, we do check some error conditions below. set hive.cli.errors.ignore=true; @@ -91,14 +93,20 @@ SELECT * FROM SYS.WM_RESOURCEPLANS; -- plan_2: ENABLED -> ACTIVE and plan_3: ACTIVE -> ENABLED, success. ALTER RESOURCE PLAN plan_2 ACTIVATE; +-- no-op since already activated +ALTER RESOURCE PLAN plan_2 ACTIVATE; SELECT * FROM SYS.WM_RESOURCEPLANS; -- ENABLED -> ENABLED success. ALTER RESOURCE PLAN plan_3 ENABLE; +-- no-op since already enabled +ALTER RESOURCE PLAN plan_3 ENABLE; SELECT * FROM SYS.WM_RESOURCEPLANS; -- ENABLED -> DISABLED success. ALTER RESOURCE PLAN plan_3 DISABLE; +-- no-op since already disabled +ALTER RESOURCE PLAN plan_3 DISABLE; SELECT * FROM SYS.WM_RESOURCEPLANS; -- diff --git a/ql/src/test/results/clientpositive/llap/resourceplan.q.out b/ql/src/test/results/clientpositive/llap/resourceplan.q.out index b6c2c79..4b48a11 100644 --- a/ql/src/test/results/clientpositive/llap/resourceplan.q.out +++ b/ql/src/test/results/clientpositive/llap/resourceplan.q.out @@ -3199,8 +3199,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 DISABLED NULL default plan_2 DISABLED 10 default +plan_3 DISABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 SET QUERY_PARALLELISM = 20 PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_3 SET QUERY_PARALLELISM = 20 @@ -3213,8 +3213,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 DISABLED 20 default plan_2 DISABLED 10 default +plan_3 DISABLED 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 SET QUERY_PARALLELISM = 30, DEFAULT POOL = default1 PREHOOK: type: ALTER RESOURCEPLAN FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. NoSuchObjectException(message:Cannot find pool: default1) @@ -3226,8 +3226,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 DISABLED 20 default plan_2 DISABLED 10 default +plan_3 DISABLED 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Resource plan plan_3 is disabled and should be enabled before activation (or in the same command)) @@ -3239,8 +3239,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 DISABLED 20 default plan_2 DISABLED 10 default +plan_3 DISABLED 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE @@ -3253,8 +3253,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 DISABLED 20 default plan_2 DISABLED 10 default +plan_3 DISABLED 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE @@ -3267,8 +3267,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 ENABLED 20 default plan_2 DISABLED 10 default +plan_3 ENABLED 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE @@ -3281,8 +3281,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 ACTIVE 20 default plan_2 DISABLED 10 default +plan_3 ACTIVE 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE @@ -3295,8 +3295,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 ACTIVE 20 default plan_2 DISABLED 10 default +plan_3 ACTIVE 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE PREHOOK: type: ALTER RESOURCEPLAN FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Resource plan plan_3 is active, activate another plan first.) @@ -3308,8 +3308,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 ACTIVE 20 default plan_2 DISABLED 10 default +plan_3 ACTIVE 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE PREHOOK: type: ALTER RESOURCEPLAN FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Resource plan plan_3 is active, activate another plan first.) @@ -3321,8 +3321,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 ACTIVE 20 default plan_2 DISABLED 10 default +plan_3 ACTIVE 20 default PREHOOK: query: ALTER RESOURCE PLAN plan_2 ENABLE PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_2 ENABLE @@ -3335,8 +3335,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 ACTIVE 20 default plan_2 ENABLED 10 default +plan_3 ACTIVE 20 default +PREHOOK: query: ALTER RESOURCE PLAN plan_2 ACTIVATE +PREHOOK: type: ALTER RESOURCEPLAN +POSTHOOK: query: ALTER RESOURCE PLAN plan_2 ACTIVATE +POSTHOOK: type: ALTER RESOURCEPLAN PREHOOK: query: ALTER RESOURCE PLAN plan_2 ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_2 ACTIVATE @@ -3349,8 +3353,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 ENABLED 20 default plan_2 ACTIVE 10 default +plan_3 ENABLED 20 default +PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE +PREHOOK: type: ALTER RESOURCEPLAN +POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE +POSTHOOK: type: ALTER RESOURCEPLAN PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE @@ -3363,8 +3371,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 ENABLED 20 default plan_2 ACTIVE 10 default +plan_3 ENABLED 20 default +PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE +PREHOOK: type: ALTER RESOURCEPLAN +POSTHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE +POSTHOOK: type: ALTER RESOURCEPLAN PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE @@ -3377,8 +3389,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_3 DISABLED 20 default plan_2 ACTIVE 10 default +plan_3 DISABLED 20 default PREHOOK: query: DROP RESOURCE PLAN plan_2 PREHOOK: type: DROP RESOURCEPLAN FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. MetaException(message:Cannot drop an active resource plan) @@ -3506,9 +3518,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### plan_1 trigger_2 BYTES_READ > 100 MOVE TO slow_pool +table database BYTES_WRITTEN > 1M MOVE TO default table table BYTES_WRITTEN > 100K MOVE TO table table trigger BYTES_WRITTEN > 100K MOVE TO default -table database BYTES_WRITTEN > 1M MOVE TO default table trigger1 ELAPSED_TIME > 10 KILL table trigger2 BYTES_READ > 100 KILL PREHOOK: query: DROP TRIGGER `table`.`database` @@ -3540,9 +3552,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### +plan_1 ENABLED NULL default plan_2 ACTIVE 10 default table DISABLED 1 default -plan_1 ENABLED NULL default PREHOOK: query: DROP TRIGGER plan_1.trigger_2 PREHOOK: type: DROP TRIGGER FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Resource plan must be disabled to edit it.) @@ -3561,9 +3573,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### +plan_1 ACTIVE NULL default plan_2 ENABLED 10 default table DISABLED 1 default -plan_1 ACTIVE NULL default PREHOOK: query: DROP TRIGGER plan_1.trigger_2 PREHOOK: type: DROP TRIGGER FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Resource plan must be disabled to edit it.) @@ -3587,11 +3599,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### plan_1 trigger_2 BYTES_READ > 100 MOVE TO slow_pool +plan_2 trigger_1 BYTES_READ = 0 MOVE TO null_pool table table BYTES_WRITTEN > 100K MOVE TO table table trigger BYTES_WRITTEN > 100K MOVE TO default table trigger1 ELAPSED_TIME > 10 KILL table trigger2 BYTES_READ > 100 KILL -plan_2 trigger_1 BYTES_READ = 0 MOVE TO null_pool PREHOOK: query: CREATE POOL plan_1.default WITH ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default' PREHOOK: type: CREATE POOL @@ -3608,9 +3620,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### +plan_1 default 1.0 4 NULL plan_2 default 1.0 4 NULL table default 1.0 4 NULL -plan_1 default 1.0 4 NULL PREHOOK: query: CREATE POOL plan_2.default.c1 WITH ALLOC_FRACTION=0.3, QUERY_PARALLELISM=3, SCHEDULING_POLICY='priority' PREHOOK: type: CREATE POOL @@ -3639,11 +3651,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_2 def 1.0 4 NULL -table default 1.0 4 NULL plan_1 default 1.0 4 NULL +plan_2 def 1.0 4 NULL plan_2 def.c1 0.3 3 priority plan_2 def.c2 0.2 2 fair +table default 1.0 4 NULL PREHOOK: query: DROP POOL plan_2.default PREHOOK: type: DROP POOL FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. NoSuchObjectException(message:Cannot delete pool: default) @@ -3655,11 +3667,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_2 def 1.0 4 NULL -table default 1.0 4 NULL plan_1 default 1.0 4 NULL +plan_2 def 1.0 4 NULL plan_2 def.c1 0.3 3 priority plan_2 def.c2 0.2 2 fair +table default 1.0 4 NULL PREHOOK: query: CREATE POOL plan_2.child1.child2 WITH QUERY_PARALLELISM=2, SCHEDULING_POLICY='fcfs', ALLOC_FRACTION=0.8 PREHOOK: type: CREATE POOL @@ -3700,11 +3712,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_2 def 1.0 4 NULL -table default 1.0 4 NULL plan_1 default 1.0 4 NULL +plan_2 def 1.0 4 NULL plan_2 def.c1 0.3 3 priority plan_2 def.c2 0.2 2 fair +table default 1.0 4 NULL table table 0.0 1 random table table.pool1 0.9 3 priority table table.pool1.child1 0.3 1 random @@ -3721,11 +3733,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_2 def 1.0 4 NULL -table default 1.0 4 NULL plan_1 default 1.0 4 NULL +plan_2 def 1.0 4 NULL plan_2 def.c1 0.3 3 priority plan_2 def.c2 0.2 2 fair +table default 1.0 4 NULL table table 0.0 1 random table table.pool 0.9 3 priority table table.pool.child1 0.3 1 random @@ -3741,11 +3753,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_2 def 1.0 4 NULL -table default 1.0 4 NULL plan_1 default 1.0 4 NULL +plan_2 def 1.0 4 NULL plan_2 def.c1 0.3 3 priority plan_2 def.c2 0.2 2 fair +table default 1.0 4 NULL table table 0.0 1 random table table.pool 0.9 3 priority table table.pool.child1 0.3 1 random @@ -3761,11 +3773,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_2 def 1.0 4 NULL -table default 1.0 4 NULL plan_1 default 1.0 4 NULL +plan_2 def 1.0 4 NULL plan_2 def.c1 0.3 3 priority plan_2 def.c2 0.2 2 fair +table default 1.0 4 NULL table table 0.0 1 random table table.pool 0.9 3 priority table table.pool.child1 0.3 1 random @@ -3778,9 +3790,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### +plan_1 ACTIVE NULL default plan_2 DISABLED 10 def table DISABLED 1 default -plan_1 ACTIVE NULL default PREHOOK: query: ALTER RESOURCE PLAN `table` SET DEFAULT POOL = `table`.pool PREHOOK: type: ALTER RESOURCEPLAN POSTHOOK: query: ALTER RESOURCE PLAN `table` SET DEFAULT POOL = `table`.pool @@ -3797,8 +3809,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_2 def 1.0 4 NULL plan_1 default 1.0 4 NULL +plan_2 def 1.0 4 NULL plan_2 def.c1 0.3 3 priority plan_2 def.c2 0.2 2 fair table table 0.0 1 random @@ -3841,13 +3853,13 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### +plan_2 def.c1 trigger_1 +plan_2 def.c2 trigger_1 table table table table table.pool.child1 table table table.pool.child1 trigger1 table table.pool.child2 trigger1 table table.pool.child2 trigger2 -plan_2 def.c1 trigger_1 -plan_2 def.c2 trigger_1 PREHOOK: query: ALTER POOL plan_2.default ADD TRIGGER trigger_1 PREHOOK: type: ALTER POOL FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. NoSuchObjectException(message:Cannot find pool: default) @@ -3862,13 +3874,13 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### +plan_2 def.c1 trigger_1 +plan_2 def.c2 trigger_1 table table table table table.pool.child1 table table table.pool.child1 trigger1 table table.pool.child2 trigger1 table table.pool.child2 trigger2 -plan_2 def.c1 trigger_1 -plan_2 def.c2 trigger_1 PREHOOK: query: ALTER POOL plan_2.def.c1 DROP TRIGGER trigger_1 PREHOOK: type: ALTER POOL POSTHOOK: query: ALTER POOL plan_2.def.c1 DROP TRIGGER trigger_1 @@ -3892,8 +3904,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### -table table table plan_2 def.c2 trigger_1 +table table table PREHOOK: query: CREATE USER MAPPING "user1" IN plan_2 TO def PREHOOK: type: CREATE MAPPING POSTHOOK: query: CREATE USER MAPPING "user1" IN plan_2 TO def @@ -3918,10 +3930,10 @@ POSTHOOK: query: SELECT * FROM SYS.WM_MAPPINGS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_mappings #### A masked pattern was here #### -plan_2 USER user1 def 0 -plan_2 USER user2 def 1 plan_2 GROUP group1 def.c1 0 plan_2 GROUP group2 def.c2 1 +plan_2 USER user1 def 0 +plan_2 USER user2 def 1 PREHOOK: query: DROP POOL plan_2.def.c1 PREHOOK: type: DROP POOL FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. MetaException(message:Exception thrown flushing changes to datastore) @@ -3941,8 +3953,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_MAPPINGS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_mappings #### A masked pattern was here #### -plan_2 USER user1 def 0 plan_2 GROUP group1 def.c1 0 +plan_2 USER user1 def 0 PREHOOK: query: CREATE RESOURCE PLAN plan_4 PREHOOK: type: CREATE RESOURCEPLAN POSTHOOK: query: CREATE RESOURCE PLAN plan_4 @@ -3963,9 +3975,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -table DISABLED 1 table.pool plan_1 ENABLED NULL default plan_4 ACTIVE NULL default +table DISABLED 1 table.pool PREHOOK: query: SELECT * FROM SYS.WM_POOLS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_pools @@ -3974,10 +3986,10 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -table table 0.0 1 random -table table.pool 0.9 3 priority plan_1 default 1.0 4 NULL plan_4 default 1.0 4 NULL +table table 0.0 1 random +table table.pool 0.9 3 priority PREHOOK: query: SELECT * FROM SYS.WM_TRIGGERS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_triggers diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java index 63cb52e..87a6987 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java @@ -9765,7 +9765,7 @@ private WMFullResourcePlan switchStatus(String name, MWMResourcePlan mResourcePl } if (newStatus == currentStatus) { - return null; + return fullFromMResourcePlan(mResourcePlan); } boolean doActivate = false, doValidate = false;