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

HBASE-21734 Some optimization in FilterListWithOR

This commit is contained in:
huzheng 2019-01-17 21:57:30 +08:00
parent f2820ea16f
commit b0131e19f4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterListBase.java
View File

@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.filter;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.Cell;
@ -49,7 +48,12 @@ public abstract class FilterListBase extends FilterBase {
} }
protected static boolean isInReturnCodes(ReturnCode testRC, ReturnCode... returnCodes) { protected static boolean isInReturnCodes(ReturnCode testRC, ReturnCode... returnCodes) {
return Arrays.stream(returnCodes).anyMatch(testRC::equals); for (ReturnCode rc : returnCodes) {
if (testRC == rc) {
return true;
}
}
return false;
} }
protected static boolean checkAndGetReversed(List<Filter> rowFilters, boolean defaultValue) { protected static boolean checkAndGetReversed(List<Filter> rowFilters, boolean defaultValue) {
@ -57,10 +61,11 @@ public abstract class FilterListBase extends FilterBase {
return defaultValue; return defaultValue;
} }
boolean retValue = rowFilters.get(0).isReversed(); boolean retValue = rowFilters.get(0).isReversed();
boolean allEqual = rowFilters.stream().allMatch(f -> f.isReversed() == retValue); for (int i = 1, n = rowFilters.size(); i < n; i++) {
if (!allEqual) { if (rowFilters.get(i).isReversed() != retValue) {
throw new IllegalArgumentException("Filters in the list must have the same reversed flag"); throw new IllegalArgumentException("Filters in the list must have the same reversed flag");
} }
}
return retValue; return retValue;
} }

3
hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterListWithOR.java
View File

@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.filter;
import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceAudience;
import java.io.IOException; import java.io.IOException;
@ -254,7 +253,7 @@ public class FilterListWithOR extends FilterListBase {
// need not save current cell to prevCellList for saving heap memory. // need not save current cell to prevCellList for saving heap memory.
prevCellList.set(index, null); prevCellList.set(index, null);
} else { } else {
prevCellList.set(index, KeyValueUtil.toNewKeyCell(currentCell)); prevCellList.set(index, currentCell);
} }
} }