HADOOP-1783. Make S3 FileSystem return Paths fully-qualified with scheme and host.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@578605 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -176,6 +176,9 @@ Trunk (unreleased changes)
     HADOOP-1882.  Remove spurious asterisks from decimal number displays.
     (Raghu Angadi via cutting)
 
+    HADOOP-1783.  Make S3 FileSystem return Paths fully-qualified with
+    scheme and host.  (tomwhite)
+
   IMPROVEMENTS
 
     HADOOP-1266. Remove dependency of package org.apache.hadoop.net on 

src/java/org/apache/hadoop/fs/s3/S3FileSystem.java

@@ -173,7 +173,7 @@ public class S3FileSystem extends FileSystem {
     }
     ArrayList<FileStatus> ret = new ArrayList<FileStatus>();
     for (Path p : store.listSubPaths(absolutePath)) {
-      ret.add(getFileStatus(p));
+      ret.add(getFileStatus(p.makeQualified(this)));
     }
     return ret.toArray(new FileStatus[0]);
   }

src/test/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java

@@ -56,7 +56,7 @@ class InMemoryFileSystemStore implements FileSystemStore {
   }
 
   public void deleteINode(Path path) throws IOException {
-    inodes.remove(path);
+    inodes.remove(normalize(path));
   }
 
   public void deleteBlock(Block block) throws IOException {
@@ -64,7 +64,7 @@ class InMemoryFileSystemStore implements FileSystemStore {
   }
 
   public boolean inodeExists(Path path) throws IOException {
-    return inodes.containsKey(path);
+    return inodes.containsKey(normalize(path));
   }
 
   public boolean blockExists(long blockId) throws IOException {
@@ -72,7 +72,7 @@ class InMemoryFileSystemStore implements FileSystemStore {
   }
 
   public INode retrieveINode(Path path) throws IOException {
-    return inodes.get(path);
+    return inodes.get(normalize(path));
   }
 
   public File retrieveBlock(Block block, long byteRangeStart) throws IOException {
@@ -101,10 +101,11 @@ class InMemoryFileSystemStore implements FileSystemStore {
   }
 
   public Set<Path> listSubPaths(Path path) throws IOException {
+    Path normalizedPath = normalize(path);
     // This is inefficient but more than adequate for testing purposes.
     Set<Path> subPaths = new LinkedHashSet<Path>();
-    for (Path p : inodes.tailMap(path).keySet()) {
-      if (path.equals(p.getParent())) {
+    for (Path p : inodes.tailMap(normalizedPath).keySet()) {
+      if (normalizedPath.equals(p.getParent())) {
         subPaths.add(p);
       }
     }
@@ -112,13 +113,14 @@ class InMemoryFileSystemStore implements FileSystemStore {
   }
 
   public Set<Path> listDeepSubPaths(Path path) throws IOException {
-    String pathString = path.toUri().getPath();
+    Path normalizedPath = normalize(path);    
+    String pathString = normalizedPath.toUri().getPath();
     if (!pathString.endsWith("/")) {
       pathString += "/";
     }
     // This is inefficient but more than adequate for testing purposes.
     Set<Path> subPaths = new LinkedHashSet<Path>();
-    for (Path p : inodes.tailMap(path).keySet()) {
+    for (Path p : inodes.tailMap(normalizedPath).keySet()) {
       if (p.toUri().getPath().startsWith(pathString)) {
         subPaths.add(p);
       }
@@ -127,7 +129,7 @@ class InMemoryFileSystemStore implements FileSystemStore {
   }
 
   public void storeINode(Path path, INode inode) throws IOException {
-    inodes.put(path, inode);
+    inodes.put(normalize(path), inode);
   }
 
   public void storeBlock(Block block, File file) throws IOException {
@@ -147,6 +149,13 @@ class InMemoryFileSystemStore implements FileSystemStore {
     }
     blocks.put(block.getId(), out.toByteArray());
   }
+  
+  private Path normalize(Path path) {
+    if (!path.isAbsolute()) {
+      throw new IllegalArgumentException("Path must be absolute: " + path);
+    }
+    return new Path(path.toUri().getPath());
+  }
 
   public void purge() throws IOException {
     inodes.clear();

src/test/org/apache/hadoop/fs/s3/S3FileSystemBaseTest.java

@@ -111,17 +111,21 @@ public abstract class S3FileSystemBaseTest extends TestCase {
     Path[] paths = s3FileSystem.listPaths(new Path("/"));
 
     assertEquals(1, paths.length);
-    assertEquals(new Path("/test"), paths[0]);
+    assertEquals(new Path("/test").makeQualified(s3FileSystem), paths[0]);
 
     paths = s3FileSystem.listPaths(new Path("/test"));
     assertEquals(1, paths.length);
-    assertEquals(new Path("/test/hadoop"), paths[0]);
+    assertEquals(new Path("/test/hadoop").makeQualified(s3FileSystem),
+        paths[0]);
 
     paths = s3FileSystem.listPaths(new Path("/test/hadoop"));
     assertEquals(3, paths.length);
-    assertEquals(new Path("/test/hadoop/a"), paths[0]);
-    assertEquals(new Path("/test/hadoop/b"), paths[1]);
-    assertEquals(new Path("/test/hadoop/c"), paths[2]);
+    assertEquals(new Path("/test/hadoop/a").makeQualified(s3FileSystem),
+        paths[0]);
+    assertEquals(new Path("/test/hadoop/b").makeQualified(s3FileSystem),
+        paths[1]);
+    assertEquals(new Path("/test/hadoop/c").makeQualified(s3FileSystem),
+        paths[2]);
 
     paths = s3FileSystem.listPaths(new Path("/test/hadoop/a"));
     assertEquals(0, paths.length);