Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-18904 Missing break in NEXT_ROW case of FilterList#mergeReturnCodeForOrOperator()" 

This reverts commit 3bd824faca.

Backing out filterlist regression, see HBASE-18957. Work continuing branch for HBASE-18410.

Signed-off-by: Peter Somogyi <psomogyi@cloudera.com>
Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Sean Busbey 2017-10-06 11:19:00 -05:00
parent 9cabf34e7b
commit e8fa9cc85f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java
View File

@ -566,7 +566,6 @@ final public class FilterList extends FilterBase {
if (isInReturnCodes(rc, ReturnCode.NEXT_ROW)) { if (isInReturnCodes(rc, ReturnCode.NEXT_ROW)) {
return ReturnCode.NEXT_ROW; return ReturnCode.NEXT_ROW;
} }
break;
case SEEK_NEXT_USING_HINT: case SEEK_NEXT_USING_HINT:
if (isInReturnCodes(rc, ReturnCode.INCLUDE, ReturnCode.INCLUDE_AND_NEXT_COL, if (isInReturnCodes(rc, ReturnCode.INCLUDE, ReturnCode.INCLUDE_AND_NEXT_COL,
ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW)) { ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW)) {
@ -578,7 +577,6 @@ final public class FilterList extends FilterBase {
if (isInReturnCodes(rc, ReturnCode.SEEK_NEXT_USING_HINT)) { if (isInReturnCodes(rc, ReturnCode.SEEK_NEXT_USING_HINT)) {
return ReturnCode.SEEK_NEXT_USING_HINT; return ReturnCode.SEEK_NEXT_USING_HINT;
} }
break;
} }
throw new IllegalStateException( throw new IllegalStateException(
"Received code is not valid. rc: " + rc + ", localRC: " + localRC); "Received code is not valid. rc: " + rc + ", localRC: " + localRC);