Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C58F6200CA8 for ; Wed, 31 May 2017 18:31:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C3D9E160BC2; Wed, 31 May 2017 16:31:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1E8C7160BCB for ; Wed, 31 May 2017 18:31:30 +0200 (CEST) Received: (qmail 22887 invoked by uid 500); 31 May 2017 16:31:30 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 22749 invoked by uid 99); 31 May 2017 16:31:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2017 16:31:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12431E03B3; Wed, 31 May 2017 16:31:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Date: Wed, 31 May 2017 16:31:31 -0000 Message-Id: In-Reply-To: <67a0e90fb37344adafd656ea93adb494@git.apache.org> References: <67a0e90fb37344adafd656ea93adb494@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/30] hbase git commit: HBASE-18122 addendum for fixing async client scanner archived-at: Wed, 31 May 2017 16:31:32 -0000 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/HBASE-14614 Commit: c945d2b2d9dc2b9223819842239997efa10f4c0b Parents: 9cf1a08 Author: Phil Yang Authored: Wed May 31 15:30:24 2017 +0800 Committer: Phil Yang 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"),