Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6212C17349 for ; Sun, 10 May 2015 21:06:19 +0000 (UTC) Received: (qmail 60861 invoked by uid 500); 10 May 2015 21:06:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 60818 invoked by uid 500); 10 May 2015 21:06:19 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 60799 invoked by uid 99); 10 May 2015 21:06:19 -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; Sun, 10 May 2015 21:06:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3200EE1110; Sun, 10 May 2015 21:06:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sun, 10 May 2015 21:06:21 -0000 Message-Id: <8cffaa90fe2b45758b19b964b1b6d59a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/9] accumulo git commit: ACCUMULO-3788 Recreate batchscanner in ContinuousBatchWalker after its closed. ACCUMULO-3788 Recreate batchscanner in ContinuousBatchWalker after its closed. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/757c1cb5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/757c1cb5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/757c1cb5 Branch: refs/heads/1.7 Commit: 757c1cb5569d02e6b155f1d5dd2f66f877ec0cd9 Parents: 671d4da Author: Josh Elser Authored: Sat May 9 20:55:23 2015 -0400 Committer: Josh Elser Committed: Sat May 9 20:55:23 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/test/continuous/ContinuousBatchWalker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/757c1cb5/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java index 5c54b08..2c32176 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java @@ -63,10 +63,10 @@ public class ContinuousBatchWalker { Scanner scanner = ContinuousUtil.createScanner(conn, clientOpts.getTableName(), auths); scanner.setBatchSize(scanOpts.scanBatchSize); - BatchScanner bs = conn.createBatchScanner(clientOpts.getTableName(), auths, bsOpts.scanThreads); - bs.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS); - while (true) { + BatchScanner bs = conn.createBatchScanner(clientOpts.getTableName(), auths, bsOpts.scanThreads); + bs.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS); + Set batch = getBatch(scanner, opts.min, opts.max, scanOpts.scanBatchSize, r); List ranges = new ArrayList(batch.size());