You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2017/10/13 20:21:30 UTC
hbase git commit: HBASE-15410 Utilize the max seek value when all
Filters in MUST_PASS_ALL FilterList return SEEK_NEXT_USING_HINT
Repository: hbase
Updated Branches:
refs/heads/master f6a8a76b5 -> ffdc0e685
HBASE-15410 Utilize the max seek value when all Filters in MUST_PASS_ALL FilterList return SEEK_NEXT_USING_HINT
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ffdc0e68
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ffdc0e68
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ffdc0e68
Branch: refs/heads/master
Commit: ffdc0e6851e7172bfd3a31a0d78a92fa712ece0e
Parents: f6a8a76
Author: tedyu <yu...@gmail.com>
Authored: Fri Oct 13 13:21:20 2017 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Fri Oct 13 13:21:20 2017 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/filter/FilterList.java | 30 ++++++++++++++++----
.../hadoop/hbase/filter/TestFilterList.java | 6 ++--
2 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ffdc0e68/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java
index 9c4da41..e6791ab 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.filter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -64,7 +65,7 @@ final public class FilterList extends FilterBase {
private static final int MAX_LOG_FILTERS = 5;
private Operator operator = Operator.MUST_PASS_ALL;
private final List<Filter> filters;
- private Filter seekHintFilter = null;
+ private Collection<Filter> seekHintFilters = new ArrayList<Filter>();
/** Reference Cell used by {@link #transformCell(Cell)} for validation purpose. */
private Cell referenceCell = null;
@@ -201,7 +202,7 @@ final public class FilterList extends FilterBase {
for (int i = 0; i < listize; i++) {
filters.get(i).reset();
}
- seekHintFilter = null;
+ seekHintFilters.clear();
}
@Override
@@ -290,6 +291,7 @@ final public class FilterList extends FilterBase {
return ReturnCode.INCLUDE;
}
this.referenceCell = c;
+ seekHintFilters.clear();
// Accumulates successive transformation of every filter that includes the Cell:
Cell transformed = c;
@@ -321,10 +323,12 @@ final public class FilterList extends FilterBase {
transformed = filter.transformCell(transformed);
continue;
case SEEK_NEXT_USING_HINT:
- seekHintFilter = filter;
- return code;
+ seekHintFilters.add(filter);
+ continue;
default:
- return code;
+ if (seekHintFilters.isEmpty()) {
+ return code;
+ }
}
} else if (operator == Operator.MUST_PASS_ONE) {
if (filter.filterAllRemaining()) {
@@ -362,6 +366,10 @@ final public class FilterList extends FilterBase {
}
}
+ if (!seekHintFilters.isEmpty()) {
+ return ReturnCode.SEEK_NEXT_USING_HINT;
+ }
+
// Save the transformed Cell for transform():
this.transformedCell = transformed;
@@ -485,7 +493,17 @@ final public class FilterList extends FilterBase {
}
Cell keyHint = null;
if (operator == Operator.MUST_PASS_ALL) {
- keyHint = seekHintFilter.getNextCellHint(currentCell);
+ for (Filter filter : seekHintFilters) {
+ if (filter.filterAllRemaining()) continue;
+ Cell curKeyHint = filter.getNextCellHint(currentCell);
+ if (keyHint == null) {
+ keyHint = curKeyHint;
+ continue;
+ }
+ if (CellComparator.COMPARATOR.compare(keyHint, curKeyHint) < 0) {
+ keyHint = curKeyHint;
+ }
+ }
return keyHint;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/ffdc0e68/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
index 885c01e..6b5ffe1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
@@ -501,7 +501,7 @@ public class TestFilterList {
FilterList filterList = new FilterList(Operator.MUST_PASS_ONE,
Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));
assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),
- minKeyValue));
+ minKeyValue));
// Should have no hint if any filter has no hint
filterList = new FilterList(Operator.MUST_PASS_ONE,
@@ -525,7 +525,7 @@ public class TestFilterList {
Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));
filterList.filterKeyValue(null);
assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),
- minKeyValue));
+ maxKeyValue));
filterList = new FilterList(Operator.MUST_PASS_ALL,
Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));
@@ -539,7 +539,7 @@ public class TestFilterList {
new Filter [] { filterNoHint, filterMinHint, filterMaxHint } ));
filterList.filterKeyValue(null);
assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),
- minKeyValue));
+ maxKeyValue));
filterList = new FilterList(Operator.MUST_PASS_ALL,
Arrays.asList(new Filter [] { filterNoHint, filterMaxHint } ));
filterList.filterKeyValue(null);