svn commit: r1407159 - in /hive/trunk/shims/src/common/java/org/apache/hadoop/fs: ProxyFileSystem.java ProxyLocalFileSystem.java

[ha...@apache.org]

Author: hashutosh
Date: Thu Nov  8 16:33:46 2012
New Revision: 1407159

URL: http://svn.apache.org/viewvc?rev=1407159&view=rev
Log:
HIVE-3661 : Remove the Windows specific = related swizzle path changes from Proxy FileSystems (Kanna Karanam via Ashutosh Chauhan)

Modified:
    hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyFileSystem.java
    hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyLocalFileSystem.java

Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyFileSystem.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyFileSystem.java?rev=1407159&r1=1407158&r2=1407159&view=diff
==============================================================================
--- hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyFileSystem.java (original)
+++ hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyFileSystem.java Thu Nov  8 16:33:46 2012
@@ -47,22 +47,12 @@ public class ProxyFileSystem extends Fil
 
   private Path swizzleParamPath(Path p) {
     String pathUriString = p.toUri().toString();
-    if (Shell.WINDOWS) {
-      // Some of the file paths (Files with partition option) in HDFS '='
-      // but Windows file path doesn't support '=' so replace it with special string.
-      pathUriString = pathUriString.replaceAll("=", "------");
-    }
     URI newPathUri = URI.create(pathUriString);
     return new Path (realScheme, realAuthority, newPathUri.getPath());
   }
 
   private Path swizzleReturnPath(Path p) {
     String pathUriString = p.toUri().toString();
-    if (Shell.WINDOWS) {
-      // Revert back the special string '------' with '=' when we do the reverse conversion
-      // from Windows path to HDFS
-      pathUriString = pathUriString.replaceAll("------", "=");
-    }
     URI newPathUri = URI.create(pathUriString);
     return new Path (myScheme, myAuthority, newPathUri.getPath());
   }

Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyLocalFileSystem.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyLocalFileSystem.java?rev=1407159&r1=1407158&r2=1407159&view=diff
==============================================================================
--- hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyLocalFileSystem.java (original)
+++ hive/trunk/shims/src/common/java/org/apache/hadoop/fs/ProxyLocalFileSystem.java Thu Nov  8 16:33:46 2012
@@ -53,11 +53,9 @@ public class ProxyLocalFileSystem extend
     if (Shell.WINDOWS) {
       // Replace the encoded backward slash with forward slash
       // Remove the windows drive letter
-      // replace the '=' with special string '------' to handle the unsupported char '=' in windows.
       nameUriString = nameUriString.replaceAll("%5C", "/")
           .replaceFirst("/[c-zC-Z]:", "/")
-          .replaceFirst("^[c-zC-Z]:", "")
-          .replaceAll("=", "------");
+          .replaceFirst("^[c-zC-Z]:", "");
       name = URI.create(nameUriString);
     }