hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhr...@apache.org
Subject svn commit: r611266 - in /lucene/hadoop/branches/branch-0.15: CHANGES.txt src/java/org/apache/hadoop/fs/FileSystem.java src/test/org/apache/hadoop/fs/TestGlobPaths.java
Date Fri, 11 Jan 2008 19:06:47 GMT
Author: dhruba
Date: Fri Jan 11 11:06:46 2008
New Revision: 611266

URL: http://svn.apache.org/viewvc?rev=611266&view=rev
Log:
HADOOP-2562. globPaths supports {ab,cd}.  (Hairong Kuang via dhruba)
svn merge -c 611264 from trunk.


Modified:
    lucene/hadoop/branches/branch-0.15/CHANGES.txt
    lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FileSystem.java
    lucene/hadoop/branches/branch-0.15/src/test/org/apache/hadoop/fs/TestGlobPaths.java

Modified: lucene/hadoop/branches/branch-0.15/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/CHANGES.txt?rev=611266&r1=611265&r2=611266&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.15/CHANGES.txt Fri Jan 11 11:06:46 2008
@@ -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

Modified: lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FileSystem.java?rev=611266&r1=611265&r2=611266&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FileSystem.java (original)
+++ lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FileSystem.java Fri Jan
11 11:06:46 2008
@@ -706,6 +706,7 @@
           fileRegex.append('(');
           pCh = '(';
           curlyOpen++;
+          hasPattern = true;
         } else if (pCh == ',' && curlyOpen > 0) {
           fileRegex.append(")|");
           pCh = '(';

Modified: lucene/hadoop/branches/branch-0.15/src/test/org/apache/hadoop/fs/TestGlobPaths.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/test/org/apache/hadoop/fs/TestGlobPaths.java?rev=611266&r1=611265&r2=611266&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/src/test/org/apache/hadoop/fs/TestGlobPaths.java (original)
+++ lucene/hadoop/branches/branch-0.15/src/test/org/apache/hadoop/fs/TestGlobPaths.java Fri
Jan 11 11:06:46 2008
@@ -243,12 +243,15 @@
       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;



Mime
View raw message