Skip to content

HADOOP-18119. ViewFileSystem#getUri should return a URI with an empty path component #3979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

HADOOP-18119. ViewFileSystem#getUri should return a URI with an empty path component #3979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...ommon-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ public void initialize(final URI theUri, final Configuration conf)
tableName = theUri.getHost();
}
try {
myUri = new URI(getScheme(), authority, "/", null, null);
myUri = (authority != null) ?
new URI(getScheme(), authority, null, null, null) :
new URI(getScheme(), null, "/", null, null);
boolean initingUriAsFallbackOnNoMounts =
supportAutoAddingFallbackOnNoMounts();
fsState = new InodeTree<FileSystem>(conf, tableName, myUri,
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAuthorityLocalFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void setUp() throws Exception {
// Now create a viewfs using a mount table called "default"
// hence viewfs://default/
schemeWithAuthority =
new URI(FsConstants.VIEWFS_SCHEME, "default", "/", null, null);
new URI(FsConstants.VIEWFS_SCHEME, "default", null, null, null);
fsView = FileSystem.get(schemeWithAuthority, conf);
}

Expand Down
13 changes: 13 additions & 0 deletions ...oject/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,4 +1515,17 @@ public void testTargetFileSystemLazyInitializationForChecksumMethods()
// viewfs inner cache is disabled
assertEquals(cacheSize + 1, TestFileUtil.getCacheSize());
}

@Test
public void testGetURI() throws Exception {
// test that URIs without authority return the path component.
URI viewFsWithoutAuthority = URI.create("viewfs:///");
FileSystem fs = FileSystem.get(viewFsWithoutAuthority, conf);
assertEquals(viewFsWithoutAuthority, fs.getUri());

// test that URIs with authority do not return the path component.
URI viewFsWithAuthority = URI.create("viewfs://default");
fs = FileSystem.get(viewFsWithAuthority, conf);
assertEquals(viewFsWithAuthority, fs.getUri());
}
}