HADOOP-13867. FilterFileSystem should override rename(.., options) to take effect of Rename options called via FilterFileSystem implementations. Contributed By Vinayakumar B.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0ef79617 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0ef79617 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0ef79617 Branch: refs/heads/HADOOP-13345 Commit: 0ef796174ecb5383f79cfecfcbfc4f309d093cd7 Parents: 4c2cf55 Author: Brahma Reddy Battula <bra...@apache.org> Authored: Thu Dec 8 18:57:43 2016 +0530 Committer: Brahma Reddy Battula <bra...@apache.org> Committed: Thu Dec 8 18:57:43 2016 +0530 ---------------------------------------------------------------------- .../java/org/apache/hadoop/fs/FilterFileSystem.java | 7 +++++++ .../java/org/apache/hadoop/fs/TestFilterFileSystem.java | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ef79617/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 3f9aaa4..41429ac 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 @@ -34,6 +34,7 @@ import org.apache.hadoop.fs.permission.AclStatus; import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.Options.ChecksumOpt; +import org.apache.hadoop.fs.Options.Rename; import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.util.Progressable; @@ -235,6 +236,12 @@ public class FilterFileSystem extends FileSystem { } @Override + protected void rename(Path src, Path dst, Rename... options) + throws IOException { + fs.rename(src, dst, options); + } + + @Override public boolean truncate(Path f, final long newLength) throws IOException { return fs.truncate(f, newLength); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ef79617/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java index 24f3dc8..4cbb8ab 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java @@ -64,7 +64,6 @@ public class TestFilterFileSystem { public FSDataOutputStream append(Path f, int bufferSize) throws IOException; public long getLength(Path f); - public void rename(Path src, Path dst, Rename... options); public boolean exists(Path f); public boolean isDirectory(Path f); public boolean isFile(Path f); @@ -264,6 +263,17 @@ public class TestFilterFileSystem { verify(mockFs).setWriteChecksum(eq(true)); } + @Test + public void testRenameOptions() throws Exception { + FileSystem mockFs = mock(FileSystem.class); + FileSystem fs = new FilterFileSystem(mockFs); + Path src = new Path("/src"); + Path dst = new Path("/dest"); + Rename opt = Rename.TO_TRASH; + fs.rename(src, dst, opt); + verify(mockFs).rename(eq(src), eq(dst), eq(opt)); + } + private void checkInit(FilterFileSystem fs, boolean expectInit) throws Exception { URI uri = URI.create("filter:/"); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
