Skip to content

Commit 485a650

Browse files
author
Xing Lin
committed
minor fix to comments.
1 parent a78bada commit 485a650

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,6 @@ public Path getTrashRoot(Path path) {
12221222
public Collection<FileStatus> getTrashRoots(boolean allUsers) {
12231223
// A map from targetFSPath -> FileStatus.
12241224
// FileStatus can be from targetFS or viewFS.
1225-
12261225
HashMap<Path, FileStatus> trashRoots = new HashMap<>();
12271226
for (FileSystem fs : getChildFileSystems()) {
12281227
for (FileStatus trash : fs.getTrashRoots(allUsers)) {

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,12 +1129,11 @@ public void testTrashRootForceInsideMountPoint() throws IOException {
11291129
new Path("/data/" + TRASH_PREFIX + "/" + ugi.getShortUserName()));
11301130
Assert.assertEquals(dataTrashRoot, fsView2.getTrashRoot(dataTestPath));
11311131

1132-
// Case 2: path p not found in mount table, fall back to the default FS
1133-
// Return a trash root in mount point "/"
1132+
// Case 2: path p not found in mount table.
1133+
// Return a trash root in fallback FS.
11341134
Path nonExistentPath = new Path("/nonExistentDir/nonExistentFile");
11351135
Path expectedTrash =
11361136
fsView2.makeQualified(getTrashRootInFallBackFS());
1137-
11381137
Assert.assertEquals(expectedTrash, fsView2.getTrashRoot(nonExistentPath));
11391138

11401139
// Case 3: turn off the CONFIG_VIEWFS_TRASH_FORCE_INSIDE_MOUNT_POINT flag.

0 commit comments

Comments
 (0)