Revert "HADOOP-12436. GlobPattern regex library has performance issues with wildcard characters (Matthew Paduano via aw)"
This reverts commit 0d77e85f0aa503fdb826886d867fe61c9e984073. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dc45a7a7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dc45a7a7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dc45a7a7 Branch: refs/heads/HDFS-7966 Commit: dc45a7a7c4920a60424d60aca07a72a9eb909fe2 Parents: 08f5de1 Author: Allen Wittenauer <a...@apache.org> Authored: Thu Oct 15 08:26:06 2015 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Thu Oct 15 08:26:06 2015 -0700 ---------------------------------------------------------------------- LICENSE.txt | 35 -------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 -- hadoop-common-project/hadoop-common/pom.xml | 6 ---- .../java/org/apache/hadoop/fs/GlobPattern.java | 7 ++-- .../metrics2/filter/AbstractPatternFilter.java | 4 +-- .../hadoop/metrics2/filter/GlobFilter.java | 2 +- .../hadoop/metrics2/filter/RegexFilter.java | 2 +- .../apache/hadoop/security/SaslRpcClient.java | 2 +- .../org/apache/hadoop/fs/TestGlobPattern.java | 9 ++--- hadoop-project/pom.xml | 3 -- 10 files changed, 10 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 46da0f8..f339a70 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -320,41 +320,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -For com.google.re2j.* classes: ---------------------------------------------------------------------- -This is a work derived from Russ Cox's RE2 in Go, whose license -http://golang.org/LICENSE is as follows: - -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - * Neither the name of Google Inc. nor the names of its contributors - may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - For hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/fuse-dfs/util/tree.h --------------------------------------------------------------------- Copyright 2002 Niels Provos <pro...@citi.umich.edu> http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 7efc885..d6ddfd9 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -243,9 +243,6 @@ Trunk (Unreleased) HADOOP-12249. pull argument parsing into a function (aw) - HADOOP-12436. GlobPattern regex library has performance issues with - wildcard characters (Matthew Paduano via aw) - BUG FIXES HADOOP-11473. test-patch says "-1 overall" even when all checks are +1 http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 4e47a3f..21af670 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -192,12 +192,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.re2j</groupId> - <artifactId>re2j</artifactId> - <version>${re2j.version}</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/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 16505a6..4be5b1c 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 @@ -18,8 +18,8 @@ package org.apache.hadoop.fs; -import com.google.re2j.Pattern; -import com.google.re2j.PatternSyntaxException; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -164,7 +164,6 @@ public class GlobPattern { } private static void error(String message, String pattern, int pos) { - String fullMessage = String.format("%s at pos %d", message, pos); - throw new PatternSyntaxException(fullMessage, pattern); + throw new PatternSyntaxException(message, pattern, pos); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java index bf35c41..07b50ab 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java @@ -19,6 +19,8 @@ package org.apache.hadoop.metrics2.filter; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import com.google.common.collect.Maps; import org.apache.commons.configuration.SubsetConfiguration; @@ -28,8 +30,6 @@ import org.apache.hadoop.metrics2.MetricsException; import org.apache.hadoop.metrics2.MetricsFilter; import org.apache.hadoop.metrics2.MetricsTag; -import com.google.re2j.Matcher; -import com.google.re2j.Pattern; /** * Base class for pattern based filters */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/GlobFilter.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/GlobFilter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/GlobFilter.java index 7311428..ad4a514 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/GlobFilter.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/GlobFilter.java @@ -18,12 +18,12 @@ package org.apache.hadoop.metrics2.filter; +import java.util.regex.Pattern; import org.apache.hadoop.fs.GlobPattern; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import com.google.re2j.Pattern; /** * A glob pattern filter for metrics. * http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/RegexFilter.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/RegexFilter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/RegexFilter.java index 31c1266..45cb996 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/RegexFilter.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/RegexFilter.java @@ -18,11 +18,11 @@ package org.apache.hadoop.metrics2.filter; +import java.util.regex.Pattern; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import com.google.re2j.Pattern; /** * A regex pattern filter for metrics */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java index 83adc4a..7d3afa8 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java @@ -33,6 +33,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -74,7 +75,6 @@ import org.apache.hadoop.util.ProtoUtil; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.ByteString; -import com.google.re2j.Pattern; /** * A utility class that encapsulates SASL logic for RPC client */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/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 356c442..0fffc47 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 @@ -18,10 +18,10 @@ package org.apache.hadoop.fs; +import java.util.regex.PatternSyntaxException; import org.junit.Test; import static org.junit.Assert.*; -import com.google.re2j.PatternSyntaxException; /** * Tests for glob patterns */ @@ -69,11 +69,6 @@ public class TestGlobPattern { } @Test public void testInvalidPatterns() { - shouldThrow("[", "[[]]", "{", "\\"); - } - - @Test(timeout=1000) public void testPathologicalPatterns() { - String badFilename = "job_1429571161900_4222-1430338332599-tda%2D%2D+******************************+++...%270%27%28Stage-1430338580443-39-2000-SUCCEEDED-production%2Dhigh-1430338340360.jhist"; - assertMatch(true, badFilename, badFilename); + shouldThrow("[", "[[]]", "[][]", "{", "\\"); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc45a7a7/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index d59c44a..9724b18 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -68,9 +68,6 @@ <jackson.version>1.9.13</jackson.version> <jackson2.version>2.2.3</jackson2.version> - <!-- com.google.re2j version --> - <re2j.version>1.0</re2j.version> - <!-- ProtocolBuffer version, used to verify the protoc version and --> <!-- define the protobuf JAR version --> <protobuf.version>2.5.0</protobuf.version>
