Repository: hive Updated Branches: refs/heads/master 4157792a9 -> 03216f501
HIVE-16043 : TezConfiguration.TEZ_QUEUE_NAME instead of tez.queue.name (Fei Hui, 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/03216f50 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/03216f50 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/03216f50 Branch: refs/heads/master Commit: 03216f50137a226c67a25971319dbde96912bc6a Parents: 4157792 Author: Sergey Shelukhin <ser...@apache.org> Authored: Wed Mar 1 10:44:40 2017 -0800 Committer: Sergey Shelukhin <ser...@apache.org> Committed: Wed Mar 1 10:44:40 2017 -0800 ---------------------------------------------------------------------- .../hadoop/hive/ql/exec/tez/TezSessionPoolManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/03216f50/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java index b70dbd8..68ad024 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java @@ -305,16 +305,16 @@ public class TezSessionPoolManager { private TezSessionState getSession(HiveConf conf, boolean doOpen) throws Exception { - String queueName = conf.get("tez.queue.name"); + String queueName = conf.get(TezConfiguration.TEZ_QUEUE_NAME); boolean hasQueue = (queueName != null) && !queueName.isEmpty(); if (hasQueue) { switch (customQueueAllowed) { - case FALSE: throw new HiveException("Specifying tez.queue.name is not allowed"); + case FALSE: throw new HiveException("Specifying " + TezConfiguration.TEZ_QUEUE_NAME + " is not allowed"); case IGNORE: { LOG.warn("User has specified " + queueName + " queue; ignoring the setting"); queueName = null; hasQueue = false; - conf.unset("tez.queue.name"); + conf.unset(TezConfiguration.TEZ_QUEUE_NAME); } default: // All good. } @@ -375,7 +375,7 @@ public class TezSessionPoolManager { String queueName, boolean doOpen) throws Exception { TezSessionPoolSession retTezSessionState = createAndInitSession(queueName, false); if (queueName != null) { - conf.set("tez.queue.name", queueName); + conf.set(TezConfiguration.TEZ_QUEUE_NAME, queueName); } if (doOpen) { retTezSessionState.open(conf);
