accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ujustgotbi...@apache.org
Subject [5/9] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
Date Mon, 18 Nov 2013 23:32:26 GMT
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.6.0-SNAPSHOT
Commit: 036f381fb263f6165a9cf62aa4f67d7dbf34c099
Parents: 04f81b5 6b87c87
Author: Bill Slacum <ujustgotbilld@apache.org>
Authored: Mon Nov 18 14:38:26 2013 -0500
Committer: Bill Slacum <ujustgotbilld@apache.org>
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();


Mime
View raw message