You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2015/05/08 22:37:14 UTC
hadoop git commit: HADOOP-7165. listLocatedStatus(path,
filter) is not redefined in FilterFs. Contributed by Hairong Kuang
(cherry picked from commit c4bd2cddede779acfd3c5cdff16bf552068dfb64)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 30cb540b4 -> 4b96834e0
HADOOP-7165. listLocatedStatus(path, filter) is not redefined in FilterFs. Contributed by Hairong Kuang
(cherry picked from commit c4bd2cddede779acfd3c5cdff16bf552068dfb64)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4b96834e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4b96834e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4b96834e
Branch: refs/heads/branch-2
Commit: 4b96834e0de5df48b1688cc9ddc6fd2ede6982b1
Parents: 30cb540
Author: Jason Lowe <jl...@apache.org>
Authored: Fri May 8 20:36:07 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Fri May 8 20:36:55 2015 +0000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../main/java/org/apache/hadoop/fs/FilterFileSystem.java | 10 +++++++++-
.../src/main/java/org/apache/hadoop/fs/FilterFs.java | 8 ++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4b96834e/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 667d474..cb5e144 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -182,6 +182,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-10356. Corrections in winutils/chmod.c. (Rene Nyffenegger via
Arpit Agarwal)
+ HADOOP-7165. listLocatedStatus(path, filter) is not redefined in FilterFs
+ (Hairong Kuang via jlowe)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4b96834e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
index d14a272..ec056a4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
@@ -192,7 +192,15 @@ public class FilterFileSystem extends FileSystem {
return fs.create(f, permission,
flags, bufferSize, replication, blockSize, progress, checksumOpt);
}
-
+
+ @Override
+ protected RemoteIterator<LocatedFileStatus> listLocatedStatus(final Path f,
+ final PathFilter filter)
+ throws FileNotFoundException, IOException {
+ return fs.listLocatedStatus(f, filter);
+ }
+
+
@Override
@Deprecated
public FSDataOutputStream createNonRecursive(Path f, FsPermission permission,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4b96834e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
index f6a6f23..2ba6318 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
@@ -185,6 +185,14 @@ public abstract class FilterFs extends AbstractFileSystem {
}
@Override
+ public RemoteIterator<LocatedFileStatus> listLocatedStatus(final Path f)
+ throws AccessControlException, FileNotFoundException,
+ UnresolvedLinkException, IOException {
+ checkPath(f);
+ return myFs.listLocatedStatus(f);
+ }
+
+ @Override
public RemoteIterator<Path> listCorruptFileBlocks(Path path)
throws IOException {
return myFs.listCorruptFileBlocks(path);