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 br...@apache.org on 2017/07/21 12:58:40 UTC
[1/2] hadoop git commit: HADOOP-13867. FilterFileSystem should
override rename(..,
options) to take effect of Rename options called via FilterFileSystem
implementations. Contributed By Vinayakumar B.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 1edefb52e -> ef371dd18
refs/heads/branch-2.8.2 8ddd854f7 -> 6f4454080
HADOOP-13867. FilterFileSystem should override rename(.., options) to take effect of Rename options called via FilterFileSystem implementations. Contributed By Vinayakumar B.
(cherry picked from commit 0ef796174ecb5383f79cfecfcbfc4f309d093cd7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6f445408
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6f445408
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6f445408
Branch: refs/heads/branch-2.8.2
Commit: 6f445408022f210e01f826499d447d4e7792b429
Parents: 8ddd854
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu Dec 8 18:57:43 2016 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Fri Jul 21 20:40:59 2017 +0800
----------------------------------------------------------------------
.../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/6f445408/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/6f445408/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 1282af9..3cf0f0e 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);
@@ -262,6 +261,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: HADOOP-13867. FilterFileSystem should
override rename(..,
options) to take effect of Rename options called via FilterFileSystem
implementations. Contributed By Vinayakumar B.
Posted by br...@apache.org.
HADOOP-13867. FilterFileSystem should override rename(.., options) to take effect of Rename options called via FilterFileSystem implementations. Contributed By Vinayakumar B.
(cherry picked from commit 0ef796174ecb5383f79cfecfcbfc4f309d093cd7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ef371dd1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ef371dd1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ef371dd1
Branch: refs/heads/branch-2.7
Commit: ef371dd187be3508dfc8f89faca8f21d7d1cd55b
Parents: 1edefb5
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu Dec 8 18:57:43 2016 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Fri Jul 21 20:53:24 2017 +0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/fs/FilterFileSystem.java | 7 +++++++
.../org/apache/hadoop/fs/TestFilterFileSystem.java | 13 ++++++++++++-
3 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef371dd1/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 fb67953..63ad6ab 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -182,6 +182,9 @@ Release 2.7.4 - UNRELEASED
HADOOP-14356. Update CHANGES.txt to reflect all the changes in branch-2.7.
(Brahma Reddy Battula)
+ HADOOP-13867. FilterFileSystem should override rename(.., options) to take effect of Rename options called via
+ FilterFileSystem implementations. (Vinayakumar B via Brahma Reddy Battula)
+
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef371dd1/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..f98de2b 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
@@ -33,6 +33,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;
@@ -227,6 +228,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/ef371dd1/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 ec2908e..21fcade 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
@@ -52,7 +52,7 @@ public class TestFilterFileSystem {
conf.setBoolean("fs.flfs.impl.disable.cache", true);
conf.setBoolean("fs.file.impl.disable.cache", true);
}
-
+
public static class DontCheck {
public BlockLocation[] getFileBlockLocations(Path p,
long start, long len) { return null; }
@@ -334,6 +334,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org