diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java index b9132a3ba29..9f52783dbb0 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java @@ -244,13 +244,6 @@ public final class ParseConstants { public static final byte [] regexStringType = new byte [] {'r','e','g','e', 'x', 's','t','r','i','n','g'}; - /** - * RegexStringNoCaseType byte array - */ - public static final byte [] regexStringNoCaseType = new byte [] {'r','e','g','e','x', - 's','t','r','i','n','g', - 'n','o','c','a','s','e'}; - /** * SubstringType byte array */ diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java index e06c6b5c413..1aeaa13f5a9 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java @@ -28,7 +28,6 @@ import java.util.Collections; import java.util.EmptyStackException; import java.util.HashMap; import java.util.Map; -import java.util.regex.Pattern; import java.util.Set; import java.util.Stack; @@ -813,9 +812,6 @@ public class ParseFilter { return new BinaryPrefixComparator(comparatorValue); else if (Bytes.equals(comparatorType, ParseConstants.regexStringType)) return new RegexStringComparator(new String(comparatorValue, StandardCharsets.UTF_8)); - else if (Bytes.equals(comparatorType, ParseConstants.regexStringNoCaseType)) - return new RegexStringComparator(new String(comparatorValue, StandardCharsets.UTF_8), - Pattern.CASE_INSENSITIVE | Pattern.DOTALL); else if (Bytes.equals(comparatorType, ParseConstants.substringType)) return new SubstringComparator(new String(comparatorValue, StandardCharsets.UTF_8)); else diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java index fbedc1c0e68..8dd15be6fc6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import java.util.regex.Pattern; import org.apache.hadoop.hbase.CompareOperator; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.testclassification.MediumTests; @@ -280,20 +279,6 @@ public class TestParseFilter { assertEquals("pre*", new String(regexStringComparator.getValue(), StandardCharsets.UTF_8)); } - @Test - public void testQualifierFilterNoCase() throws IOException { - String filterString = "QualifierFilter(=, 'regexstringnocase:pre*')"; - QualifierFilter qualifierFilter = - doTestFilter(filterString, QualifierFilter.class); - assertEquals(CompareOperator.EQUAL, qualifierFilter.getCompareOperator()); - assertTrue(qualifierFilter.getComparator() instanceof RegexStringComparator); - RegexStringComparator regexStringComparator = - (RegexStringComparator) qualifierFilter.getComparator(); - assertEquals("pre*", new String(regexStringComparator.getValue(), StandardCharsets.UTF_8)); - int regexComparatorFlags = regexStringComparator.getEngine().getFlags(); - assertEquals(Pattern.CASE_INSENSITIVE | Pattern.DOTALL, regexComparatorFlags); - } - @Test public void testValueFilter() throws IOException { String filterString = "ValueFilter(!=, 'substring:pre')";