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 AA149200BD9 for ; Tue, 1 Nov 2016 20:51:01 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A8D8E160B02; Tue, 1 Nov 2016 19:51:01 +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 CACCB160B0D for ; Tue, 1 Nov 2016 20:51:00 +0100 (CET) Received: (qmail 69824 invoked by uid 500); 1 Nov 2016 19:50:56 -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 69379 invoked by uid 99); 1 Nov 2016 19:50:56 -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; Tue, 01 Nov 2016 19:50:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 167C8EAD9A; Tue, 1 Nov 2016 19:50:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: larsh@apache.org To: commits@hbase.apache.org Date: Tue, 01 Nov 2016 19:51:20 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [26/50] hbase git commit: HBASE-15274 ClientSideRegionScanner's reaction to Scan#setBatch is not consistent between HBase versions (Youngjoon Kim) archived-at: Tue, 01 Nov 2016 19:51:01 -0000 HBASE-15274 ClientSideRegionScanner's reaction to Scan#setBatch is not consistent between HBase versions (Youngjoon Kim) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2ce516b0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2ce516b0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2ce516b0 Branch: refs/heads/branch-1.0 Commit: 2ce516b0fff93a4ee84bb53f9623c495d8dc3d13 Parents: f280c45 Author: Enis Soztutar Authored: Wed Feb 17 17:41:13 2016 -0800 Committer: Enis Soztutar Committed: Wed Feb 17 17:41:13 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/ClientSideRegionScanner.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/2ce516b0/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java index 9cb9494..f9dacdd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java @@ -71,8 +71,7 @@ public class ClientSideRegionScanner extends AbstractClientScanner { @Override public Result next() throws IOException { values.clear(); - - scanner.nextRaw(values, -1); // pass -1 as limit so that we see the whole row. + scanner.nextRaw(values); if (values.isEmpty()) { //we are done return null;