Repository: hive Updated Branches: refs/heads/master 61d8a06b9 -> dfc4b8edb
HIVE-21171: Skip creating scratch dirs for tez if RPC is on (Vineet Garg, reviewed by Ashutosh Chauhan) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/dfc4b8ed Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/dfc4b8ed Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/dfc4b8ed Branch: refs/heads/master Commit: dfc4b8edbd1ad8c394634c67fbd1f06ba03e4d7f Parents: 61d8a06 Author: Vineet Garg <vg...@apache.org> Authored: Tue Jan 29 11:00:28 2019 -0800 Committer: Vineet Garg <vg...@apache.org> Committed: Tue Jan 29 11:00:28 2019 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/ql/exec/Utilities.java | 7 +++++-- .../org/apache/hadoop/hive/ql/exec/tez/DagUtils.java | 13 ++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/dfc4b8ed/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index 2ff9ad3..8937b43 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -667,8 +667,11 @@ public final class Utilities { // this is the unique conf ID, which is kept in JobConf as part of the plan file name String jobID = UUID.randomUUID().toString(); Path planPath = new Path(hiveScratchDir, jobID); - FileSystem fs = planPath.getFileSystem(conf); - fs.mkdirs(planPath); + if (!HiveConf.getBoolVar(conf, ConfVars.HIVE_RPC_QUERY_PLAN)) { + FileSystem fs = planPath.getFileSystem(conf); + // since we are doing RPC creating a directory is un-necessary + fs.mkdirs(planPath); + } HiveConf.setVar(conf, HiveConf.ConfVars.PLAN, planPath.toUri().toString()); } } http://git-wip-us.apache.org/repos/asf/hive/blob/dfc4b8ed/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java index 1a88b77..d9340d0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java @@ -1500,11 +1500,14 @@ public class DagUtils { scratchDir = new Path(scratchDir, userName); Path tezDir = getTezDir(scratchDir); - FileSystem fs = tezDir.getFileSystem(conf); - LOG.debug("TezDir path set " + tezDir + " for user: " + userName); - // since we are adding the user name to the scratch dir, we do not - // need to give more permissions here - fs.mkdirs(tezDir); + if (!HiveConf.getBoolVar(conf, ConfVars.HIVE_RPC_QUERY_PLAN)) { + FileSystem fs = tezDir.getFileSystem(conf); + LOG.debug("TezDir path set " + tezDir + " for user: " + userName); + // since we are adding the user name to the scratch dir, we do not + // need to give more permissions here + // Since we are doing RPC creating a dir is not necessary + fs.mkdirs(tezDir); + } return tezDir;