Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[PATCH] Add "regexstringnocase" to ParseFilter for case-insensitivity (#2784)" 

Will re-commit with the proper jira ID

This reverts commit 51cee0016f.
This commit is contained in:
Wellington Chevreuil 2020-12-21 08:41:52 +00:00
parent 51cee0016f
commit d13010fa26
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java
View File

@ -244,13 +244,6 @@ public final class ParseConstants {
public static final byte [] regexStringType = new byte [] {'r','e','g','e', 'x', public static final byte [] regexStringType = new byte [] {'r','e','g','e', 'x',
's','t','r','i','n','g'}; '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 * SubstringType byte array
*/ */

4
hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java
View File

@ -28,7 +28,6 @@ import java.util.Collections;
import java.util.EmptyStackException; import java.util.EmptyStackException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.regex.Pattern;
import java.util.Set; import java.util.Set;
import java.util.Stack; import java.util.Stack;
@ -813,9 +812,6 @@ public class ParseFilter {
return new BinaryPrefixComparator(comparatorValue); return new BinaryPrefixComparator(comparatorValue);
else if (Bytes.equals(comparatorType, ParseConstants.regexStringType)) else if (Bytes.equals(comparatorType, ParseConstants.regexStringType))
return new RegexStringComparator(new String(comparatorValue, StandardCharsets.UTF_8)); 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)) else if (Bytes.equals(comparatorType, ParseConstants.substringType))
return new SubstringComparator(new String(comparatorValue, StandardCharsets.UTF_8)); return new SubstringComparator(new String(comparatorValue, StandardCharsets.UTF_8));
else else

15
hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java
View File

@ -24,7 +24,6 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
import org.apache.hadoop.hbase.CompareOperator; import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MediumTests;
@ -280,20 +279,6 @@ public class TestParseFilter {
assertEquals("pre*", new String(regexStringComparator.getValue(), StandardCharsets.UTF_8)); 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 @Test
public void testValueFilter() throws IOException { public void testValueFilter() throws IOException {
String filterString = "ValueFilter(!=, 'substring:pre')"; String filterString = "ValueFilter(!=, 'substring:pre')";