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 21:51:25 UTC

[4/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 3bd824facadd40dabb06e19ccad911be0ea6915a.

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/e8fa9cc8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e8fa9cc8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e8fa9cc8

Branch: refs/heads/master
Commit: e8fa9cc85f708d8866fdff7b7a502fdeefc8f0d4
Parents: 9cabf34
Author: Sean Busbey <bu...@apache.org>
Authored: Fri Oct 6 11:19:00 2017 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Mon Oct 9 16:49:20 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/e8fa9cc8/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);