You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/10/09 22:04:18 UTC
[2/6] hbase git commit: Revert "HBASE-18904 Missing break in NEXT_ROW
case of FilterList#mergeReturnCodeForOrOperator()"
Revert "HBASE-18904 Missing break in NEXT_ROW case of FilterList#mergeReturnCodeForOrOperator()"
This reverts commit d142f071295f67177074cd130eb0ee2d30bdfbcd.
Backing out filterlist regression, see HBASE-18957. Work continuing branch for HBASE-18410.
Signed-off-by: Peter Somogyi <ps...@cloudera.com>
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3dd66e6c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3dd66e6c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3dd66e6c
Branch: refs/heads/branch-2
Commit: 3dd66e6cda4898ce381bc19d5830c0029992292f
Parents: 08aea43
Author: Sean Busbey <bu...@apache.org>
Authored: Fri Oct 6 13:18:39 2017 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Mon Oct 9 16:53:50 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/filter/FilterList.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dd66e6c/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 033ca83..7f2405d 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
@@ -566,7 +566,6 @@ final public class FilterList extends FilterBase {
if (isInReturnCodes(rc, ReturnCode.NEXT_ROW)) {
return ReturnCode.NEXT_ROW;
}
- break;
case SEEK_NEXT_USING_HINT:
if (isInReturnCodes(rc, ReturnCode.INCLUDE, ReturnCode.INCLUDE_AND_NEXT_COL,
ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW)) {
@@ -578,7 +577,6 @@ final public class FilterList extends FilterBase {
if (isInReturnCodes(rc, ReturnCode.SEEK_NEXT_USING_HINT)) {
return ReturnCode.SEEK_NEXT_USING_HINT;
}
- break;
}
throw new IllegalStateException(
"Received code is not valid. rc: " + rc + ", localRC: " + localRC);