Repository: hbase Updated Branches: refs/heads/branch-1 10d5236e6 -> ad6e1877d
HBASE-13122 Revert pending answer to Ram's question Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ad6e1877 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ad6e1877 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ad6e1877 Branch: refs/heads/branch-1 Commit: ad6e1877d5a328fd85f9fb98a59af4486860a109 Parents: 10d5236 Author: tedyu <yuzhih...@gmail.com> Authored: Mon Mar 2 20:59:50 2015 -0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Mon Mar 2 20:59:50 2015 -0800 ---------------------------------------------------------------------- .../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/ad6e1877/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 9e6c90f..fb627fd 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.NEXT_COL; + return ReturnCode.SKIP; } if (this.maxColumn == null) { http://git-wip-us.apache.org/repos/asf/hbase/blob/ad6e1877/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 2f40302..c7b0b66 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.NEXT_ROW; + return ReturnCode.SKIP; } } return ReturnCode.INCLUDE;
