Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A273187C1 for ; Thu, 5 Nov 2015 19:52:41 +0000 (UTC) Received: (qmail 49363 invoked by uid 500); 5 Nov 2015 19:52:35 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 49315 invoked by uid 500); 5 Nov 2015 19:52:34 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 49304 invoked by uid 99); 5 Nov 2015 19:52:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2015 19:52:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C73BAE3921; Thu, 5 Nov 2015 19:52:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: harisankar@apache.org To: commits@hive.apache.org Message-Id: <0c5fdc987a73466dbd712c65261e47a2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-12340 : ExecDriver.execute() unnecessarily sets METASTOREPWD to HIVE (Hari Subramaniyan, reviewed by Sushanth Sowmyan) Date: Thu, 5 Nov 2015 19:52:34 +0000 (UTC) Repository: hive Updated Branches: refs/heads/branch-1 33e818aad -> d4abd51ec HIVE-12340 : ExecDriver.execute() unnecessarily sets METASTOREPWD to HIVE (Hari Subramaniyan, reviewed by Sushanth Sowmyan) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/d4abd51e Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/d4abd51e Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/d4abd51e Branch: refs/heads/branch-1 Commit: d4abd51eca600d1088ba0520f373b12f6da1060b Parents: 33e818a Author: Hari Subramaniyan Authored: Thu Nov 5 11:52:24 2015 -0800 Committer: Hari Subramaniyan Committed: Thu Nov 5 11:52:24 2015 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/d4abd51e/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java index 5f5b9e6..816c7ac 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java @@ -391,13 +391,6 @@ public class ExecDriver extends Task implements Serializable, Hadoop } } - // remove the pwd from conf file so that job tracker doesn't show this - // logs - String pwd = HiveConf.getVar(job, HiveConf.ConfVars.METASTOREPWD); - if (pwd != null) { - HiveConf.setVar(job, HiveConf.ConfVars.METASTOREPWD, "HIVE"); - } - LOG.error(job.get("mapreduce.framework.name")); JobClient jc = new JobClient(job); // make this client wait if job tracker is not behaving well. Throttle.checkJobTracker(job, LOG); @@ -429,10 +422,6 @@ public class ExecDriver extends Task implements Serializable, Hadoop // Finally SUBMIT the JOB! rj = jc.submitJob(job); - // replace it back - if (pwd != null) { - HiveConf.setVar(job, HiveConf.ConfVars.METASTOREPWD, pwd); - } returnVal = jobExecHelper.progress(rj, jc, ctx.getHiveTxnManager()); success = (returnVal == 0);