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 <harisan...@apache.org> Authored: Thu Nov 5 11:52:24 2015 -0800 Committer: Hari Subramaniyan <harisan...@apache.org> 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<MapredWork> 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<MapredWork> 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);
