You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hive.apache.org by br...@apache.org on 2015/01/07 23:50:44 UTC

svn commit: r1650189 - /hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java

Author: brock
Date: Wed Jan  7 22:50:43 2015
New Revision: 1650189

URL: http://svn.apache.org/r1650189
Log:
HIVE-9284 - The hdfsEncryptionShim does not handle the relative path well based on hadoop 2.6 (Ferdinand Xu via Brock)

Modified:
    hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java

Modified: hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1650189&r1=1650188&r2=1650189&view=diff
==============================================================================
--- hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Wed Jan  7 22:50:43 2015
@@ -996,7 +996,13 @@ public class Hadoop23Shims extends Hadoo
 
     @Override
     public boolean isPathEncrypted(Path path) throws IOException {
-      return (hdfsAdmin.getEncryptionZoneForPath(path) != null);
+      Path fullPath;
+      if (path.isAbsolute()) {
+        fullPath = path;
+      } else {
+        fullPath = path.getFileSystem(conf).makeQualified(path);
+      }
+      return (hdfsAdmin.getEncryptionZoneForPath(fullPath) != null);
     }
 
     @Override