Updated Branches: refs/heads/master 75ba35468 -> b3d023871
CRUNCH-148: Make distributed cache path checking independent of Hadoop version Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/b3d02387 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/b3d02387 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/b3d02387 Branch: refs/heads/master Commit: b3d02387191613c8269ebbf44ad0a87f7ab551a6 Parents: 75ba354 Author: Josh Wills <[email protected]> Authored: Tue Jan 22 15:41:12 2013 -0800 Committer: Josh Wills <[email protected]> Committed: Tue Jan 22 15:41:12 2013 -0800 ---------------------------------------------------------------------- .../org/apache/crunch/lib/join/MapsideJoinIT.java | 1 - .../org/apache/crunch/lib/join/MapsideJoin.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/b3d02387/crunch/src/it/java/org/apache/crunch/lib/join/MapsideJoinIT.java ---------------------------------------------------------------------- diff --git a/crunch/src/it/java/org/apache/crunch/lib/join/MapsideJoinIT.java b/crunch/src/it/java/org/apache/crunch/lib/join/MapsideJoinIT.java index 7d5d94d..8bb5586 100644 --- a/crunch/src/it/java/org/apache/crunch/lib/join/MapsideJoinIT.java +++ b/crunch/src/it/java/org/apache/crunch/lib/join/MapsideJoinIT.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import org.apache.crunch.CrunchRuntimeException; import org.apache.crunch.MapFn; import org.apache.crunch.PTable; import org.apache.crunch.Pair; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/b3d02387/crunch/src/main/java/org/apache/crunch/lib/join/MapsideJoin.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/lib/join/MapsideJoin.java b/crunch/src/main/java/org/apache/crunch/lib/join/MapsideJoin.java index 8116ea1..9b532c5 100644 --- a/crunch/src/main/java/org/apache/crunch/lib/join/MapsideJoin.java +++ b/crunch/src/main/java/org/apache/crunch/lib/join/MapsideJoin.java @@ -118,9 +118,10 @@ public class MapsideJoin { } private Path getCacheFilePath() { + Path input = new Path(inputPath); try { for (Path localPath : DistributedCache.getLocalCacheFiles(getConfiguration())) { - if (localPath.toString().endsWith(inputPath)) { + if (localPath.toString().endsWith(input.getName())) { return localPath.makeQualified(FileSystem.getLocal(getConfiguration())); }
