You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dh...@apache.org on 2008/01/11 20:04:45 UTC
svn commit: r611264 - in /lucene/hadoop/trunk: CHANGES.txt
src/java/org/apache/hadoop/fs/FileSystem.java
src/test/org/apache/hadoop/fs/TestGlobPaths.java
Author: dhruba
Date: Fri Jan 11 11:04:39 2008
New Revision: 611264
URL: http://svn.apache.org/viewvc?rev=611264&view=rev
Log:
HADOOP-2562. globPaths supports {ab,cd}. (Hairong Kuang via dhruba)
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FileSystem.java
lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestGlobPaths.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=611264&r1=611263&r2=611264&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Fri Jan 11 11:04:39 2008
@@ -408,6 +408,12 @@
HADOOP-2571. Suppress a suprious warning in test code. (cdouglas)
+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/trunk/src/java/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FileSystem.java?rev=611264&r1=611263&r2=611264&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FileSystem.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FileSystem.java Fri Jan 11 11:04:39 2008
@@ -803,6 +803,7 @@
fileRegex.append('(');
pCh = '(';
curlyOpen++;
+ hasPattern = true;
} else if (pCh == ',' && curlyOpen > 0) {
fileRegex.append(")|");
pCh = '(';
Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestGlobPaths.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestGlobPaths.java?rev=611264&r1=611263&r2=611264&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestGlobPaths.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestGlobPaths.java Fri Jan 11 11:04:39 2008
@@ -271,12 +271,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;