You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2015/01/23 22:47:18 UTC
svn commit: r1654400 - in /hive/trunk:
ql/src/java/org/apache/hadoop/hive/ql/metadata/
shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/
shims/0.23/src/main/java/org/apache/hadoop/hive/shims/
shims/common/src/main/java/org/apache/hadoop/hive/shims/
Author: prasanthj
Date: Fri Jan 23 21:47:18 2015
New Revision: 1654400
URL: http://svn.apache.org/r1654400
Log:
HIVE-9434: Shim the method Path.getPathWithoutSchemeAndAuthority (Dong Chen, reviewed by Brock Noland)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java?rev=1654400&r1=1654399&r2=1654400&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java Fri Jan 23 21:47:18 2015
@@ -2399,7 +2399,7 @@ private void constructOneLBLocationMap(F
private static String getQualifiedPathWithoutSchemeAndAuthority(Path srcf, FileSystem fs) {
Path currentWorkingDir = fs.getWorkingDirectory();
Path path = srcf.makeQualified(srcf.toUri(), currentWorkingDir);
- return Path.getPathWithoutSchemeAndAuthority(path).toString();
+ return ShimLoader.getHadoopShims().getPathWithoutSchemeAndAuthority(path).toString();
}
//it is assumed that parent directory of the destf should already exist when this
Modified: hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1654400&r1=1654399&r2=1654400&view=diff
==============================================================================
--- hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original)
+++ hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Fri Jan 23 21:47:18 2015
@@ -681,4 +681,9 @@ public class Hadoop20SShims extends Hado
public HdfsEncryptionShim createHdfsEncryptionShim(FileSystem fs, Configuration conf) throws IOException {
return new HadoopShims.NoopHdfsEncryptionShim();
}
+
+ @Override
+ public Path getPathWithoutSchemeAndAuthority(Path path) {
+ return path;
+ }
}
Modified: hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1654400&r1=1654399&r2=1654400&view=diff
==============================================================================
--- hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Fri Jan 23 21:47:18 2015
@@ -1213,4 +1213,9 @@ public class Hadoop23Shims extends Hadoo
}
return new HadoopShims.NoopHdfsEncryptionShim();
}
+
+ @Override
+ public Path getPathWithoutSchemeAndAuthority(Path path) {
+ return Path.getPathWithoutSchemeAndAuthority(path);
+ }
}
Modified: hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1654400&r1=1654399&r2=1654400&view=diff
==============================================================================
--- hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java (original)
+++ hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java Fri Jan 23 21:47:18 2015
@@ -701,4 +701,6 @@ public interface HadoopShims {
* @throws IOException If an error occurred while creating the instance.
*/
public HdfsEncryptionShim createHdfsEncryptionShim(FileSystem fs, Configuration conf) throws IOException;
+
+ public Path getPathWithoutSchemeAndAuthority(Path path);
}