You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by vj...@apache.org on 2019/12/27 17:47:16 UTC
[hbase] branch branch-1 updated: HBASE-23238: Remove 'static'ness
of cell counter in LimitKVsReturnFilter (addendum)
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push:
new 27fc96e HBASE-23238: Remove 'static'ness of cell counter in LimitKVsReturnFilter (addendum)
27fc96e is described below
commit 27fc96e076ec320c4d6287573be48ca0d3aff96e
Author: Bharath Vissapragada <bh...@apache.org>
AuthorDate: Wed Dec 25 21:46:33 2019 -0800
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 <vj...@apache.org>
---
.../hadoop/hbase/client/TestScannersFromClientSide.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
index eb2863f..7c23f0a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
@@ -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;
}
@@ -806,9 +806,8 @@ public class TestScannersFromClientSide {
}
public static LimitKVsReturnFilter parseFrom(final byte [] pbBytes)
- throws DeserializationException {
+ throws DeserializationException {
return new LimitKVsReturnFilter();
}
}
-
}