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 su...@apache.org on 2012/10/12 21:03:11 UTC
svn commit: r1397691 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/main/java/org/apache/hadoop/fs/FileSystem.java
src/main/java/org/apache/hadoop/fs/GlobExpander.java
Author: suresh
Date: Fri Oct 12 19:03:10 2012
New Revision: 1397691
URL: http://svn.apache.org/viewvc?rev=1397691&view=rev
Log:
HADOOP-8910. Add examples to GlobExpander#expand method. Contributed by Suresh Srinivas.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobExpander.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1397691&r1=1397690&r2=1397691&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Oct 12 19:03:10 2012
@@ -122,6 +122,8 @@ Trunk (Unreleased)
HADOOP-8864. Addendum to HADOOP-8840: Add a coloring case for +0 results
too. (harsh)
+ HADOOP-8910. Add examples to GlobExpander#expand method. (suresh)
+
BUG FIXES
HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName.
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java?rev=1397691&r1=1397690&r2=1397691&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java Fri Oct 12 19:03:10 2012
@@ -1391,11 +1391,11 @@ public abstract class FileSystem extends
}
final private static PathFilter DEFAULT_FILTER = new PathFilter() {
- @Override
- public boolean accept(Path file) {
- return true;
- }
- };
+ @Override
+ public boolean accept(Path file) {
+ return true;
+ }
+ };
/**
* List the statuses of the files/directories in the given path if the path is
@@ -1559,17 +1559,16 @@ public abstract class FileSystem extends
}
/**
- * Return an array of FileStatus objects whose path names match pathPattern
- * and is accepted by the user-supplied path filter. Results are sorted by
- * their path names.
- * Return null if pathPattern has no glob and the path does not exist.
- * Return an empty array if pathPattern has a glob and no path matches it.
+ * Return an array of FileStatus objects whose path names match
+ * {@code pathPattern} and is accepted by the user-supplied path filter.
+ * Results are sorted by their path names.
*
- * @param pathPattern
- * a regular expression specifying the path pattern
- * @param filter
- * a user-supplied path filter
- * @return an array of FileStatus objects
+ * @param pathPattern a regular expression specifying the path pattern
+ * @param filter a user-supplied path filter
+ * @return null if {@code pathPattern} has no glob and the path does not exist
+ * an empty array if {@code pathPattern} has a glob and no path
+ * matches it else an array of {@link FileStatus} objects matching the
+ * pattern
* @throws IOException if any I/O error occurs when fetching file status
*/
public FileStatus[] globStatus(Path pathPattern, PathFilter filter)
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobExpander.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobExpander.java?rev=1397691&r1=1397690&r2=1397691&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobExpander.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobExpander.java Fri Oct 12 19:03:10 2012
@@ -39,12 +39,26 @@ class GlobExpander {
}
/**
- * Expand globs in the given <code>filePattern</code> into a collection of
- * file patterns so that in the expanded set no file pattern has a
- * slash character ("/") in a curly bracket pair.
+ * Expand globs in the given <code>filePattern</code> into a collection of
+ * file patterns so that in the expanded set no file pattern has a slash
+ * character ("/") in a curly bracket pair.
+ * <p>
+ * Some examples of how the filePattern is expanded:<br>
+ * <pre>
+ * <b>
+ * filePattern - Expanded file pattern </b>
+ * {a/b} - a/b
+ * /}{a/b} - /}a/b
+ * p{a/b,c/d}s - pa/bs, pc/ds
+ * {a/b,c/d,{e,f}} - a/b, c/d, {e,f}
+ * {a/b,c/d}{e,f} - a/b{e,f}, c/d{e,f}
+ * {a,b}/{b,{c/d,e/f}} - {a,b}/b, {a,b}/c/d, {a,b}/e/f
+ * {a,b}/{c/\d} - {a,b}/c/d
+ * </pre>
+ *
* @param filePattern
* @return expanded file patterns
- * @throws IOException
+ * @throws IOException
*/
public static List<String> expand(String filePattern) throws IOException {
List<String> fullyExpanded = new ArrayList<String>();
@@ -65,7 +79,7 @@ class GlobExpander {
/**
* Expand the leftmost outer curly bracket pair containing a
* slash character ("/") in <code>filePattern</code>.
- * @param filePattern
+ * @param filePatternWithOffset
* @return expanded file patterns
* @throws IOException
*/