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 2018/04/02 22:45:46 UTC
hive git commit: HIVE-19071 : WM: backup resource plans cannot be
used without quoted idenitifiers (Sergey Shelukhin,
reviewed by Prasanth Jayachandran)
Repository: hive
Updated Branches:
refs/heads/master 2d770d8de -> b849a166b
HIVE-19071 : WM: backup resource plans cannot be used without quoted idenitifiers (Sergey Shelukhin, reviewed by Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b849a166
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b849a166
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b849a166
Branch: refs/heads/master
Commit: b849a166b63c136c14233e97fe849867d8b43aa8
Parents: 2d770d8
Author: sergey <se...@apache.org>
Authored: Mon Apr 2 15:39:06 2018 -0700
Committer: sergey <se...@apache.org>
Committed: Mon Apr 2 15:39:06 2018 -0700
----------------------------------------------------------------------
.../test/queries/clientpositive/resourceplan.q | 1 +
.../clientpositive/llap/resourceplan.q.out | 41 +++++++++++++-------
.../hadoop/hive/metastore/ObjectStore.java | 6 +--
3 files changed, 31 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/b849a166/ql/src/test/queries/clientpositive/resourceplan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/resourceplan.q b/ql/src/test/queries/clientpositive/resourceplan.q
index 009816d..bb5266a 100644
--- a/ql/src/test/queries/clientpositive/resourceplan.q
+++ b/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;
http://git-wip-us.apache.org/repos/asf/hive/blob/b849a166/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 96ed8c6..9850276 100644
--- a/ql/src/test/results/clientpositive/llap/resourceplan.q.out
+++ b/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
+ + <unused triggers>
+ | 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
http://git-wip-us.apache.org/repos/asf/hive/blob/b849a166/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
----------------------------------------------------------------------
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 3cea4b2..dec2163 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
@@ -10853,10 +10853,10 @@ public class ObjectStore implements RawStore, Configurable {
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));
}
}