ACCUMULO-2306 - Adding prefix for the files
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1e7f883c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1e7f883c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1e7f883c Branch: refs/heads/master Commit: 1e7f883c198d4424153c02b5b1536dc6d664f2c3 Parents: 6a88722 Author: John Vines <vi...@apache.org> Authored: Fri Jan 31 19:06:14 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Fri Jan 31 21:30:09 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/functional/BulkIT.java | 9 +++++---- .../java/org/apache/accumulo/test/functional/SslIT.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1e7f883c/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java index d86b704..2fc0477 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java @@ -39,10 +39,10 @@ public class BulkIT extends SimpleMacIT { @Test(timeout = 4 * 60 * 1000) public void test() throws Exception { - runTest(getConnector(), getTableNames(1)[0]); + runTest(getConnector(), getTableNames(1)[0], this.getClass().getName()); } - static void runTest(Connector c, String tableName) throws AccumuloException, AccumuloSecurityException, TableExistsException, IOException, TableNotFoundException, + static void runTest(Connector c, String tableName, String filePrefix) throws AccumuloException, AccumuloSecurityException, TableExistsException, IOException, TableNotFoundException, MutationsRejectedException { c.tableOperations().create(tableName); FileSystem fs = FileSystem.get(CachedConfiguration.getInstance()); @@ -57,12 +57,13 @@ public class BulkIT extends SimpleMacIT { opts.instance = c.getInstance().getInstanceName(); opts.cols = 1; opts.tableName = tableName; + String fileFormat = "/testrf/"+filePrefix+"rf%02d"; for (int i = 0; i < COUNT; i++) { - opts.outputFile = base + String.format("/testrf/rf%02d", i); + opts.outputFile = base + String.format(fileFormat, i); opts.startRow = N * i; TestIngest.ingest(c, opts, BWOPTS); } - opts.outputFile = base + String.format("/testrf/rf%02d", N); + opts.outputFile = base + String.format(fileFormat, N); opts.startRow = N; opts.rows = 1; // create an rfile with one entry, there was a bug with this: http://git-wip-us.apache.org/repos/asf/accumulo/blob/1e7f883c/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java index 648a324..d2de97f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java @@ -51,7 +51,7 @@ public class SslIT extends ConfigurableMacIT { @Test(timeout = 5 * 60 * 1000) public void bulk() throws Exception { - BulkIT.runTest(getConnector(), getTableNames(1)[0]); + BulkIT.runTest(getConnector(), getTableNames(1)[0], this.getClass().getName()); } @Test(timeout = 60 * 1000)
