From 6719fc94e123dbf562e2b46d76837246ddec6438 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Tue, 30 Jun 2015 11:53:03 +0100 Subject: [PATCH] Revert "HADOOP-12009 Clarify FileSystem.listStatus() sorting order & fix FileSystemContractBaseTest:testListStatus. (J.Andreina via stevel)" This reverts commit f02c06965c7caecb64c56c65b03648e998643c67. --- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ---- .../java/org/apache/hadoop/fs/FileSystem.java | 17 +---------------- .../src/site/markdown/filesystem/filesystem.md | 4 ---- .../hadoop/fs/FileSystemContractBaseTest.java | 11 +++-------- 4 files changed, 4 insertions(+), 32 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 11757e69268..31d915d25b9 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -163,10 +163,6 @@ Release 2.8.0 - UNRELEASED HADOOP-11958. MetricsSystemImpl fails to show backtrace when an error occurs (Jason Lowe via jeagles) - - HADOOP-12009 Clarify FileSystem.listStatus() sorting order & fix - FileSystemContractBaseTest:testListStatus. (J.Andreina via stevel) - OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java index c4e7953c6fe..800d13268a5 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java @@ -1498,9 +1498,7 @@ public abstract class FileSystem extends Configured implements Closeable { /** * List the statuses of the files/directories in the given path if the path is * a directory. - *

- * Does not guarantee to return the List of files/directories status in a - * sorted order. + * * @param f given path * @return the statuses of the files/directories in the given patch * @throws FileNotFoundException when the path does not exist; @@ -1542,9 +1540,6 @@ public abstract class FileSystem extends Configured implements Closeable { /** * Filter files/directories in the given path using the user-supplied path * filter. - *

- * Does not guarantee to return the List of files/directories status in a - * sorted order. * * @param f * a path name @@ -1565,9 +1560,6 @@ public abstract class FileSystem extends Configured implements Closeable { /** * Filter files/directories in the given list of paths using default * path filter. - *

- * Does not guarantee to return the List of files/directories status in a - * sorted order. * * @param files * a list of paths @@ -1584,9 +1576,6 @@ public abstract class FileSystem extends Configured implements Closeable { /** * Filter files/directories in the given list of paths using user-supplied * path filter. - *

- * Does not guarantee to return the List of files/directories status in a - * sorted order. * * @param files * a list of paths @@ -1748,8 +1737,6 @@ public abstract class FileSystem extends Configured implements Closeable { * while consuming the entries. Each file system implementation should * override this method and provide a more efficient implementation, if * possible. - * Does not guarantee to return the iterator that traverses statuses - * of the files in a sorted order. * * @param p target path * @return remote iterator @@ -1777,8 +1764,6 @@ public abstract class FileSystem extends Configured implements Closeable { /** * List the statuses and block locations of the files in the given path. - * Does not guarantee to return the iterator that traverses statuses - * of the files in a sorted order. * * If the path is a directory, * if recursive is false, returns files in the directory; diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/filesystem/filesystem.md b/hadoop-common-project/hadoop-common/src/site/markdown/filesystem/filesystem.md index f323374c941..84e375508c2 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/filesystem/filesystem.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/filesystem/filesystem.md @@ -183,10 +183,6 @@ to the same path: forall fs in listStatus(Path) : fs == getFileStatus(fs.path) -**Ordering of results**: there is no guarantee of ordering of the listed entries. -While HDFS currently returns an alphanumerically sorted list, neither the Posix `readdir()` -nor Java's `File.listFiles()` API calls define any ordering of returned values. Applications -which require a uniform sort order on the results must perform the sorting themselves. ### Atomicity and Consistency diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java index f3d33df95bf..84e4e43c032 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java @@ -20,7 +20,6 @@ package org.apache.hadoop.fs; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.ArrayList; import junit.framework.TestCase; @@ -204,13 +203,9 @@ public abstract class FileSystemContractBaseTest extends TestCase { paths = fs.listStatus(path("/test/hadoop")); assertEquals(3, paths.length); - ArrayList list = new ArrayList(); - for (FileStatus fileState : paths) { - list.add(fileState.getPath().toString()); - } - assertTrue(list.contains(path("/test/hadoop/a"))); - assertTrue(list.contains(path("/test/hadoop/b"))); - assertTrue(list.contains(path("/test/hadoop/c"))); + assertEquals(path("/test/hadoop/a"), paths[0].getPath()); + assertEquals(path("/test/hadoop/b"), paths[1].getPath()); + assertEquals(path("/test/hadoop/c"), paths[2].getPath()); paths = fs.listStatus(path("/test/hadoop/a")); assertEquals(0, paths.length);