You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2017/11/14 02:42:51 UTC
hive git commit: HIVE-17882: Resource plan retrieval looks incorrect
(Harish Jaiprakash reviewed by Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/master 69e38e8b2 -> 68d35fd60
HIVE-17882: Resource plan retrieval looks incorrect (Harish Jaiprakash reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/68d35fd6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/68d35fd6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/68d35fd6
Branch: refs/heads/master
Commit: 68d35fd60aa8ccde66d759e296ad73fa44c4b353
Parents: 69e38e8
Author: Prasanth Jayachandran <pr...@apache.org>
Authored: Mon Nov 13 18:40:44 2017 -0800
Committer: Prasanth Jayachandran <pr...@apache.org>
Committed: Mon Nov 13 18:41:05 2017 -0800
----------------------------------------------------------------------
.../ql/metadata/formatting/TextMetaDataFormatter.java | 4 ++--
.../test/results/clientpositive/llap/resourceplan.q.out | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/68d35fd6/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
index 3fda5ab..a57e0ce 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
@@ -550,14 +550,14 @@ class TextMetaDataFormatter implements MetaDataFormatter {
for (WMResourcePlan plan : resourcePlans) {
out.write(plan.getName().getBytes("UTF-8"));
out.write(separator);
+ out.write(plan.getStatus().name().getBytes("UTF-8"));
+ out.write(separator);
if (plan.isSetQueryParallelism()) {
out.writeBytes(Integer.toString(plan.getQueryParallelism()));
} else {
out.writeBytes("null");
}
out.write(separator);
- out.write(plan.getStatus().name().getBytes("UTF-8"));
- out.write(separator);
if (plan.isSetDefaultPoolPath()) {
out.write(plan.getDefaultPoolPath().getBytes("UTF-8"));
} else {
http://git-wip-us.apache.org/repos/asf/hive/blob/68d35fd6/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 5b5d8f1..fe4d77a 100644
--- a/ql/src/test/results/clientpositive/llap/resourceplan.q.out
+++ b/ql/src/test/results/clientpositive/llap/resourceplan.q.out
@@ -2985,12 +2985,12 @@ PREHOOK: query: SHOW RESOURCE PLANS
PREHOOK: type: SHOW RESOURCEPLAN
POSTHOOK: query: SHOW RESOURCE PLANS
POSTHOOK: type: SHOW RESOURCEPLAN
-plan_1 null
+plan_1 DISABLED
PREHOOK: query: SHOW RESOURCE PLAN plan_1
PREHOOK: type: SHOW RESOURCEPLAN
POSTHOOK: query: SHOW RESOURCE PLAN plan_1
POSTHOOK: type: SHOW RESOURCEPLAN
-plan_1 null
+plan_1 DISABLED
PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
PREHOOK: type: QUERY
PREHOOK: Input: sys@wm_resourceplans
@@ -3008,13 +3008,13 @@ PREHOOK: query: SHOW RESOURCE PLANS
PREHOOK: type: SHOW RESOURCEPLAN
POSTHOOK: query: SHOW RESOURCE PLANS
POSTHOOK: type: SHOW RESOURCEPLAN
-plan_1 null
-plan_2 10
+plan_1 DISABLED
+plan_2 DISABLED 10
PREHOOK: query: SHOW RESOURCE PLAN plan_2
PREHOOK: type: SHOW RESOURCEPLAN
POSTHOOK: query: SHOW RESOURCE PLAN plan_2
POSTHOOK: type: SHOW RESOURCEPLAN
-plan_2 10
+plan_2 DISABLED 10
PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS
PREHOOK: type: QUERY
PREHOOK: Input: sys@wm_resourceplans