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 08FF710BFE for ; Mon, 18 Nov 2013 19:38:37 +0000 (UTC) Received: (qmail 73022 invoked by uid 500); 18 Nov 2013 19:38:36 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 72971 invoked by uid 500); 18 Nov 2013 19:38:36 -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 72907 invoked by uid 99); 18 Nov 2013 19:38:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Nov 2013 19:38:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9466935BDB; Mon, 18 Nov 2013 19:38:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ujustgotbilld@apache.org To: commits@accumulo.apache.org Date: Mon, 18 Nov 2013 19:38:40 -0000 Message-Id: In-Reply-To: <0ed00a59bbad4a5cb0824d4f3c004446@git.apache.org> References: <0ed00a59bbad4a5cb0824d4f3c004446@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Conflicts: examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/036f381f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/036f381f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/036f381f Branch: refs/heads/1.5.1-SNAPSHOT Commit: 036f381fb263f6165a9cf62aa4f67d7dbf34c099 Parents: 04f81b5 6b87c87 Author: Bill Slacum Authored: Mon Nov 18 14:38:26 2013 -0500 Committer: Bill Slacum Committed: Mon Nov 18 14:38:26 2013 -0500 ---------------------------------------------------------------------- core/pom.xml | 4 + .../client/impl/MultiTableBatchWriterImpl.java | 166 ++++-- .../accumulo/core/client/impl/Tables.java | 7 + .../simple/client/RandomBatchWriter.java | 4 - .../test/MultiTableBatchWriterTest.java | 539 +++++++++++++++++++ 5 files changed, 683 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/036f381f/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java ---------------------------------------------------------------------- diff --cc examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java index d78ae0e,f9acfd9..a640003 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java @@@ -121,12 -121,7 +121,8 @@@ public class RandomBatchWriter Opts opts = new Opts(); BatchWriterOpts bwOpts = new BatchWriterOpts(); opts.parseArgs(RandomBatchWriter.class.getName(), args, bwOpts); - - + if ((opts.max - opts.min) < opts.num) { + System.err.println(String.format("You must specify a min and a max that allow for at least num possible values. For example, you requested %d rows, but a min of %d and a max of %d only allows for %d rows.", opts.num, opts.min, opts.max, (opts.max - opts.min))); - System.exit(1); - } - Random r; if (opts.seed == null) r = new Random();