Repository: hbase Updated Branches: refs/heads/branch-1.0 9e3102578 -> 0184a5c99
HBASE-13527 The default value for hbase.client.scanner.max.result.size is never actually set on Scans Signed-off-by: stack <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0184a5c9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0184a5c9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0184a5c9 Branch: refs/heads/branch-1.0 Commit: 0184a5c9936d99031271c3d8f6c639ecc9583f63 Parents: 9e31025 Author: Jonathan Lawlor <[email protected]> Authored: Wed Apr 22 15:01:58 2015 -0700 Committer: stack <[email protected]> Committed: Wed Apr 22 16:21:48 2015 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/ClientScanner.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0184a5c9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index b542a74..e6c60da 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java @@ -24,7 +24,6 @@ import java.util.concurrent.ExecutorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; @@ -35,7 +34,7 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.UnknownScannerException; -import org.apache.hadoop.hbase.client.RpcRetryingCallerFactory; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.OutOfOrderScannerNextException; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -43,6 +42,8 @@ import org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos; import org.apache.hadoop.hbase.regionserver.RegionServerStoppedException; import org.apache.hadoop.hbase.util.Bytes; +import com.google.common.annotations.VisibleForTesting; + /** * Implements the scanner interface for the HBase client. * If there are multiple regions in a table, this scanner will iterate @@ -193,6 +194,11 @@ public class ClientScanner extends AbstractClientScanner { return maxScannerResultSize; } + @VisibleForTesting + public int getCacheSize() { + return cache != null ? cache.size() : 0; + } + // returns true if the passed region endKey protected boolean checkScanStopRow(final byte [] endKey) { if (this.scan.getStopRow().length > 0) {
