HADOOP-2562. globPaths supports {ab,cd}. (Hairong Kuang via dhruba)

svn merge -c 611264 from trunk.



git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.15@611266 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1,6 +1,12 @@
 Hadoop Change Log
 
 
+Release 0.15.3 - (unreleased changes)
+
+  BUG FIXES
+
+    HADOOP-2562. globPaths supports {ab,cd}.  (Hairong Kuang via dhruba)
+
 Release 0.15.2 - 2008-01-02
 
   BUG FIXES

src/java/org/apache/hadoop/fs/FileSystem.java

@@ -706,6 +706,7 @@ public abstract class FileSystem extends Configured {
           fileRegex.append('(');
           pCh = '(';
           curlyOpen++;
+          hasPattern = true;
         } else if (pCh == ',' && curlyOpen > 0) {
           fileRegex.append(")|");
           pCh = '(';

src/test/org/apache/hadoop/fs/TestGlobPaths.java

@@ -243,12 +243,15 @@ public class TestGlobPaths extends TestCase {
       files = new String[] {USER_DIR+"/}bc"};
       matchedPath = prepareTesting(USER_DIR+"/}{a,b}c", files);
       assertEquals(matchedPath.length, 1);
+      assertEquals(matchedPath[0], path[0]);
       // test {b}
       matchedPath = prepareTesting(USER_DIR+"/}{b}c", files);
       assertEquals(matchedPath.length, 1);
+      assertEquals(matchedPath[0], path[0]);
       // test {}
-      matchedPath = prepareTesting(USER_DIR+"}{}bc", files);
+      matchedPath = prepareTesting(USER_DIR+"/}{}bc", files);
       assertEquals(matchedPath.length, 1);
+      assertEquals(matchedPath[0], path[0]);
 
       // test ill-formed curly
       boolean hasException = false;