You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by cm...@apache.org on 2013/08/16 01:10:06 UTC
svn commit: r1514536 -
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestGlobPaths.java
Author: cmccabe
Date: Thu Aug 15 23:10:06 2013
New Revision: 1514536
URL: http://svn.apache.org/r1514536
Log:
HADOOP-9865. FileContext#globStatus has a regression with respect to relative path. (Contributed by Chaun Lin)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestGlobPaths.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestGlobPaths.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestGlobPaths.java?rev=1514536&r1=1514535&r2=1514536&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestGlobPaths.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestGlobPaths.java Thu Aug 15 23:10:06 2013
@@ -622,21 +622,7 @@ public class TestGlobPaths {
cleanupDFS();
}
}
-
- @Test
- public void pTestRelativePath() throws IOException {
- try {
- String [] files = new String[] {"a", "abc", "abc.p", "bacd"};
- Path[] matchedPath = prepareTesting("a*", files);
- assertEquals(matchedPath.length, 3);
- assertEquals(matchedPath[0], new Path(USER_DIR, path[0]));
- assertEquals(matchedPath[1], new Path(USER_DIR, path[1]));
- assertEquals(matchedPath[2], new Path(USER_DIR, path[2]));
- } finally {
- cleanupDFS();
- }
- }
-
+
/* Test {xx,yy} */
@Test
public void pTestCurlyBracket() throws IOException {
@@ -1061,4 +1047,43 @@ public class TestGlobPaths {
public void testGlobFillsInSchemeOnFC() throws Exception {
testOnFileContext(new TestGlobFillsInScheme());
}
+
+ /**
+ * Test that globStatus works with relative paths.
+ **/
+ private static class TestRelativePath implements FSTestWrapperGlobTest {
+ public void run(FSTestWrapper wrap, FileSystem fs, FileContext fc)
+ throws Exception {
+ String[] files = new String[] { "a", "abc", "abc.p", "bacd" };
+
+ Path[] path = new Path[files.length];
+ for(int i=0; i < files.length; i++) {
+ path[i] = wrap.makeQualified(new Path(files[i]));
+ wrap.mkdir(path[i], FsPermission.getDirDefault(), true);
+ }
+
+ Path patternPath = new Path("a*");
+ Path[] globResults = FileUtil.stat2Paths(wrap.globStatus(patternPath,
+ new AcceptAllPathFilter()),
+ patternPath);
+
+ for(int i=0; i < globResults.length; i++) {
+ globResults[i] = wrap.makeQualified(globResults[i]);
+ }
+
+ assertEquals(globResults.length, 3);
+ assertEquals(USER_DIR + "/a;" + USER_DIR + "/abc;" + USER_DIR + "/abc.p",
+ TestPath.mergeStatuses(globResults));
+ }
+ }
+
+ @Test
+ public void testRelativePathOnFS() throws Exception {
+ testOnFileSystem(new TestRelativePath());
+ }
+
+ @Test
+ public void testRelativePathOnFC() throws Exception {
+ testOnFileContext(new TestRelativePath());
+ }
}