Repository: hadoop Updated Branches: refs/heads/branch-2 6874a142d -> 2bf5a005f refs/heads/branch-2.7 05c782153 -> a9c1bb424 refs/heads/branch-2.8 c7be3deff -> e88c01fa5 refs/heads/trunk 77ba5add0 -> 96ea30943
HADOOP-12810. FileSystem#listLocatedStatus causes unnecessary RPC calls (Contributed by Ryan Blue) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/96ea3094 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/96ea3094 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/96ea3094 Branch: refs/heads/trunk Commit: 96ea3094315bb1e1a5e268e3817c7fdedc3e9462 Parents: 77ba5ad Author: Vinayakumar B <[email protected]> Authored: Wed Feb 17 10:13:41 2016 +0530 Committer: Vinayakumar B <[email protected]> Committed: Wed Feb 17 10:13:41 2016 +0530 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/fs/FileSystem.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/96ea3094/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 1a2b32f..0aa39d9 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1720,6 +1720,9 @@ Release 2.7.3 - UNRELEASED OPTIMIZATIONS + HADOOP-12810. FileSystem#listLocatedStatus causes unnecessary RPC calls + (Ryan Blue via vinayakumarb) + BUG FIXES HADOOP-12296. when setnetgrent returns 0 in linux, exception should be http://git-wip-us.apache.org/repos/asf/hadoop/blob/96ea3094/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java index 920c5a6..f4a2e7d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java @@ -1749,8 +1749,10 @@ public abstract class FileSystem extends Configured implements Closeable { throw new NoSuchElementException("No more entries in " + f); } FileStatus result = stats[i++]; + // for files, use getBlockLocations(FileStatus, int, int) to avoid + // calling getFileStatus(Path) to load the FileStatus again BlockLocation[] locs = result.isFile() ? - getFileBlockLocations(result.getPath(), 0, result.getLen()) : + getFileBlockLocations(result, 0, result.getLen()) : null; return new LocatedFileStatus(result, locs); }
