Repository: hadoop Updated Branches: refs/heads/branch-2 eae5bde00 -> 3017069a7
HADOOP-13976. Path globbing does not match newlines. Contributed by Eric Badger. (cherry picked from commit 706d630eb9db9658083d57d1d99b6a0f11cc5657) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3017069a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3017069a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3017069a Branch: refs/heads/branch-2 Commit: 3017069a761dfa624670849b83ce752f5270adc3 Parents: eae5bde Author: Kihwal Lee <[email protected]> Authored: Tue Jan 17 15:12:50 2017 -0600 Committer: Kihwal Lee <[email protected]> Committed: Tue Jan 17 15:12:50 2017 -0600 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/GlobPattern.java | 2 +- .../src/test/java/org/apache/hadoop/fs/TestGlobPattern.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3017069a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobPattern.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobPattern.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobPattern.java index 4be5b1c..c214609 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobPattern.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobPattern.java @@ -153,7 +153,7 @@ public class GlobPattern { if (curlyOpen > 0) { error("Unclosed group", glob, len); } - compiled = Pattern.compile(regex.toString()); + compiled = Pattern.compile(regex.toString(), Pattern.DOTALL); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/3017069a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobPattern.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobPattern.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobPattern.java index 0fffc47..128ac23 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobPattern.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobPattern.java @@ -50,11 +50,11 @@ public class TestGlobPattern { } @Test public void testValidPatterns() { - assertMatch(true, "*", "^$", "foo", "bar"); + assertMatch(true, "*", "^$", "foo", "bar", "\n"); assertMatch(true, "?", "?", "^", "[", "]", "$"); - assertMatch(true, "foo*", "foo", "food", "fool"); - assertMatch(true, "f*d", "fud", "food"); - assertMatch(true, "*d", "good", "bad"); + assertMatch(true, "foo*", "foo", "food", "fool", "foo\n", "foo\nbar"); + assertMatch(true, "f*d", "fud", "food", "foo\nd"); + assertMatch(true, "*d", "good", "bad", "\nd"); assertMatch(true, "\\*\\?\\[\\{\\\\", "*?[{\\"); assertMatch(true, "[]^-]", "]", "-", "^"); assertMatch(true, "]", "]"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
