accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/5] accumulo git commit: Merge branch 'ACCUMULO-3176'
Date Mon, 15 Dec 2014 18:22:52 GMT
Merge branch 'ACCUMULO-3176'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d83eca8a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d83eca8a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d83eca8a

Branch: refs/heads/master
Commit: d83eca8a6a52aa00b4ad2619104a9cc58c5e2a42
Parents: bf6ca04 b4da875
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Dec 15 13:00:12 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Dec 15 13:00:12 2014 -0500

----------------------------------------------------------------------
 .../core/client/NewTableConfiguration.java      | 108 ++++++++++
 .../core/client/admin/TableOperations.java      |  22 +++
 .../core/client/impl/TableOperationsImpl.java   |  31 ++-
 .../accumulo/core/client/mock/MockAccumulo.java |  24 ++-
 .../accumulo/core/client/mock/MockTable.java    |  32 ++-
 .../core/client/mock/MockTableOperations.java   |  29 ++-
 .../client/impl/TableOperationsHelperTest.java  |   6 +
 .../client/mock/MockTableOperationsTest.java    |   5 +-
 .../minicluster/MiniAccumuloClusterTest.java    |   3 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  |   8 +-
 .../shell/commands/CreateTableCommand.java      |  19 +-
 .../accumulo/test/ConditionalWriterIT.java      |   3 +-
 .../test/CreateTableWithNewTableConfigIT.java   | 196 +++++++++++++++++++
 .../org/apache/accumulo/test/NamespacesIT.java  |   3 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  29 ++-
 .../java/org/apache/accumulo/test/VolumeIT.java |   3 +-
 .../accumulo/test/functional/LogicalTimeIT.java |   3 +-
 .../accumulo/test/functional/MergeIT.java       |   3 +-
 .../test/replication/CyclicReplicationIT.java   |   5 +-
 19 files changed, 500 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
index f8d2ccd,798b6f3..ff0a46a
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
@@@ -34,9 -34,9 +34,10 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.AccumuloSecurityException;
  import org.apache.accumulo.core.client.IteratorSetting;
  import org.apache.accumulo.core.client.NamespaceNotFoundException;
+ import org.apache.accumulo.core.client.NewTableConfiguration;
  import org.apache.accumulo.core.client.TableExistsException;
  import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.admin.CompactionConfig;
  import org.apache.accumulo.core.client.admin.DiskUsage;
  import org.apache.accumulo.core.client.admin.FindMax;
  import org.apache.accumulo.core.client.admin.TimeType;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
index 6353ca4,cd07048..6076868
--- a/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
@@@ -65,12 -63,12 +66,12 @@@ public class LogicalTimeIT extends Accu
      runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a", "c", "h",
"s"}, null, "h", "b", 3l);
      runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a", "h", "s",
"i"}, null, "h", "b", 3l);
      runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"t", "a", "h",
"s"}, null, "h", "b", 2l);
 -    
 +
    }
 -  
 +
    private void runMergeTest(Connector conn, String table, String[] splits, String[] inserts,
String start, String end, String last, long expected) throws Exception {
      log.info("table " + table);
-     conn.tableOperations().create(table, true, TimeType.LOGICAL);
+     conn.tableOperations().create(table, new NewTableConfiguration().setTimeType(TimeType.LOGICAL));
      TreeSet<Text> splitSet = new TreeSet<Text>();
      for (String split : splits) {
        splitSet.add(new Text(split));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d83eca8a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
----------------------------------------------------------------------


Mime
View raw message