Repository: accumulo Updated Branches: refs/heads/master aba5278bd -> 9e59c073c
ACCUMULO-3732 moved NewTableConfiguration from core.client to core.client.admin Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9e59c073 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9e59c073 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9e59c073 Branch: refs/heads/master Commit: 9e59c073ca718dc9b9d9c968ef9aa6af18c7d185 Parents: aba5278 Author: Keith Turner <ktur...@apache.org> Authored: Wed Apr 15 14:24:13 2015 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Apr 15 14:24:13 2015 -0400 ---------------------------------------------------------------------- .../core/client/NewTableConfiguration.java | 108 ------------------- .../client/admin/NewTableConfiguration.java | 107 ++++++++++++++++++ .../core/client/admin/TableOperations.java | 1 - .../core/client/impl/TableOperationsImpl.java | 2 +- .../core/client/mock/MockTableOperations.java | 2 +- .../client/impl/TableOperationsHelperTest.java | 2 +- .../client/mock/MockTableOperationsTest.java | 2 +- .../minicluster/MiniAccumuloClusterTest.java | 2 +- .../org/apache/accumulo/proxy/ProxyServer.java | 2 +- .../shell/commands/CreateTableCommand.java | 2 +- .../accumulo/test/ConditionalWriterIT.java | 2 +- .../test/CreateTableWithNewTableConfigIT.java | 2 +- .../org/apache/accumulo/test/NamespacesIT.java | 2 +- .../java/org/apache/accumulo/test/VolumeIT.java | 2 +- .../accumulo/test/functional/LogicalTimeIT.java | 2 +- .../accumulo/test/functional/MergeIT.java | 2 +- .../test/replication/CyclicReplicationIT.java | 2 +- 17 files changed, 121 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/core/src/main/java/org/apache/accumulo/core/client/NewTableConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/NewTableConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/NewTableConfiguration.java deleted file mode 100644 index afe0ebf..0000000 --- a/core/src/main/java/org/apache/accumulo/core/client/NewTableConfiguration.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.core.client; - -import static com.google.common.base.Preconditions.checkArgument; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import org.apache.accumulo.core.client.admin.TimeType; -import org.apache.accumulo.core.iterators.IteratorUtil; -import org.apache.accumulo.core.iterators.user.VersioningIterator; - -/** - * This object stores table creation parameters. Currently includes: {@link TimeType}, whether to include default iterators, and user-specified initial - * properties - * - * @since 1.7.0 - */ -public class NewTableConfiguration { - - private static final TimeType DEFAULT_TIME_TYPE = TimeType.MILLIS; - private TimeType timeType = DEFAULT_TIME_TYPE; - - private boolean limitVersion = true; - - private Map<String,String> properties = new HashMap<String,String>(); - - /** - * Configure logical or millisecond time for tables created with this configuration. - * - * @param tt - * the time type to use; defaults to milliseconds - * @return this - */ - public NewTableConfiguration setTimeType(TimeType tt) { - checkArgument(tt != null, "TimeType is null"); - - this.timeType = tt; - return this; - } - - /** - * Retrieve the time type currently configured. - * - * @return the time type - */ - public TimeType getTimeType() { - return timeType; - } - - /** - * Currently the only default iterator is the {@link VersioningIterator}. This method will cause the table to be created without that iterator, or any others - * which may become defaults in the future. - * - * @return this - */ - public NewTableConfiguration withoutDefaultIterators() { - this.limitVersion = false; - return this; - } - - /** - * Sets additional properties to be applied to tables created with this configuration. Additional calls to this method replaces properties set by previous - * calls. - * - * @param prop - * additional properties to add to the table when it is created - * @return this - */ - public NewTableConfiguration setProperties(Map<String,String> prop) { - checkArgument(prop != null, "properties is null"); - - this.properties = new HashMap<String,String>(prop); - return this; - } - - /** - * Retrieves the complete set of currently configured table properties to be applied to a table when this configuration object is used. - * - * @return the current properties configured - */ - public Map<String,String> getProperties() { - Map<String,String> propertyMap = new HashMap<>(); - - if (limitVersion) { - propertyMap.putAll(IteratorUtil.generateInitialTableProperties(limitVersion)); - } - - propertyMap.putAll(properties); - return Collections.unmodifiableMap(propertyMap); - } -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java new file mode 100644 index 0000000..4db1d89 --- /dev/null +++ b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.core.client.admin; + +import static com.google.common.base.Preconditions.checkArgument; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import org.apache.accumulo.core.iterators.IteratorUtil; +import org.apache.accumulo.core.iterators.user.VersioningIterator; + +/** + * This object stores table creation parameters. Currently includes: {@link TimeType}, whether to include default iterators, and user-specified initial + * properties + * + * @since 1.7.0 + */ +public class NewTableConfiguration { + + private static final TimeType DEFAULT_TIME_TYPE = TimeType.MILLIS; + private TimeType timeType = DEFAULT_TIME_TYPE; + + private boolean limitVersion = true; + + private Map<String,String> properties = new HashMap<String,String>(); + + /** + * Configure logical or millisecond time for tables created with this configuration. + * + * @param tt + * the time type to use; defaults to milliseconds + * @return this + */ + public NewTableConfiguration setTimeType(TimeType tt) { + checkArgument(tt != null, "TimeType is null"); + + this.timeType = tt; + return this; + } + + /** + * Retrieve the time type currently configured. + * + * @return the time type + */ + public TimeType getTimeType() { + return timeType; + } + + /** + * Currently the only default iterator is the {@link VersioningIterator}. This method will cause the table to be created without that iterator, or any others + * which may become defaults in the future. + * + * @return this + */ + public NewTableConfiguration withoutDefaultIterators() { + this.limitVersion = false; + return this; + } + + /** + * Sets additional properties to be applied to tables created with this configuration. Additional calls to this method replaces properties set by previous + * calls. + * + * @param prop + * additional properties to add to the table when it is created + * @return this + */ + public NewTableConfiguration setProperties(Map<String,String> prop) { + checkArgument(prop != null, "properties is null"); + + this.properties = new HashMap<String,String>(prop); + return this; + } + + /** + * Retrieves the complete set of currently configured table properties to be applied to a table when this configuration object is used. + * + * @return the current properties configured + */ + public Map<String,String> getProperties() { + Map<String,String> propertyMap = new HashMap<>(); + + if (limitVersion) { + propertyMap.putAll(IteratorUtil.generateInitialTableProperties(limitVersion)); + } + + propertyMap.putAll(properties); + return Collections.unmodifiableMap(propertyMap); + } +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java index d4d5fd3..b7c70e9 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java +++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java @@ -28,7 +28,6 @@ import java.util.SortedSet; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.IteratorSetting; -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.data.Range; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java index b1cc9c6..d4bcac4 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java @@ -55,7 +55,6 @@ import org.apache.accumulo.core.client.IsolatedScanner; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.NamespaceExistsException; import org.apache.accumulo.core.client.NamespaceNotFoundException; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.RowIterator; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableDeletedException; @@ -65,6 +64,7 @@ import org.apache.accumulo.core.client.TableOfflineException; 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.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.client.impl.TabletLocator.TabletLocation; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java ---------------------------------------------------------------------- diff --git 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 index 8c4cf59..e998722 100644 --- 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,12 +34,12 @@ import org.apache.accumulo.core.client.AccumuloException; 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.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.client.impl.TableOperationsHelper; import org.apache.accumulo.core.client.impl.Tables; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java index 475412f..7a56d1d 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java @@ -31,11 +31,11 @@ import java.util.TreeMap; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.IteratorSetting; -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.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java index 193973a..5943e8d 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java @@ -35,10 +35,10 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.MutationsRejectedException; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.client.security.tokens.PasswordToken; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java ---------------------------------------------------------------------- diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java index d21f957..7c62384 100644 --- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java @@ -30,8 +30,8 @@ import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.IteratorSetting; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java index 680268e..b3e7639 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java @@ -49,7 +49,6 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.MutationsRejectedException; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.ScannerBase; import org.apache.accumulo.core.client.TableExistsException; @@ -58,6 +57,7 @@ import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.admin.ActiveCompaction; import org.apache.accumulo.core.client.admin.ActiveScan; import org.apache.accumulo.core.client.admin.CompactionConfig; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java index 7a4e551..48e9f74 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java @@ -26,9 +26,9 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; -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.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.client.impl.Tables; import org.apache.accumulo.core.conf.Property; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java index 2b7dada..b7637a6 100644 --- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -52,13 +52,13 @@ import org.apache.accumulo.core.client.ConditionalWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.IsolatedScanner; import org.apache.accumulo.core.client.IteratorSetting; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.RowIterator; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableDeletedException; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.TableOfflineException; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.data.ArrayByteSequence; import org.apache.accumulo.core.data.ByteSequence; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java b/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java index 61d9e82..8f88268 100644 --- a/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java +++ b/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java @@ -22,9 +22,9 @@ import java.util.Map.Entry; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java index c246a68..f5ae882 100644 --- a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java @@ -46,11 +46,11 @@ import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.NamespaceExistsException; import org.apache.accumulo.core.client.NamespaceNotEmptyException; import org.apache.accumulo.core.client.NamespaceNotFoundException; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.admin.NamespaceOperations; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.client.impl.Namespaces; import org.apache.accumulo.core.client.impl.Tables; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/test/src/test/java/org/apache/accumulo/test/VolumeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java index 7f1f921..2bb165c 100644 --- a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java @@ -40,12 +40,12 @@ import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.MutationsRejectedException; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.admin.DiskUsage; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java index e36ac09..a20291b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java @@ -21,8 +21,8 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java index 78591dd..998feaf 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java @@ -28,8 +28,8 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e59c073/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java index 6e7aabe..25061c9 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java @@ -31,8 +31,8 @@ import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.IteratorSetting; -import org.apache.accumulo.core.client.NewTableConfiguration; import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key;
