From 7016dd44e0975274856dc19f19815123c4b2a352 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Sat, 13 Jan 2018 07:19:30 -0800 Subject: [PATCH] HDFS-13016. globStatus javadoc refers to glob pattern as "regular expression". Contributed by Mukul Kumar Singh. --- .../src/main/java/org/apache/hadoop/fs/FileContext.java | 4 ++-- .../src/main/java/org/apache/hadoop/fs/FileSystem.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java index 2a28f2b181..6ea69d01b1 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java @@ -2012,7 +2012,7 @@ public LocatedFileStatus next() throws IOException { * * * - * @param pathPattern a regular expression specifying a pth pattern + * @param pathPattern a glob specifying a path pattern * * @return an array of paths that match the path pattern * @@ -2040,7 +2040,7 @@ public FileStatus[] globStatus(Path pathPattern) * 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. * - * @param pathPattern regular expression specifying the path pattern + * @param pathPattern glob specifying the path pattern * @param filter user-supplied path filter * * @return an array of FileStatus objects diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java index 6b7deadda3..44fb7487f0 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java @@ -2058,7 +2058,7 @@ public FileStatus[] listStatus(Path[] files, PathFilter filter) * * * - * @param pathPattern a regular expression specifying a pth pattern + * @param pathPattern a glob specifying a path pattern * @return an array of paths that match the path pattern * @throws IOException IO failure @@ -2072,7 +2072,7 @@ public FileStatus[] globStatus(Path pathPattern) throws IOException { * {@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 pathPattern a glob 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