[bigtop] branch master updated: BIGTOP-3347. Fix test failures of Hive ProxyFileSystem against Hadoop 2.10.0. (#633)

[sekikn]

This is an automated email from the ASF dual-hosted git repository.

sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 399a210  BIGTOP-3347. Fix test failures of Hive ProxyFileSystem 
against Hadoop 2.10.0. (#633)
399a210 is described below

commit 399a210dbd85270079945a13ae6f94dc84db52e4
Author: Masatake Iwasaki <iwasak...@apache.org>
AuthorDate: Tue May 5 16:01:58 2020 +0900

    BIGTOP-3347. Fix test failures of Hive ProxyFileSystem against Hadoop 
2.10.0. (#633)
---
 .../src/common/hive/patch3-HIVE-23303.diff         | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/bigtop-packages/src/common/hive/patch3-HIVE-23303.diff 
b/bigtop-packages/src/common/hive/patch3-HIVE-23303.diff
new file mode 100644
index 0000000..d73743f
--- /dev/null
+++ b/bigtop-packages/src/common/hive/patch3-HIVE-23303.diff
@@ -0,0 +1,37 @@
+diff --git 
a/shims/common/src/main/java/org/apache/hadoop/fs/ProxyFileSystem.java 
b/shims/common/src/main/java/org/apache/hadoop/fs/ProxyFileSystem.java
+index 2c37a51cf4..c8122a2d61 100644
+--- a/shims/common/src/main/java/org/apache/hadoop/fs/ProxyFileSystem.java
++++ b/shims/common/src/main/java/org/apache/hadoop/fs/ProxyFileSystem.java
+@@ -23,6 +23,7 @@
+ import java.net.URISyntaxException;
+ 
+ import org.apache.hadoop.conf.Configuration;
++import org.apache.hadoop.fs.Options.Rename;
+ import org.apache.hadoop.fs.permission.FsPermission;
+ import org.apache.hadoop.util.Progressable;
+ import org.apache.hadoop.util.Shell;
+@@ -180,6 +181,12 @@ public boolean rename(Path src, Path dst) throws 
IOException {
+     return super.isFile(dest) ? false : super.rename(swizzleParamPath(src), 
dest);
+   }
+ 
++   @Override
++   protected void rename(Path src, Path dst, Rename... options)
++       throws IOException {
++     super.rename(swizzleParamPath(src), swizzleParamPath(dst), options);
++   }
++
+   @Override
+   public boolean delete(Path f, boolean recursive) throws IOException {
+     return super.delete(swizzleParamPath(f), recursive);
+@@ -215,6 +222,11 @@ public Path getWorkingDirectory() {
+     return swizzleReturnPath(super.getWorkingDirectory());
+   }
+ 
++  @Override
++  public boolean mkdirs(Path f) throws IOException {
++    return super.mkdirs(swizzleParamPath(f));
++  }
++
+   @Override
+   public boolean mkdirs(Path f, FsPermission permission) throws IOException {
+     return super.mkdirs(swizzleParamPath(f), permission);