HBASE-23238: Remove 'static'ness of cell counter in LimitKVsReturnFilter (addendum)

Having it as static means the test cannot be parameterized (ran into
this issue in HBASE-23305). That happens because the field is not
reset between parameterized runs.

Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
Bharath Vissapragada 2019-12-25 21:46:33 -08:00 committed by Viraj Jasani
parent 85b43a7059
commit 27fc96e076
No known key found for this signature in database
GPG Key ID: E906DFF511D3E5DB
1 changed files with 8 additions and 9 deletions

View File

@ -769,7 +769,7 @@ public class TestScannersFromClientSide {
Result result;
int expectedKvNumber = 6;
int returnedKvNumber = 0;
while((result = rs.next()) != null){
while((result = rs.next()) != null) {
returnedKvNumber += result.listCells().size();
}
rs.close();
@ -779,24 +779,24 @@ public class TestScannersFromClientSide {
public static class LimitKVsReturnFilter extends FilterBase {
private static int total = 0;
private int cellCount = 0;
@Override
public ReturnCode filterKeyValue(Cell v) throws IOException {
if(total>=6) {
total++;
if (cellCount >= 6) {
cellCount++;
return ReturnCode.SKIP;
}
total++;
cellCount++;
return ReturnCode.INCLUDE;
}
@Override
public boolean filterAllRemaining() throws IOException {
if(total<7) {
if (cellCount < 7) {
return false;
}
total++;
cellCount++;
return true;
}
@ -810,5 +810,4 @@ public class TestScannersFromClientSide {
return new LimitKVsReturnFilter();
}
}
}