Merge pull request #99 from jayunit100/escapechars

Escapechars

Author: childsb

src/main/java/org/apache/hadoop/fs/glusterfs/GlusterVolume.java

@@ -21,6 +21,7 @@
 
 package org.apache.hadoop.fs.glusterfs;
 
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -208,7 +209,8 @@ protected Path getInitialWorkingDirectory() {
 
 	public Path fileToPath(File path) {
 	    Enumeration<String> all = volumes.keys();
-	    String rawPath = path.toURI().getRawPath();
+	    String rawPath = path.getAbsolutePath();
+	    
 	    String volume = null;
 	    String root = null;
 
@@ -223,8 +225,7 @@ public Path fileToPath(File path) {
 
 	    if(default_volume.equalsIgnoreCase(volume))
 	        volume = "";
-	    
-        return new Path("glusterfs://" + volume + "/" + rawPath.substring(root.length()));
+	    return new Path("glusterfs://" + volume + "/" + rawPath.substring(root.length()));
      }
 
      public boolean rename(Path src, Path dst) throws IOException {
@@ -292,8 +293,7 @@ public FileStatus[] listStatus(Path f) throws IOException {
             results[j] = getFileStatus(fileToPath(names[i]));
             j++;
           } catch (FileNotFoundException e) {
-            // ignore the files not found since the dir list may have have changed
-            // since the names[] list was generated.
+        	  log.info("ignoring invisible path :  " + names[i]);
           }
         }
         if (j == names.length) {

src/test/java/org/apache/hadoop/fs/test/unit/HcfsFileSystemTest.java

@@ -31,12 +31,16 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.Iterator;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.fs.permission.FsAction;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.fs.test.connector.HcfsTestConnectorFactory;
@@ -45,7 +49,6 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -56,6 +59,26 @@ public class HcfsFileSystemTest{
 
     static FileSystem fs ; 
 
+
+    /**
+     * See MAPREDUCE-5902 for context on why this test is critical
+     * for ecosystem interoperability.
+     */
+    @org.junit.Test
+    public void testEncodedPaths() throws Exception {
+    	//FileSystem fs2 = FileSystem.getLocal(new Configuration());
+    	FileSystem fs2 = fs;
+    	Path encodedFiles=new Path("/tmp/encodedTest"+System.currentTimeMillis());
+    	fs2.mkdirs(encodedFiles);
+    	fs2.create(new Path(encodedFiles,"a"));
+    	fs2.create(new Path(encodedFiles,"a%2"));
+    	fs2.create(new Path(encodedFiles,"a%2a"));
+    	fs2.create(new Path(encodedFiles,"a%3a"));
+    	fs2.create(new Path(encodedFiles,"a%4a"));
+    	Assert.assertEquals(5, fs2.listStatus(encodedFiles).length);
+    	fs2.delete(encodedFiles);
+    }    
+    
     @BeforeClass
     public static void setup() throws Exception {
     	HcfsTestConnectorInterface connector = HcfsTestConnectorFactory.getHcfsTestConnector();