HBASE-18617 FuzzyRowKeyFilter should not modify the filter pairs (vinisha)
This commit is contained in:
parent
7fee03ed65
commit
e2532ecd1e
|
@ -76,23 +76,31 @@ public class FuzzyRowFilter extends FilterBase {
|
||||||
private RowTracker tracker;
|
private RowTracker tracker;
|
||||||
|
|
||||||
public FuzzyRowFilter(List<Pair<byte[], byte[]>> fuzzyKeysData) {
|
public FuzzyRowFilter(List<Pair<byte[], byte[]>> fuzzyKeysData) {
|
||||||
Pair<byte[], byte[]> p;
|
List<Pair<byte[], byte[]>> fuzzyKeyDataCopy = new ArrayList<>(fuzzyKeysData.size());
|
||||||
for (int i = 0; i < fuzzyKeysData.size(); i++) {
|
|
||||||
p = fuzzyKeysData.get(i);
|
for (Pair<byte[], byte[]> aFuzzyKeysData : fuzzyKeysData) {
|
||||||
if (p.getFirst().length != p.getSecond().length) {
|
if (aFuzzyKeysData.getFirst().length != aFuzzyKeysData.getSecond().length) {
|
||||||
Pair<String, String> readable =
|
Pair<String, String> readable =
|
||||||
new Pair<>(Bytes.toStringBinary(p.getFirst()), Bytes.toStringBinary(p
|
new Pair<>(Bytes.toStringBinary(aFuzzyKeysData.getFirst()), Bytes.toStringBinary(aFuzzyKeysData.getSecond()));
|
||||||
.getSecond()));
|
|
||||||
throw new IllegalArgumentException("Fuzzy pair lengths do not match: " + readable);
|
throw new IllegalArgumentException("Fuzzy pair lengths do not match: " + readable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Pair<byte[], byte[]> p = new Pair<>();
|
||||||
|
// create a copy of pair bytes so that they are not modified by the filter.
|
||||||
|
p.setFirst(Arrays.copyOf(aFuzzyKeysData.getFirst(), aFuzzyKeysData.getFirst().length));
|
||||||
|
p.setSecond(Arrays.copyOf(aFuzzyKeysData.getSecond(), aFuzzyKeysData.getSecond().length));
|
||||||
|
|
||||||
// update mask ( 0 -> -1 (0xff), 1 -> 2)
|
// update mask ( 0 -> -1 (0xff), 1 -> 2)
|
||||||
p.setSecond(preprocessMask(p.getSecond()));
|
p.setSecond(preprocessMask(p.getSecond()));
|
||||||
preprocessSearchKey(p);
|
preprocessSearchKey(p);
|
||||||
|
|
||||||
|
fuzzyKeyDataCopy.add(p);
|
||||||
}
|
}
|
||||||
this.fuzzyKeysData = fuzzyKeysData;
|
this.fuzzyKeysData = fuzzyKeyDataCopy;
|
||||||
this.tracker = new RowTracker();
|
this.tracker = new RowTracker();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void preprocessSearchKey(Pair<byte[], byte[]> p) {
|
private void preprocessSearchKey(Pair<byte[], byte[]> p) {
|
||||||
if (!UNSAFE_UNALIGNED) {
|
if (!UNSAFE_UNALIGNED) {
|
||||||
// do nothing
|
// do nothing
|
||||||
|
|
|
@ -17,13 +17,6 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.hadoop.hbase.filter;
|
package org.apache.hadoop.hbase.filter;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
@ -42,6 +35,7 @@ import org.apache.hadoop.hbase.filter.FilterList.Operator;
|
||||||
import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
|
import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
|
||||||
import org.apache.hadoop.hbase.regionserver.HRegion;
|
import org.apache.hadoop.hbase.regionserver.HRegion;
|
||||||
import org.apache.hadoop.hbase.regionserver.RegionScanner;
|
import org.apache.hadoop.hbase.regionserver.RegionScanner;
|
||||||
|
import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
|
||||||
import org.apache.hadoop.hbase.testclassification.FilterTests;
|
import org.apache.hadoop.hbase.testclassification.FilterTests;
|
||||||
import org.apache.hadoop.hbase.testclassification.MediumTests;
|
import org.apache.hadoop.hbase.testclassification.MediumTests;
|
||||||
import org.apache.hadoop.hbase.util.Bytes;
|
import org.apache.hadoop.hbase.util.Bytes;
|
||||||
|
@ -53,10 +47,16 @@ import org.junit.BeforeClass;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.experimental.categories.Category;
|
import org.junit.experimental.categories.Category;
|
||||||
|
|
||||||
import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
|
|
||||||
import org.junit.rules.TestName;
|
import org.junit.rules.TestName;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@Category({ FilterTests.class, MediumTests.class })
|
@Category({ FilterTests.class, MediumTests.class })
|
||||||
|
@ -140,6 +140,11 @@ public class TestFuzzyRowFilterEndToEnd {
|
||||||
List<Pair<byte[], byte[]>> data = new ArrayList<>();
|
List<Pair<byte[], byte[]>> data = new ArrayList<>();
|
||||||
byte[] fuzzyKey = Bytes.toBytesBinary("\\x9B\\x00\\x044e");
|
byte[] fuzzyKey = Bytes.toBytesBinary("\\x9B\\x00\\x044e");
|
||||||
byte[] mask = new byte[] { 0, 0, 0, 0, 0 };
|
byte[] mask = new byte[] { 0, 0, 0, 0, 0 };
|
||||||
|
|
||||||
|
// copy the fuzzy key and mask to test HBASE-18617
|
||||||
|
byte[] copyFuzzyKey = Arrays.copyOf(fuzzyKey, fuzzyKey.length);
|
||||||
|
byte[] copyMask = Arrays.copyOf(mask, mask.length);
|
||||||
|
|
||||||
data.add(new Pair<>(fuzzyKey, mask));
|
data.add(new Pair<>(fuzzyKey, mask));
|
||||||
FuzzyRowFilter filter = new FuzzyRowFilter(data);
|
FuzzyRowFilter filter = new FuzzyRowFilter(data);
|
||||||
|
|
||||||
|
@ -152,6 +157,10 @@ public class TestFuzzyRowFilterEndToEnd {
|
||||||
total++;
|
total++;
|
||||||
}
|
}
|
||||||
assertEquals(2, total);
|
assertEquals(2, total);
|
||||||
|
|
||||||
|
assertEquals(true, Arrays.equals(copyFuzzyKey, fuzzyKey));
|
||||||
|
assertEquals(true, Arrays.equals(copyMask, mask));
|
||||||
|
|
||||||
TEST_UTIL.deleteTable(TableName.valueOf(name.getMethodName()));
|
TEST_UTIL.deleteTable(TableName.valueOf(name.getMethodName()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue