Bläddra i källkod

Revert an errant commit of HADOOP-8616.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1392705 13f79535-47bb-0310-9956-ffa450edef68
Aaron Myers 12 år sedan
förälder
incheckning
c808caea75

+ 0 - 3
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -307,9 +307,6 @@ Release 2.0.3-alpha - Unreleased
     HADOOP-8791. Fix rm command documentation to indicte it deletes
     files and not directories. (Jing Zhao via suresh)
 
-    HADOOP-8616. ViewFS configuration requires a trailing slash. (Sandy Ryza
-    via atm)
-
 Release 2.0.2-alpha - 2012-09-07 
 
   INCOMPATIBLE CHANGES

+ 1 - 5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java

@@ -89,11 +89,7 @@ class ChRootedFileSystem extends FilterFileSystem {
   public ChRootedFileSystem(final URI uri, Configuration conf)
       throws IOException {
     super(FileSystem.get(uri, conf));
-    String pathString = uri.getPath();
-    if (pathString.isEmpty()) {
-      pathString = "/";
-    }
-    chRootPathPart = new Path(pathString);
+    chRootPathPart = new Path(uri.getPath());
     chRootPathPartString = chRootPathPart.toUri().getPath();
     myUri = uri;
     workingDir = getHomeDirectory();

+ 1 - 5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java

@@ -205,13 +205,9 @@ public class ViewFs extends AbstractFileSystem {
       protected
       AbstractFileSystem getTargetFileSystem(final URI uri)
         throws URISyntaxException, UnsupportedFileSystemException {
-          String pathString = uri.getPath();
-          if (pathString.isEmpty()) {
-            pathString = "/";
-          }
           return new ChRootedFs(
               AbstractFileSystem.createFileSystem(uri, config),
-              new Path(pathString));
+              new Path(uri.getPath()));
       }
 
       @Override

+ 0 - 9
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestChRootedFileSystem.java

@@ -342,15 +342,6 @@ public class TestChRootedFileSystem {
     chrootFs.close();
     verify(mockFs).delete(eq(rawPath), eq(true));
   }
-  
-  @Test
-  public void testURIEmptyPath() throws IOException {
-    Configuration conf = new Configuration();
-    conf.setClass("fs.mockfs.impl", MockFileSystem.class, FileSystem.class);
-
-    URI chrootUri = URI.create("mockfs://foo");
-    new ChRootedFileSystem(chrootUri, conf);
-  }
 
   static class MockFileSystem extends FilterFileSystem {
     MockFileSystem() {