You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ya...@apache.org on 2017/05/31 07:30:59 UTC
hbase git commit: HBASE-18122 addendum for fixing async client scanner
Repository: hbase
Updated Branches:
refs/heads/master 9cf1a08c5 -> c945d2b2d
HBASE-18122 addendum for fixing async client scanner
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c945d2b2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c945d2b2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c945d2b2
Branch: refs/heads/master
Commit: c945d2b2d9dc2b9223819842239997efa10f4c0b
Parents: 9cf1a08
Author: Phil Yang <ya...@apache.org>
Authored: Wed May 31 15:30:24 2017 +0800
Committer: Phil Yang <ya...@apache.org>
Committed: Wed May 31 15:30:24 2017 +0800
----------------------------------------------------------------------
.../hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c945d2b2/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
index d71b428..270f265 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
@@ -144,7 +144,7 @@ class AsyncRpcRetryingCallerFactory {
public class ScanSingleRegionCallerBuilder extends BuilderBase {
- private long scannerId = -1L;
+ private Long scannerId = null;
private Scan scan;
@@ -238,7 +238,7 @@ class AsyncRpcRetryingCallerFactory {
}
public AsyncScanSingleRegionRpcRetryingCaller build() {
- checkArgument(scannerId >= 0, "invalid scannerId %d", scannerId);
+ checkArgument(scannerId != null, "invalid scannerId %d", scannerId);
return new AsyncScanSingleRegionRpcRetryingCaller(retryTimer, conn,
checkNotNull(scan, "scan is null"), scanMetrics, scannerId,
checkNotNull(resultCache, "resultCache is null"),