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

HBASE-17678 FilterList with MUST_PASS_ONE lead to redundancy cells returned - addendum 

Signed-off-by: tedyu <yuzhihong@gmail.com>
This commit is contained in:
huzheng 2017-06-07 14:49:29 +08:00 committed by zhangduo
parent 7237ecc3b3
commit 50c9a412fe
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java
View File

@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellComparatorImpl; import org.apache.hadoop.hbase.CellComparatorImpl;
import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.CellUtil;
import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
@ -145,7 +146,7 @@ final public class FilterList extends FilterBase {
public void initPrevListForMustPassOne(int size) { public void initPrevListForMustPassOne(int size) {
if (operator == Operator.MUST_PASS_ONE) { if (operator == Operator.MUST_PASS_ONE) {
if (this.prevCellList == null) { if (this.prevFilterRCList == null) {
prevFilterRCList = new ArrayList<>(Collections.nCopies(size, null)); prevFilterRCList = new ArrayList<>(Collections.nCopies(size, null));
} }
if (this.prevCellList == null) { if (this.prevCellList == null) {
@ -407,7 +408,14 @@ final public class FilterList extends FilterBase {
ReturnCode localRC = filter.filterKeyValue(c); ReturnCode localRC = filter.filterKeyValue(c);
// Update previous cell and return code we encountered. // Update previous cell and return code we encountered.
prevFilterRCList.set(i, localRC); prevFilterRCList.set(i, localRC);
prevCellList.set(i, c); if (c == null || localRC == ReturnCode.INCLUDE || localRC == ReturnCode.SKIP) {
// If previous return code is INCLUDE or SKIP, we should always pass the next cell to the
// corresponding sub-filter(need not test shouldPassCurrentCellToFilter() method), So we
// need not save current cell to prevCellList for saving heap memory.
prevCellList.set(i, null);
} else {
prevCellList.set(i, KeyValueUtil.toNewKeyCell(c));
}
if (localRC != ReturnCode.SEEK_NEXT_USING_HINT) { if (localRC != ReturnCode.SEEK_NEXT_USING_HINT) {
seenNonHintReturnCode = true; seenNonHintReturnCode = true;