Repository: hadoop Updated Branches: refs/heads/branch-2 e38c2ef6c -> 7f6737951
MAPREDUCE-6637. Testcase Failure : TestFileInputFormat.testSplitLocationInfo. Contributed by Brahma Reddy Battula. (cherry picked from commit 37577852ba54ba506b0b6c4db5e95d176f5e9b63) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7f673795 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7f673795 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7f673795 Branch: refs/heads/branch-2 Commit: 7f6737951a124480af2f3fff9358865fff3ed091 Parents: e38c2ef Author: Andrew Wang <[email protected]> Authored: Fri Feb 19 16:33:17 2016 -0800 Committer: Andrew Wang <[email protected]> Committed: Fri Feb 19 16:33:40 2016 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/mapred/TestFileInputFormat.java | 2 +- .../apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f673795/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 2cdb9ab..b9c1ea6 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -443,6 +443,9 @@ Release 2.7.3 - UNRELEASED IMPROVEMENTS + MAPREDUCE-6637. Testcase Failure : TestFileInputFormat.testSplitLocationInfo. + (Brahma Reddy Battula via wang) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f673795/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java index ba636b6..141086d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java @@ -243,7 +243,7 @@ public class TestFileInputFormat { } @Override - public BlockLocation[] getFileBlockLocations(Path p, long start, long len) + public BlockLocation[] getFileBlockLocations(FileStatus file, long start, long len) throws IOException { return new BlockLocation[] { new BlockLocation(new String[] { "localhost:50010", "otherhost:50010" }, http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f673795/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java index 3f877f1..dff0e0d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java @@ -422,7 +422,7 @@ public class TestFileInputFormat { } @Override - public BlockLocation[] getFileBlockLocations(Path p, long start, long len) + public BlockLocation[] getFileBlockLocations(FileStatus file, long start, long len) throws IOException { return new BlockLocation[] { new BlockLocation(new String[] { "localhost:50010", "otherhost:50010" },
