From 4c0bae240bea9a475e8ee9a0b081bfce6d1cd1e5 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Thu, 22 Oct 2015 08:19:56 -0700 Subject: [PATCH] HADOOP-12436. GlobPattern regex library has performance issues with wildcard characters (Matthew Paduano via aw) --- LICENSE.txt | 35 +++++++++++++++++++ .../hadoop-common/CHANGES.txt | 3 ++ hadoop-common-project/hadoop-common/pom.xml | 6 ++++ .../java/org/apache/hadoop/fs/GlobFilter.java | 2 +- .../org/apache/hadoop/fs/GlobPattern.java | 7 ++-- .../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 ++ 11 files changed, 64 insertions(+), 11 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index f339a70964..46da0f8ba4 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -320,6 +320,41 @@ 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 diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index aebd4f3b90..ce2a2a7153 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -243,6 +243,9 @@ 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 diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 21af67038b..4e47a3f1cf 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -191,6 +191,12 @@ ant test + + com.google.re2j + re2j + ${re2j.version} + compile + com.google.protobuf protobuf-java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java index 24bff5f9cf..e649bd2196 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java @@ -18,7 +18,7 @@ package org.apache.hadoop.fs; -import java.util.regex.PatternSyntaxException; +import com.google.re2j.PatternSyntaxException; import java.io.IOException; import org.apache.hadoop.classification.InterfaceAudience; 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 4be5b1cfb4..16505a62ca 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 java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; +import com.google.re2j.Pattern; +import com.google.re2j.PatternSyntaxException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -164,6 +164,7 @@ public boolean hasWildcard() { } private static void error(String message, String pattern, int pos) { - throw new PatternSyntaxException(message, pattern, pos); + String fullMessage = String.format("%s at pos %d", message, pos); + throw new PatternSyntaxException(fullMessage, pattern); } } 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 07b50ab977..bf35c41174 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,8 +19,6 @@ 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; @@ -30,6 +28,8 @@ 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 */ 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 ad4a514304..7311428fd0 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. * 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 45cb996938..31c1266399 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 */ 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 7d3afa879f..83adc4aab8 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,7 +33,6 @@ 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; @@ -75,6 +74,7 @@ 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 */ 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 0fffc47b33..356c442946 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,6 +69,11 @@ private void shouldThrow(String... globs) { } @Test public void testInvalidPatterns() { - shouldThrow("[", "[[]]", "[][]", "{", "\\"); + 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); } } diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 9724b18225..d59c44a15e 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -68,6 +68,9 @@ 1.9.13 2.2.3 + + 1.0 + 2.5.0