Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Aaron Myers 2012-10-02 01:26:27 +00:00
parent d1f4ec4ac8
commit c808caea75
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -307,9 +307,6 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8791. Fix rm command documentation to indicte it deletes HADOOP-8791. Fix rm command documentation to indicte it deletes
files and not directories. (Jing Zhao via suresh) 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 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
View File

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

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
View File

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

9
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestChRootedFileSystem.java
View File

@ -342,15 +342,6 @@ public class TestChRootedFileSystem {
chrootFs.close(); chrootFs.close();
verify(mockFs).delete(eq(rawPath), eq(true)); 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 { static class MockFileSystem extends FilterFileSystem {
MockFileSystem() { MockFileSystem() {