TEZ-3410. ShuffleHandler should use Path.SEPARATOR instead of '/' (Kuhu Shukla via jeagles)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/2d730ebc Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/2d730ebc Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/2d730ebc Branch: refs/heads/master Commit: 2d730ebca0ead7194e3cb7abc20c96572e6569b1 Parents: 0e1d277 Author: Jonathan Eagles <[email protected]> Authored: Fri Aug 12 17:28:37 2016 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Fri Aug 12 17:28:37 2016 -0500 ---------------------------------------------------------------------- TEZ-3334-CHANGES.txt | 1 + .../java/org/apache/tez/auxservices/ShuffleHandler.java | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/2d730ebc/TEZ-3334-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-3334-CHANGES.txt b/TEZ-3334-CHANGES.txt index 749edfe..3572a80 100644 --- a/TEZ-3334-CHANGES.txt +++ b/TEZ-3334-CHANGES.txt @@ -4,6 +4,7 @@ Apache Tez Change Log INCOMPATIBLE CHANGES: ALL CHANGES: + TEZ-3410. ShuffleHandler should use Path.SEPARATOR instead "/" TEZ-3408. Allow Task Output Files to reside in DAG specific directories for Custom Shuffle Handler TEZ-3238. Shuffle service name should be configureable and should not be hardcoded to âmapreduce_shuffleâ TEZ-3390. Package Shuffle Handler as a shaded uber-jar http://git-wip-us.apache.org/repos/asf/tez/blob/2d730ebc/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java index d11dd2c..873a171 100644 --- a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java +++ b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java @@ -833,9 +833,9 @@ public class ShuffleHandler extends AuxiliaryService { String base = getBaseLocation(key.jobId, key.dagId, key.user); String attemptBase = base + key.attemptId; Path indexFileName = lDirAlloc.getLocalPathToRead( - attemptBase + "/" + INDEX_FILE_NAME, conf); + attemptBase + Path.SEPARATOR + INDEX_FILE_NAME, conf); Path mapOutputFileName = lDirAlloc.getLocalPathToRead( - attemptBase + "/" + DATA_FILE_NAME, conf); + attemptBase + Path.SEPARATOR + DATA_FILE_NAME, conf); if (LOG.isDebugEnabled()) { LOG.debug("Loaded : " + key + " via loader"); @@ -1054,9 +1054,10 @@ public class ShuffleHandler extends AuxiliaryService { ApplicationId.newInstance(Long.parseLong(jobID.getJtIdentifier()), jobID.getId()); final String baseStr = - USERCACHE + "/" + user + "/" - + APPCACHE + "/" - + appID.toString() + "/dag_" + dagId + "/output" + "/"; + USERCACHE + Path.SEPARATOR + user + Path.SEPARATOR + + APPCACHE + Path.SEPARATOR + + appID.toString() + Path.SEPARATOR + "dag_" + dagId + + Path.SEPARATOR + "output" + Path.SEPARATOR; return baseStr; }
