You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/08/05 14:24:50 UTC
git commit: ACCUMULO-1537 commiting Michael Berman's changes to
invoke main() vs exec()
Updated Branches:
refs/heads/master ff226a789 -> ae62af822
ACCUMULO-1537 commiting Michael Berman's changes to invoke main() vs exec()
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae62af82
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae62af82
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae62af82
Branch: refs/heads/master
Commit: ae62af822f6dfc47978ec6748f4a9b1fce15ddff
Parents: ff226a7
Author: Eric Newton <ec...@apache.org>
Authored: Mon Aug 5 08:24:47 2013 -0400
Committer: Eric Newton <ec...@apache.org>
Committed: Mon Aug 5 08:24:47 2013 -0400
----------------------------------------------------------------------
.../accumulo/test/functional/ExamplesIT.java | 32 ++++++++++----------
.../accumulo/test/functional/ReadWriteIT.java | 4 +--
2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae62af82/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index e8e26b9..c690ce0 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -201,7 +201,7 @@ public class ExamplesIT extends ConfigurableMacIT {
assertEquals(0, cluster.exec(VerifyIngest.class, instance, keepers, user, passwd, "bulkTable", "0", "1000000").waitFor());
log.info("Running TeraSortIngest example");
- TeraSortIngest.main(new String[]{
+ exec(TeraSortIngest.class, new String[]{
"--count", (1000*1000) + "",
"-nk", "10", "-xk", "10",
"-nv", "10", "-xv", "10",
@@ -212,7 +212,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"-p", passwd,
"--splits", "4"});
log.info("Running Regex example");
- RegexExample.main(new String[] {
+ exec(RegexExample.class, new String[] {
"-i", instance,
"-z", keepers,
"-u", user,
@@ -222,7 +222,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"--output", dir + "/tmp/nines"
});
log.info("Running RowHash example");
- RowHash.main(new String[]{
+ exec(RowHash.class, new String[]{
"-i", instance,
"-z", keepers,
"-u", user,
@@ -231,7 +231,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"--column", "c:"
});
log.info("Running TableToFile example");
- TableToFile.main(new String[]{
+ exec(TableToFile.class, new String[]{
"-i", instance,
"-z", keepers,
"-u", user,
@@ -247,7 +247,7 @@ public class ExamplesIT extends ConfigurableMacIT {
SummingCombiner.setEncodingType(is, SummingCombiner.Type.STRING);
c.tableOperations().attachIterator("wordCount", is);
fs.copyFromLocalFile(new Path(new Path(System.getProperty("user.dir")).getParent(), "README"), new Path(dir + "/tmp/wc/README"));
- WordCount.main(new String[] {
+ exec(WordCount.class, new String[] {
"-i", instance,
"-u", user,
"-p", passwd,
@@ -257,7 +257,7 @@ public class ExamplesIT extends ConfigurableMacIT {
});
log.info("Inserting data with a batch writer");
- InsertWithBatchWriter.main(new String[]{
+ exec(InsertWithBatchWriter.class, new String[]{
"-i", instance,
"-z", keepers,
"-u", user,
@@ -265,7 +265,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"-t", "helloBatch"
});
log.info("Reading data");
- ReadData.main(new String[]{
+ exec(ReadData.class, new String[]{
"-i", instance,
"-z", keepers,
"-u", user,
@@ -273,7 +273,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"-t", "helloBatch"
});
log.info("Running isolated scans");
- InterferenceTest.main(new String[]{
+ exec(InterferenceTest.class, new String[]{
"-i", instance,
"-z", keepers,
"-u", user,
@@ -283,7 +283,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"--isolated"
});
log.info("Running scans without isolation");
- InterferenceTest.main(new String[]{
+ exec(InterferenceTest.class, new String[]{
"-i", instance,
"-z", keepers,
"-u", user,
@@ -292,7 +292,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"--iterations", "100000",
});
log.info("Performing some row operations");
- RowOperations.main(new String[]{
+ exec(RowOperations.class, new String[]{
"-i", instance,
"-z", keepers,
"-u", user,
@@ -300,7 +300,7 @@ public class ExamplesIT extends ConfigurableMacIT {
});
log.info("Using the batch writer");
c.tableOperations().create("test");
- SequentialBatchWriter.main(new String[] {
+ exec(SequentialBatchWriter.class, new String[] {
"-i", instance,
"-z", keepers,
"-u", user,
@@ -316,7 +316,7 @@ public class ExamplesIT extends ConfigurableMacIT {
});
log.info("Reading and writing some data");
- ReadWriteExample.main(new String[] {
+ exec(ReadWriteExample.class, new String[] {
"-i", instance,
"-z", keepers,
"-u", user,
@@ -327,7 +327,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"-c",
"--debug"});
log.info("Deleting some data");
- ReadWriteExample.main(new String[] {
+ exec(ReadWriteExample.class, new String[] {
"-i", instance,
"-z", keepers,
"-u", user,
@@ -338,7 +338,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"--debug"});
log.info("Writing some data with the batch writer");
c.tableOperations().create("test3");
- RandomBatchWriter.main(new String[] {
+ exec(RandomBatchWriter.class, new String[] {
"-i", instance,
"-z", keepers,
"-u", user,
@@ -353,7 +353,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"--batchThreads", "4",
"--vis", visibility});
log.info("Reading some data with the batch scanner");
- RandomBatchScanner.main(new String[] {
+ exec(RandomBatchScanner.class, new String[] {
"-i", instance,
"-z", keepers,
"-u", user,
@@ -366,7 +366,7 @@ public class ExamplesIT extends ConfigurableMacIT {
"--scanThreads", "4",
"--auths", auths});
log.info("Running an example table operation (Flush)");
- Flush.main(new String[]{
+ exec(Flush.class, new String[]{
"-i", instance,
"-z", keepers,
"-u", user,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae62af82/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index adfa557..8cad540 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -121,8 +121,8 @@ public class ReadWriteIT extends ConfigurableMacIT {
// Write to multiple tables
String instance = cluster.getInstanceName();
String keepers = cluster.getZooKeepers();
- TestMultiTableIngest.main(args("--count", "" + ROWS, "-u", "root", "-i", instance, "-z", keepers, "-p", ROOT_PASSWORD));
- TestMultiTableIngest.main(args("--count", "" + ROWS, "--readonly", "-u", "root", "-i", instance, "-z", keepers, "-p", ROOT_PASSWORD));
+ exec(TestMultiTableIngest.class, args("--count", "" + ROWS, "-u", "root", "-i", instance, "-z", keepers, "-p", ROOT_PASSWORD));
+ exec(TestMultiTableIngest.class, args("--count", "" + ROWS, "--readonly", "-u", "root", "-i", instance, "-z", keepers, "-p", ROOT_PASSWORD));
}
@Test(timeout = 60 * 1000)