You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2015/04/09 22:59:21 UTC
[16/50] [abbrv] hbase git commit: Revert "HBASE-11544 [Ergonomics]
hbase.client.scanner.caching is dogged and will try to return batch even if
it means OOME" References the wrong JIRA above so revert;
also an addendum is on the way.
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 6abe076..6a5e844 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -128,10 +128,11 @@ import org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.Stor
import org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor;
import org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor;
import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.regionserver.Region.RowLock;
import org.apache.hadoop.hbase.regionserver.TestStore.FaultyFileSystem;
-import org.apache.hadoop.hbase.regionserver.handler.FinishRegionRecoveringHandler;
import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
+import org.apache.hadoop.hbase.regionserver.handler.FinishRegionRecoveringHandler;
import org.apache.hadoop.hbase.regionserver.wal.MetricsWAL;
import org.apache.hadoop.hbase.regionserver.wal.MetricsWALSource;
import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;
@@ -1264,7 +1265,7 @@ public class TestHRegion {
boolean more = false;
List<Cell> results = new ArrayList<Cell>();
do {
- more = scanner.next(results);
+ more = NextState.hasMoreValues(scanner.next(results));
if (results != null && !results.isEmpty())
count++;
else
@@ -1283,7 +1284,7 @@ public class TestHRegion {
List<Cell> results = new ArrayList<Cell>();
boolean more = false;
do {
- more = resultScanner.next(results);
+ more = NextState.hasMoreValues(resultScanner.next(results));
if (results != null && !results.isEmpty())
numberOfResults++;
else
@@ -2273,7 +2274,7 @@ public class TestHRegion {
InternalScanner s = region.getScanner(scan);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(false, s.next(results));
+ assertEquals(false, NextState.hasMoreValues(s.next(results)));
assertEquals(1, results.size());
Cell kv = results.get(0);
@@ -2765,7 +2766,7 @@ public class TestHRegion {
List<Cell> actual = new ArrayList<Cell>();
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(actual);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(actual));
assertEquals(false, hasNext);
// Verify result
@@ -2828,7 +2829,7 @@ public class TestHRegion {
List<Cell> actual = new ArrayList<Cell>();
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(actual);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(actual));
assertEquals(false, hasNext);
// Verify result
@@ -2910,7 +2911,7 @@ public class TestHRegion {
List<Cell> actual = new ArrayList<Cell>();
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(actual);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(actual));
assertEquals(false, hasNext);
// Verify result
@@ -2971,7 +2972,7 @@ public class TestHRegion {
List<Cell> actual = new ArrayList<Cell>();
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(actual);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(actual));
assertEquals(false, hasNext);
// Verify result
@@ -3032,7 +3033,7 @@ public class TestHRegion {
List<Cell> actual = new ArrayList<Cell>();
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(actual);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(actual));
assertEquals(false, hasNext);
// Verify result
@@ -3085,7 +3086,7 @@ public class TestHRegion {
InternalScanner s = region.getScanner(scan);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(false, s.next(results));
+ assertEquals(false, NextState.hasMoreValues(s.next(results)));
assertEquals(0, results.size());
} finally {
HBaseTestingUtility.closeRegionAndWAL(this.region);
@@ -3159,7 +3160,7 @@ public class TestHRegion {
List<Cell> actual = new ArrayList<Cell>();
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(actual);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(actual));
assertEquals(false, hasNext);
// Verify result
@@ -3222,18 +3223,18 @@ public class TestHRegion {
InternalScanner s = region.getScanner(scan);
List<Cell> results = new ArrayList<Cell>();
- assertTrue(s.next(results));
+ assertTrue(NextState.hasMoreValues(s.next(results)));
assertEquals(results.size(), 1);
results.clear();
- assertTrue(s.next(results));
+ assertTrue(NextState.hasMoreValues(s.next(results)));
assertEquals(results.size(), 3);
assertTrue("orderCheck", CellUtil.matchingFamily(results.get(0), cf_alpha));
assertTrue("orderCheck", CellUtil.matchingFamily(results.get(1), cf_essential));
assertTrue("orderCheck", CellUtil.matchingFamily(results.get(2), cf_joined));
results.clear();
- assertFalse(s.next(results));
+ assertFalse(NextState.hasMoreValues(s.next(results)));
assertEquals(results.size(), 0);
} finally {
HBaseTestingUtility.closeRegionAndWAL(this.region);
@@ -3316,9 +3317,8 @@ public class TestHRegion {
List<Cell> results = new ArrayList<Cell>();
int index = 0;
- ScannerContext scannerContext = ScannerContext.newBuilder().setBatchLimit(3).build();
while (true) {
- boolean more = s.next(results, scannerContext);
+ boolean more = NextState.hasMoreValues(s.next(results, 3));
if ((index >> 1) < 5) {
if (index % 2 == 0)
assertEquals(results.size(), 3);
@@ -3592,7 +3592,7 @@ public class TestHRegion {
if (toggle) {
flushThread.flush();
}
- while (scanner.next(res))
+ while (NextState.hasMoreValues(scanner.next(res)))
;
if (!toggle) {
flushThread.flush();
@@ -3717,7 +3717,7 @@ public class TestHRegion {
boolean previousEmpty = res.isEmpty();
res.clear();
InternalScanner scanner = region.getScanner(scan);
- while (scanner.next(res))
+ while (NextState.hasMoreValues(scanner.next(res)))
;
if (!res.isEmpty() || !previousEmpty || i > compactInterval) {
assertEquals("i=" + i, expectedCount, res.size());
@@ -3999,7 +3999,7 @@ public class TestHRegion {
InternalScanner scanner = region.getScanner(idxScan);
List<Cell> res = new ArrayList<Cell>();
- while (scanner.next(res))
+ while (NextState.hasMoreValues(scanner.next(res)))
;
assertEquals(1L, res.size());
} finally {
@@ -4895,7 +4895,7 @@ public class TestHRegion {
try {
List<Cell> curVals = new ArrayList<Cell>();
boolean first = true;
- OUTER_LOOP: while (s.next(curVals)) {
+ OUTER_LOOP: while (NextState.hasMoreValues(s.next(curVals))) {
for (Cell kv : curVals) {
byte[] val = CellUtil.cloneValue(kv);
byte[] curval = val;
@@ -5091,17 +5091,17 @@ public class TestHRegion {
scan.setReversed(true);
InternalScanner scanner = region.getScanner(scan);
List<Cell> currRow = new ArrayList<Cell>();
- boolean hasNext = scanner.next(currRow);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(2, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowC));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowB));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowA));
assertFalse(hasNext);
@@ -5148,17 +5148,17 @@ public class TestHRegion {
scan.setReversed(true);
scan.setMaxVersions(5);
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(currRow);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(2, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowC));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowB));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowA));
assertFalse(hasNext);
@@ -5202,17 +5202,17 @@ public class TestHRegion {
List<Cell> currRow = new ArrayList<Cell>();
scan.setReversed(true);
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(currRow);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowC));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowB));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowA));
assertFalse(hasNext);
@@ -5270,17 +5270,17 @@ public class TestHRegion {
scan.setReversed(true);
List<Cell> currRow = new ArrayList<Cell>();
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(currRow);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowD));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowC));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowB));
assertFalse(hasNext);
@@ -5291,7 +5291,7 @@ public class TestHRegion {
scan.setReversed(true);
currRow.clear();
scanner = region.getScanner(scan);
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowD));
scanner.close();
@@ -5350,17 +5350,17 @@ public class TestHRegion {
scan.setReversed(true);
List<Cell> currRow = new ArrayList<Cell>();
InternalScanner scanner = region.getScanner(scan);
- boolean hasNext = scanner.next(currRow);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowD));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowC));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowB));
assertFalse(hasNext);
@@ -5371,7 +5371,7 @@ public class TestHRegion {
scan.setReversed(true);
currRow.clear();
scanner = region.getScanner(scan);
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), rowD));
scanner.close();
@@ -5495,42 +5495,42 @@ public class TestHRegion {
// 1. scan out "row4" (5 kvs), "row5" can't be scanned out since not
// included in scan range
// "row4" takes 2 next() calls since batch=3
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(3, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row4));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(2, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row4));
assertTrue(hasNext);
// 2. scan out "row3" (2 kv)
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(2, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row3));
assertTrue(hasNext);
// 3. scan out "row2" (4 kvs)
// "row2" takes 2 next() calls since batch=3
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(3, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row2));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row2));
assertTrue(hasNext);
// 4. scan out "row1" (2 kv)
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(2, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row1));
assertTrue(hasNext);
// 5. scan out "row0" (1 kv)
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row0));
assertFalse(hasNext);
@@ -5591,22 +5591,22 @@ public class TestHRegion {
scan.setBatch(10);
InternalScanner scanner = region.getScanner(scan);
List<Cell> currRow = new ArrayList<Cell>();
- boolean hasNext = scanner.next(currRow);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row4));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row3));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row2));
assertTrue(hasNext);
currRow.clear();
- hasNext = scanner.next(currRow);
+ hasNext = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(1, currRow.size());
assertTrue(Bytes.equals(currRow.get(0).getRow(), row1));
assertFalse(hasNext);
@@ -5659,7 +5659,7 @@ public class TestHRegion {
boolean more = false;
int verify = startRow + 2 * numRows - 1;
do {
- more = scanner.next(currRow);
+ more = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(Bytes.toString(currRow.get(0).getRow()), verify + "");
verify--;
currRow.clear();
@@ -5672,7 +5672,7 @@ public class TestHRegion {
scanner = regions[1].getScanner(scan);
verify = startRow + 2 * numRows - 1;
do {
- more = scanner.next(currRow);
+ more = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(Bytes.toString(currRow.get(0).getRow()), verify + "");
verify--;
currRow.clear();
@@ -5685,7 +5685,7 @@ public class TestHRegion {
scanner = regions[0].getScanner(scan);
verify = startRow + numRows - 1;
do {
- more = scanner.next(currRow);
+ more = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(Bytes.toString(currRow.get(0).getRow()), verify + "");
verify--;
currRow.clear();
@@ -5698,7 +5698,7 @@ public class TestHRegion {
scanner = regions[0].getScanner(scan);
verify = startRow + numRows - 1;
do {
- more = scanner.next(currRow);
+ more = NextState.hasMoreValues(scanner.next(currRow));
assertEquals(Bytes.toString(currRow.get(0).getRow()), verify + "");
verify--;
currRow.clear();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
index 9286e0d..c480cd8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -263,8 +264,7 @@ public class TestKeepDeletes {
s.setTimeRange(0L, ts+1);
InternalScanner scanner = region.getScanner(s);
List<Cell> kvs = new ArrayList<Cell>();
- while (scanner.next(kvs))
- ;
+ while (NextState.hasMoreValues(scanner.next(kvs)));
assertTrue(kvs.isEmpty());
// flushing and minor compaction keep delete markers
@@ -946,7 +946,7 @@ public class TestKeepDeletes {
int res = 0;
boolean hasMore;
do {
- hasMore = scan.next(kvs);
+ hasMore = NextState.hasMoreValues(scan.next(kvs));
for (Cell kv : kvs) {
if(CellUtil.isDelete(kv)) res++;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
index cc16804..12ab2ad 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
@@ -52,6 +52,7 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoder;
import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoderImpl;
import org.apache.hadoop.hbase.io.hfile.HFileScanner;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionProgress;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest;
import org.apache.hadoop.hbase.regionserver.compactions.RatioBasedCompactionPolicy;
@@ -131,7 +132,7 @@ public class TestMajorCompaction {
InternalScanner s = r.getScanner(new Scan());
do {
List<Cell> results = new ArrayList<Cell>();
- boolean result = s.next(results);
+ boolean result = NextState.hasMoreValues(s.next(results));
r.delete(new Delete(CellUtil.cloneRow(results.get(0))));
if (!result) break;
} while(true);
@@ -144,7 +145,7 @@ public class TestMajorCompaction {
int counter = 0;
do {
List<Cell> results = new ArrayList<Cell>();
- boolean result = s.next(results);
+ boolean result = NextState.hasMoreValues(s.next(results));
if (!result) break;
counter++;
} while(true);
@@ -455,7 +456,7 @@ public class TestMajorCompaction {
InternalScanner s = r.getScanner(scan);
do {
List<Cell> results = new ArrayList<Cell>();
- boolean result = s.next(results);
+ boolean result = NextState.hasMoreValues(s.next(results));
assertTrue(!results.isEmpty());
r.delete(new Delete(results.get(0).getRow()));
if (!result) break;
@@ -471,7 +472,7 @@ public class TestMajorCompaction {
int counter = 0;
do {
List<Cell> results = new ArrayList<Cell>();
- boolean result = s.next(results);
+ boolean result = NextState.hasMoreValues(s.next(results));
if (!result) break;
counter++;
} while (true);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
index dfdc4e4..28d3ab9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
@@ -49,6 +49,7 @@ import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -249,7 +250,7 @@ public class TestMultiColumnScanner {
String queryInfo = "columns queried: " + qualSet + " (columnBitMask="
+ columnBitMask + "), maxVersions=" + maxVersions;
- while (scanner.next(results) || results.size() > 0) {
+ while (NextState.hasMoreValues(scanner.next(results)) || results.size() > 0) {
for (Cell kv : results) {
while (kvPos < kvs.size()
&& !matchesQuery(kvs.get(kvPos), qualSet, maxVersions,
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java
index b2115b3..313a6ba 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java
@@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -426,7 +427,7 @@ public class TestRegionMergeTransaction {
List<Cell> kvs = new ArrayList<Cell>();
boolean hasNext = true;
while (hasNext) {
- hasNext = scanner.next(kvs);
+ hasNext = NextState.hasMoreValues(scanner.next(kvs));
if (!kvs.isEmpty())
rowcount++;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java
index 8052d9c..92915e6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java
@@ -55,6 +55,7 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.io.hfile.HFileContext;
import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -433,7 +434,7 @@ public class TestReversibleScanners {
int rowCount = 0;
int kvCount = 0;
try {
- while (scanner.next(kvList)) {
+ while (NextState.hasMoreValues(scanner.next(kvList))) {
if (kvList.isEmpty()) continue;
rowCount++;
kvCount += kvList.size();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
index eada3fb..ccae4bc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
@@ -47,6 +47,7 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.hadoop.hbase.io.hfile.HFilePrettyPrinter;
import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -164,7 +165,7 @@ public class TestScanWithBloomError {
{ // Limit the scope of results.
List<Cell> results = new ArrayList<Cell>();
- while (scanner.next(results) || results.size() > 0) {
+ while (NextState.hasMoreValues(scanner.next(results)) || results.size() > 0) {
allResults.addAll(results);
results.clear();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
index 84cb355..ee72ce4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
@@ -54,6 +54,7 @@ import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.filter.InclusiveStopFilter;
import org.apache.hadoop.hbase.filter.PrefixFilter;
import org.apache.hadoop.hbase.filter.WhileMatchFilter;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -136,7 +137,7 @@ public class TestScanner {
InternalScanner s = r.getScanner(scan);
int count = 0;
- while (s.next(results)) {
+ while (NextState.hasMoreValues(s.next(results))) {
count++;
}
s.close();
@@ -149,7 +150,7 @@ public class TestScanner {
count = 0;
Cell kv = null;
results = new ArrayList<Cell>();
- for (boolean first = true; s.next(results);) {
+ for (boolean first = true; NextState.hasMoreValues(s.next(results));) {
kv = results.get(0);
if (first) {
assertTrue(CellUtil.matchingRow(kv, startrow));
@@ -172,7 +173,7 @@ public class TestScanner {
InternalScanner s = r.getScanner(scan);
boolean hasMore = true;
while (hasMore) {
- hasMore = s.next(results);
+ hasMore = NextState.hasMoreValues(s.next(results));
for (Cell kv : results) {
assertEquals((byte)'a', CellUtil.cloneRow(kv)[0]);
assertEquals((byte)'b', CellUtil.cloneRow(kv)[1]);
@@ -188,7 +189,7 @@ public class TestScanner {
InternalScanner s = r.getScanner(scan);
boolean hasMore = true;
while (hasMore) {
- hasMore = s.next(results);
+ hasMore = NextState.hasMoreValues(s.next(results));
for (Cell kv : results) {
assertTrue(Bytes.compareTo(CellUtil.cloneRow(kv), stopRow) <= 0);
}
@@ -388,7 +389,7 @@ public class TestScanner {
scan.addColumn(COLS[0], EXPLICIT_COLS[ii]);
}
scanner = r.getScanner(scan);
- while (scanner.next(results)) {
+ while (NextState.hasMoreValues(scanner.next(results))) {
assertTrue(hasColumn(results, HConstants.CATALOG_FAMILY,
HConstants.REGIONINFO_QUALIFIER));
byte [] val = CellUtil.cloneValue(getColumn(results, HConstants.CATALOG_FAMILY,
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
index 1e09c40..dfced3b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
@@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.compress.Compression;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -224,7 +225,7 @@ public class TestSeekOptimizations {
// result, not to the one already returned in results.
boolean hasNext;
do {
- hasNext = scanner.next(results);
+ hasNext = NextState.hasMoreValues(scanner.next(results));
actualKVs.addAll(results);
results.clear();
} while (hasNext);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
index 4f371bd..da4f811 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
@@ -50,6 +50,7 @@ import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.io.hfile.LruBlockCache;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -360,7 +361,7 @@ public class TestSplitTransaction {
List<Cell> kvs = new ArrayList<Cell>();
boolean hasNext = true;
while (hasNext) {
- hasNext = scanner.next(kvs);
+ hasNext = NextState.hasMoreValues(scanner.next(kvs));
if (!kvs.isEmpty()) rowcount++;
}
} finally {
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
index ee39212..c723c2e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.KeepDeletedCells;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValueTestUtil;
import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -90,7 +91,7 @@ public class TestStoreScanner extends TestCase {
StoreScanner scan = new StoreScanner(scanSpec, scanInfo, scanType,
getCols("a"), scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(5, results.size());
assertEquals(kvs[kvs.length - 1], results.get(0));
// Scan limited TimeRange
@@ -100,7 +101,7 @@ public class TestStoreScanner extends TestCase {
scan = new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"),
scanners);
results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(2, results.size());
// Another range.
scanSpec = new Scan(Bytes.toBytes(r1));
@@ -109,7 +110,7 @@ public class TestStoreScanner extends TestCase {
scan = new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"),
scanners);
results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(1, results.size());
// See how TimeRange and Versions interact.
// Another range.
@@ -119,7 +120,7 @@ public class TestStoreScanner extends TestCase {
scan = new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"),
scanners);
results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(3, results.size());
}
@@ -140,7 +141,7 @@ public class TestStoreScanner extends TestCase {
getCols("a"), scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(1, results.size());
assertEquals(kvs[0], results.get(0));
}
@@ -195,7 +196,7 @@ public class TestStoreScanner extends TestCase {
getCols("a"), scanners);
List<Cell> results = new ArrayList<Cell>();
- assertFalse(scan.next(results));
+ assertFalse(NextState.hasMoreValues(scan.next(results)));
assertEquals(0, results.size());
}
@@ -215,14 +216,14 @@ public class TestStoreScanner extends TestCase {
getCols("a"), scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(0, results.size());
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(1, results.size());
assertEquals(kvs[2], results.get(0));
- assertEquals(false, scan.next(results));
+ assertEquals(false, NextState.hasMoreValues(scan.next(results)));
}
public void testDeleteVersionMaskingMultiplePuts() throws IOException {
@@ -244,7 +245,7 @@ public class TestStoreScanner extends TestCase {
// the two put at ts=now will be masked by the 1 delete, and
// since the scan default returns 1 version we'll return the newest
// key, which is kvs[2], now-100.
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(1, results.size());
assertEquals(kvs2[1], results.get(0));
}
@@ -266,7 +267,7 @@ public class TestStoreScanner extends TestCase {
StoreScanner scan = new StoreScanner(scanSpec, scanInfo, scanType,
getCols("a"), scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(2, results.size());
assertEquals(kvs2[1], results.get(0));
assertEquals(kvs2[0], results.get(1));
@@ -282,7 +283,7 @@ public class TestStoreScanner extends TestCase {
StoreScanner scan = new StoreScanner(new Scan(Bytes.toBytes("R1")),
scanInfo, scanType, null, scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(2, results.size());
assertEquals(kvs[0], results.get(0));
assertEquals(kvs[1], results.get(1));
@@ -311,7 +312,7 @@ public class TestStoreScanner extends TestCase {
StoreScanner scan = new StoreScanner(new Scan().setMaxVersions(2),
scanInfo, scanType, null, scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(5, results.size());
assertEquals(kvs[0], results.get(0));
assertEquals(kvs[2], results.get(1));
@@ -340,13 +341,13 @@ public class TestStoreScanner extends TestCase {
new Scan().setMaxVersions(Integer.MAX_VALUE), scanInfo, scanType, null,
scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(0, results.size());
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(1, results.size());
assertEquals(kvs[kvs.length-1], results.get(0));
- assertEquals(false, scan.next(results));
+ assertEquals(false, NextState.hasMoreValues(scan.next(results)));
}
public void testDeleteColumn() throws IOException {
@@ -360,7 +361,7 @@ public class TestStoreScanner extends TestCase {
StoreScanner scan = new StoreScanner(new Scan(), scanInfo, scanType, null,
scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(1, results.size());
assertEquals(kvs[3], results.get(0));
}
@@ -384,18 +385,18 @@ public class TestStoreScanner extends TestCase {
getCols("a", "d"), scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(2, results.size());
assertEquals(kvs[0], results.get(0));
assertEquals(kvs[3], results.get(1));
results.clear();
- assertEquals(true, scan.next(results));
+ assertEquals(true, NextState.hasMoreValues(scan.next(results)));
assertEquals(1, results.size());
assertEquals(kvs[kvs.length-1], results.get(0));
results.clear();
- assertEquals(false, scan.next(results));
+ assertEquals(false, NextState.hasMoreValues(scan.next(results)));
}
/*
@@ -425,20 +426,20 @@ public class TestStoreScanner extends TestCase {
null, scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scanner.next(results));
+ assertEquals(true, NextState.hasMoreValues(scanner.next(results)));
assertEquals(2, results.size());
assertEquals(kvs[1], results.get(0));
assertEquals(kvs[2], results.get(1));
results.clear();
- assertEquals(true, scanner.next(results));
+ assertEquals(true, NextState.hasMoreValues(scanner.next(results)));
assertEquals(3, results.size());
assertEquals(kvs[4], results.get(0));
assertEquals(kvs[5], results.get(1));
assertEquals(kvs[6], results.get(2));
results.clear();
- assertEquals(false, scanner.next(results));
+ assertEquals(false, NextState.hasMoreValues(scanner.next(results)));
}
public void testScannerReseekDoesntNPE() throws Exception {
@@ -495,12 +496,12 @@ public class TestStoreScanner extends TestCase {
new StoreScanner(scan, scanInfo, scanType, null, scanners);
List<Cell> results = new ArrayList<Cell>();
- assertEquals(true, scanner.next(results));
+ assertEquals(true, NextState.hasMoreValues(scanner.next(results)));
assertEquals(1, results.size());
assertEquals(kvs[1], results.get(0));
results.clear();
- assertEquals(false, scanner.next(results));
+ assertEquals(false, NextState.hasMoreValues(scanner.next(results)));
}
public void testDeleteMarkerLongevity() throws Exception {
@@ -560,7 +561,7 @@ public class TestStoreScanner extends TestCase {
HConstants.OLDEST_TIMESTAMP);
List<Cell> results = new ArrayList<Cell>();
results = new ArrayList<Cell>();
- assertEquals(true, scanner.next(results));
+ assertEquals(true, NextState.hasMoreValues(scanner.next(results)));
assertEquals(kvs[0], results.get(0));
assertEquals(kvs[2], results.get(1));
assertEquals(kvs[3], results.get(2));
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java
index b743550..06bbd54 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java
@@ -237,14 +237,22 @@ public class TestStripeCompactor {
}
@Override
- public boolean next(List<Cell> results) throws IOException {
- if (kvs.isEmpty()) return false;
+ public NextState next(List<Cell> results) throws IOException {
+ if (kvs.isEmpty()) return NextState.makeState(NextState.State.NO_MORE_VALUES);
results.add(kvs.remove(0));
- return !kvs.isEmpty();
+ if (!kvs.isEmpty()) {
+ return NextState.makeState(NextState.State.MORE_VALUES);
+ } else {
+ return NextState.makeState(NextState.State.NO_MORE_VALUES);
+ }
+ }
+ @Override
+ public NextState next(List<Cell> result, int limit) throws IOException {
+ return next(result);
}
@Override
- public boolean next(List<Cell> result, ScannerContext scannerContext)
+ public NextState next(List<Cell> result, int limit, long remainingResultSize)
throws IOException {
return next(result);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
index fb4561b..303ee36 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -105,7 +106,7 @@ public class TestWideScanner extends HBaseTestCase {
int i = 0;
boolean more;
do {
- more = s.next(results);
+ more = NextState.hasMoreValues(s.next(results));
i++;
LOG.info("iteration #" + i + ", results.size=" + results.size());
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java
index 81f8115..3294f6d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java
@@ -54,7 +54,6 @@ import org.apache.hadoop.hbase.io.hfile.HFile;
import org.apache.hadoop.hbase.regionserver.BloomType;
import org.apache.hadoop.hbase.regionserver.InternalScanner;
import org.apache.hadoop.hbase.regionserver.ScanType;
-import org.apache.hadoop.hbase.regionserver.ScannerContext;
import org.apache.hadoop.hbase.regionserver.Store;
import org.apache.hadoop.hbase.regionserver.StoreConfigInformation;
import org.apache.hadoop.hbase.regionserver.StoreFile;
@@ -775,15 +774,24 @@ public class TestStripeCompactionPolicy {
}
@Override
- public boolean next(List<Cell> results) throws IOException {
- if (kvs.isEmpty()) return false;
+ public NextState next(List<Cell> results) throws IOException {
+ if (kvs.isEmpty()) return NextState.makeState(NextState.State.NO_MORE_VALUES);
results.add(kvs.remove(0));
- return !kvs.isEmpty();
+ if (!kvs.isEmpty()) {
+ return NextState.makeState(NextState.State.MORE_VALUES);
+ } else {
+ return NextState.makeState(NextState.State.NO_MORE_VALUES);
+ }
+ }
+
+ @Override
+ public NextState next(List<Cell> result, int limit) throws IOException {
+ return next(result);
}
@Override
- public boolean next(List<Cell> result, ScannerContext scannerContext)
+ public NextState next(List<Cell> result, int limit, long remainingResultSize)
throws IOException {
return next(result);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
index 5310a2e..afdcdc7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
@@ -71,6 +71,7 @@ import org.apache.hadoop.hbase.regionserver.FlushRequestListener;
import org.apache.hadoop.hbase.regionserver.FlushRequester;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.regionserver.MemStoreSnapshot;
import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
@@ -750,7 +751,7 @@ public class TestWALReplay {
int scannedCount = 0;
List<Cell> results = new ArrayList<Cell>();
while (true) {
- boolean existMore = scanner.next(results);
+ boolean existMore = NextState.hasMoreValues(scanner.next(results));
if (!results.isEmpty())
scannedCount++;
if (!existMore)
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cd3001f/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
index 056eeb2..c071a33 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
@@ -40,6 +40,7 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.InternalScanner;
+import org.apache.hadoop.hbase.regionserver.InternalScanner.NextState;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.wal.WAL;
@@ -231,7 +232,7 @@ public class TestMergeTool extends HBaseTestCase {
List<Cell> testRes = null;
while (true) {
testRes = new ArrayList<Cell>();
- boolean hasNext = scanner.next(testRes);
+ boolean hasNext = NextState.hasMoreValues(scanner.next(testRes));
if (!hasNext) {
break;
}