Repository: hbase Updated Branches: refs/heads/0.98 3b8aab5b8 -> 052150ee6 refs/heads/branch-1 62da795dd -> d16c8ab71 refs/heads/branch-1.0 aee1c0aae -> cb66e00f0 refs/heads/branch-1.1 6e546a516 -> 9d679f6b8
HBASE-13122 Improve efficiency for return codes of some filters (Shuaifeng Zhou) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/63281f8e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/63281f8e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/63281f8e Branch: refs/heads/0.98 Commit: 63281f8e797c88e91169c58a7300dcc5ba4a500c Parents: 3b8aab5 Author: tedyu <yuzhih...@gmail.com> Authored: Mon Mar 2 07:47:33 2015 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Fri May 1 13:07:58 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/63281f8e/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java index bd2581a..3e6ebfe 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java @@ -133,7 +133,7 @@ public class ColumnRangeFilter extends FilterBase { } if (!this.minColumnInclusive && cmpMin == 0) { - return ReturnCode.SKIP; + return ReturnCode.NEXT_COL; } if (this.maxColumn == null) { http://git-wip-us.apache.org/repos/asf/hbase/blob/63281f8e/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java index c7b0b66..2f40302 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java @@ -65,7 +65,7 @@ public class FamilyFilter extends CompareFilter { if (familyLength > 0) { if (doCompare(this.compareOp, this.comparator, v.getFamilyArray(), v.getFamilyOffset(), familyLength)) { - return ReturnCode.SKIP; + return ReturnCode.NEXT_ROW; } } return ReturnCode.INCLUDE;
