You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2017/10/23 19:00:47 UTC

hive git commit: HIVE-17771 : Implement commands to manage resource plan (Harish Jaiprakash, reviewed by Sergey Shelukhin) ADDENDUM

Repository: hive
Updated Branches:
  refs/heads/master 0a08eeb99 -> b7194cdd3


HIVE-17771 : Implement commands to manage resource plan (Harish Jaiprakash, reviewed by Sergey Shelukhin) ADDENDUM


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b7194cdd
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b7194cdd
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b7194cdd

Branch: refs/heads/master
Commit: b7194cdd34f674c328ae80292f1162c9e2d9c72f
Parents: 0a08eeb
Author: sergey <se...@apache.org>
Authored: Mon Oct 23 12:00:19 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Mon Oct 23 12:00:42 2017 -0700

----------------------------------------------------------------------
 .../clientpositive/llap/resourceplan.q.out      | 82 ++++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/b7194cdd/ql/src/test/results/clientpositive/llap/resourceplan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/resourceplan.q.out b/ql/src/test/results/clientpositive/llap/resourceplan.q.out
index b5b8595..2231bb5 100644
--- a/ql/src/test/results/clientpositive/llap/resourceplan.q.out
+++ b/ql/src/test/results/clientpositive/llap/resourceplan.q.out
@@ -2912,9 +2912,9 @@ POSTHOOK: Lineage: VIEWS.table_name SIMPLE [(tbls)t.FieldSchema(name:tbl_name, t
 POSTHOOK: Lineage: VIEWS.table_schema SIMPLE [(dbs)d.FieldSchema(name:name, type:string, comment:from deserializer), ]
 POSTHOOK: Lineage: VIEWS.view_definition SIMPLE [(tbls)t.FieldSchema(name:view_original_text, type:string, comment:from deserializer), ]
 PREHOOK: query: SHOW RESOURCE PLANS
-PREHOOK: type: SHOW_RESOURCEPLAN
+PREHOOK: type: SHOW RESOURCEPLAN
 POSTHOOK: query: SHOW RESOURCE PLANS
-POSTHOOK: type: SHOW_RESOURCEPLAN
+POSTHOOK: type: SHOW RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -2924,18 +2924,18 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@wm_resourceplans
 #### A masked pattern was here ####
 PREHOOK: query: CREATE RESOURCE PLAN plan_1
-PREHOOK: type: CREATE_RESOURCEPLAN
+PREHOOK: type: CREATE RESOURCEPLAN
 POSTHOOK: query: CREATE RESOURCE PLAN plan_1
-POSTHOOK: type: CREATE_RESOURCEPLAN
+POSTHOOK: type: CREATE RESOURCEPLAN
 PREHOOK: query: SHOW RESOURCE PLANS
-PREHOOK: type: SHOW_RESOURCEPLAN
+PREHOOK: type: SHOW RESOURCEPLAN
 POSTHOOK: query: SHOW RESOURCE PLANS
-POSTHOOK: type: SHOW_RESOURCEPLAN
+POSTHOOK: type: SHOW RESOURCEPLAN
 plan_1	null	 
 PREHOOK: query: SHOW RESOURCE PLAN plan_1
-PREHOOK: type: SHOW_RESOURCEPLAN
+PREHOOK: type: SHOW RESOURCEPLAN
 POSTHOOK: query: SHOW RESOURCE PLAN plan_1
-POSTHOOK: type: SHOW_RESOURCEPLAN
+POSTHOOK: type: SHOW RESOURCEPLAN
 plan_1	null	 
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
@@ -2947,19 +2947,19 @@ POSTHOOK: Input: sys@wm_resourceplans
 #### A masked pattern was here ####
 plan_1	DISABLED	NULL
 PREHOOK: query: CREATE RESOURCE PLAN plan_2 WITH QUERY_PARALLELISM 10
-PREHOOK: type: CREATE_RESOURCEPLAN
+PREHOOK: type: CREATE RESOURCEPLAN
 POSTHOOK: query: CREATE RESOURCE PLAN plan_2 WITH QUERY_PARALLELISM 10
-POSTHOOK: type: CREATE_RESOURCEPLAN
+POSTHOOK: type: CREATE RESOURCEPLAN
 PREHOOK: query: SHOW RESOURCE PLANS
-PREHOOK: type: SHOW_RESOURCEPLAN
+PREHOOK: type: SHOW RESOURCEPLAN
 POSTHOOK: query: SHOW RESOURCE PLANS
-POSTHOOK: type: SHOW_RESOURCEPLAN
+POSTHOOK: type: SHOW RESOURCEPLAN
 plan_1	null	 
 plan_2	10	 
 PREHOOK: query: SHOW RESOURCE PLAN plan_2
-PREHOOK: type: SHOW_RESOURCEPLAN
+PREHOOK: type: SHOW RESOURCEPLAN
 POSTHOOK: query: SHOW RESOURCE PLAN plan_2
-POSTHOOK: type: SHOW_RESOURCEPLAN
+POSTHOOK: type: SHOW RESOURCEPLAN
 plan_2	10	 
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
@@ -2972,7 +2972,7 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_1	DISABLED	NULL
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_1 RENAME TO plan_2
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Resource plan should be unique)
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
@@ -2985,9 +2985,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_1	DISABLED	NULL
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_1 RENAME TO plan_3
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_1 RENAME TO plan_3
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -2999,9 +2999,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	DISABLED	NULL
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 SET QUERY_PARALLELISM = 20
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_3 SET QUERY_PARALLELISM = 20
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3013,7 +3013,7 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	DISABLED	20
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Cannot activate resource plan: plan_3 first enable it)
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
@@ -3026,9 +3026,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	DISABLED	20
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3040,9 +3040,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	DISABLED	20
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3054,9 +3054,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	ENABLED	20
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3068,9 +3068,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	ACTIVE	20
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3082,7 +3082,7 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	ACTIVE	20
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE
-PREHOOK: type: ALTER_RESOURCEPLAN
+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.)
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
@@ -3095,7 +3095,7 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	ACTIVE	20
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE
-PREHOOK: type: ALTER_RESOURCEPLAN
+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.)
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
@@ -3108,9 +3108,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	ACTIVE	20
 plan_2	DISABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_2 ENABLE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_2 ENABLE
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3122,9 +3122,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	ACTIVE	20
 plan_2	ENABLED	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_2 ACTIVATE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_2 ACTIVATE
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3136,9 +3136,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	ENABLED	20
 plan_2	ACTIVE	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3150,9 +3150,9 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	ENABLED	20
 plan_2	ACTIVE	10
 PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE
-PREHOOK: type: ALTER_RESOURCEPLAN
+PREHOOK: type: ALTER RESOURCEPLAN
 POSTHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE
-POSTHOOK: type: ALTER_RESOURCEPLAN
+POSTHOOK: type: ALTER RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans
@@ -3164,12 +3164,12 @@ POSTHOOK: Input: sys@wm_resourceplans
 plan_3	DISABLED	20
 plan_2	ACTIVE	10
 PREHOOK: query: DROP RESOURCE PLAN plan_2
-PREHOOK: type: DROP_RESOURCEPLAN
+PREHOOK: type: DROP RESOURCEPLAN
 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. NoSuchObjectException(message:Cannot find resourcePlan: plan_2 or its active)
 PREHOOK: query: DROP RESOURCE PLAN plan_3
-PREHOOK: type: DROP_RESOURCEPLAN
+PREHOOK: type: DROP RESOURCEPLAN
 POSTHOOK: query: DROP RESOURCE PLAN plan_3
-POSTHOOK: type: DROP_RESOURCEPLAN
+POSTHOOK: type: DROP RESOURCEPLAN
 PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@wm_resourceplans