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 2015/04/25 01:21:12 UTC
[26/34] accumulo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb25f3b1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb25f3b1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb25f3b1
Branch: refs/heads/master
Commit: fb25f3b15ac0ca4262ac5c8664cea1ff81246bb6
Parents: f43b216 33ef1e0
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Apr 22 11:36:52 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Apr 22 11:36:52 2015 -0400
----------------------------------------------------------------------
README.md | 30 +-
core/pom.xml | 57 ++
core/src/main/findbugs/exclude-filter.xml | 1 +
.../apache/accumulo/core/cli/ClientOpts.java | 5 +-
.../core/client/ClientConfiguration.java | 50 +-
.../core/client/ClientSideIteratorScanner.java | 27 +-
.../accumulo/core/client/IsolatedScanner.java | 4 +-
.../core/client/MutationsRejectedException.java | 68 +-
.../accumulo/core/client/ZooKeeperInstance.java | 21 +-
.../core/client/admin/ActiveCompaction.java | 12 +-
.../accumulo/core/client/admin/ActiveScan.java | 12 +-
.../client/admin/DelegationTokenConfig.java | 4 +-
.../core/client/admin/SecurityOperations.java | 3 +-
.../core/client/impl/ActiveCompactionImpl.java | 19 +-
.../core/client/impl/ActiveScanImpl.java | 14 +-
.../impl/AuthenticationTokenIdentifier.java | 210 +++++
.../core/client/impl/ClientContext.java | 1 -
.../core/client/impl/ConditionalWriterImpl.java | 2 +-
.../accumulo/core/client/impl/Credentials.java | 157 ++++
.../core/client/impl/DelegationTokenImpl.java | 144 ++++
.../client/impl/InstanceOperationsImpl.java | 18 +
.../client/impl/NamespaceOperationsImpl.java | 1 -
.../core/client/impl/OfflineScanner.java | 3 +-
.../core/client/impl/RootTabletLocator.java | 2 +-
.../client/impl/SecurityOperationsImpl.java | 4 +-
.../core/client/impl/TableOperationsImpl.java | 2 +-
.../core/client/impl/TabletLocator.java | 2 +-
.../core/client/impl/TabletLocatorImpl.java | 2 +-
.../impl/TabletServerBatchReaderIterator.java | 2 +-
.../client/impl/TabletServerBatchWriter.java | 8 +-
.../accumulo/core/client/impl/TabletType.java | 2 +-
.../core/client/impl/ThriftScanner.java | 2 +-
.../core/client/impl/TimeoutTabletLocator.java | 2 +-
.../accumulo/core/client/impl/Translator.java | 2 +-
.../accumulo/core/client/impl/Writer.java | 2 +-
.../core/client/mapred/AbstractInputFormat.java | 78 +-
.../client/mapred/AccumuloFileOutputFormat.java | 5 +-
.../client/mapred/AccumuloOutputFormat.java | 23 +-
.../client/mapreduce/AbstractInputFormat.java | 82 +-
.../mapreduce/AccumuloFileOutputFormat.java | 5 +-
.../client/mapreduce/AccumuloOutputFormat.java | 21 +-
.../core/client/mapreduce/RangeInputSplit.java | 24 +-
.../mapreduce/impl/AccumuloInputSplit.java | 73 +-
.../client/mapreduce/impl/BatchInputSplit.java | 21 +-
.../core/client/mapreduce/impl/SplitUtils.java | 59 ++
.../mapreduce/lib/impl/ConfiguratorBase.java | 16 +-
.../mapreduce/lib/impl/InputConfigurator.java | 8 +-
.../core/client/mock/MockConnector.java | 2 +-
.../accumulo/core/client/mock/MockInstance.java | 2 +-
.../client/mock/impl/MockTabletLocator.java | 2 +-
.../client/security/tokens/DelegationToken.java | 134 +---
.../accumulo/core/constraints/Constraint.java | 2 +-
.../core/constraints/VisibilityConstraint.java | 93 +++
.../accumulo/core/data/ComparableBytes.java | 5 +
.../apache/accumulo/core/data/KeyExtent.java | 717 +++--------------
.../org/apache/accumulo/core/data/TabletID.java | 29 +
.../core/data/impl/ComparableBytes.java | 53 ++
.../accumulo/core/data/impl/KeyExtent.java | 768 +++++++++++++++++++
.../accumulo/core/data/impl/TabletIDImpl.java | 100 +++
.../accumulo/core/iterators/IteratorUtil.java | 40 +-
.../core/iterators/system/MultiIterator.java | 2 +-
.../core/metadata/MetadataLocationObtainer.java | 2 +-
.../core/metadata/MetadataServicer.java | 2 +-
.../accumulo/core/metadata/RootTable.java | 2 +-
.../core/metadata/ServicerForRootTable.java | 2 +-
.../core/metadata/TableMetadataServicer.java | 2 +-
.../ReplicationConfigurationUtil.java | 2 +-
.../rpc/SaslClientDigestCallbackHandler.java | 4 +-
.../accumulo/core/rpc/SaslConnectionParams.java | 6 +-
.../security/AuthenticationTokenIdentifier.java | 210 -----
.../accumulo/core/security/Credentials.java | 157 ----
.../core/security/VisibilityConstraint.java | 76 +-
.../core/security/VisibilityEvaluator.java | 10 +-
.../core/tabletserver/log/LogEntry.java | 2 +-
.../org/apache/accumulo/core/util/Merge.java | 2 +-
.../core/client/ClientConfigurationTest.java | 51 +-
.../core/client/impl/ScannerImplTest.java | 1 -
.../client/impl/TableOperationsImplTest.java | 3 +-
.../core/client/impl/TabletLocatorImplTest.java | 3 +-
.../impl/TabletServerBatchReaderTest.java | 1 -
.../mapred/AccumuloFileOutputFormatTest.java | 5 +-
.../core/client/mapred/TokenFileTest.java | 2 +-
.../mapreduce/AccumuloFileOutputFormatTest.java | 5 +-
.../core/client/mapreduce/TokenFileTest.java | 2 +-
.../tokens/DelegationTokenImplTest.java | 73 ++
.../security/tokens/DelegationTokenTest.java | 72 --
.../accumulo/core/data/KeyExtentTest.java | 1 +
.../apache/accumulo/core/data/RangeTest.java | 1 +
.../accumulo/core/file/rfile/RFileTest.java | 2 +-
.../core/iterators/IteratorUtilTest.java | 2 +-
.../iterators/system/MultiIteratorTest.java | 2 +-
.../core/metadata/MetadataServicerTest.java | 2 +-
.../ReplicationConfigurationUtilTest.java | 2 +-
.../core/rpc/SaslConnectionParamsTest.java | 12 +-
.../AuthenticationTokenIdentifierTest.java | 1 +
.../accumulo/core/security/CredentialsTest.java | 1 +
.../core/security/VisibilityConstraintTest.java | 1 +
.../apache/accumulo/core/util/MergeTest.java | 2 +-
.../src/test/resources/multi-valued.client.conf | 17 +
.../simple/client/RandomBatchWriter.java | 6 +-
minicluster/pom.xml | 29 +
.../minicluster/MiniAccumuloInstance.java | 5 +-
.../impl/MiniAccumuloClusterImpl.java | 2 +-
pom.xml | 5 +
.../org/apache/accumulo/proxy/ProxyServer.java | 11 +-
.../accumulo/server/AccumuloServerContext.java | 2 +-
.../accumulo/server/client/BulkImporter.java | 2 +-
.../server/client/ClientServiceHandler.java | 2 +-
.../accumulo/server/client/HdfsZooInstance.java | 6 +-
.../server/conf/ServerConfiguration.java | 2 +-
.../server/conf/ServerConfigurationFactory.java | 2 +-
.../server/constraints/MetadataConstraints.java | 2 +-
.../accumulo/server/fs/VolumeManagerImpl.java | 2 +-
.../apache/accumulo/server/fs/VolumeUtil.java | 2 +-
.../apache/accumulo/server/init/Initialize.java | 2 +-
.../accumulo/server/master/LiveTServerSet.java | 2 +-
.../master/balancer/ChaoticLoadBalancer.java | 2 +-
.../master/balancer/DefaultLoadBalancer.java | 2 +-
.../server/master/balancer/GroupBalancer.java | 2 +-
.../master/balancer/RegexGroupBalancer.java | 2 +-
.../master/balancer/TableLoadBalancer.java | 2 +-
.../server/master/balancer/TabletBalancer.java | 2 +-
.../server/master/state/Assignment.java | 2 +-
.../server/master/state/CurrentState.java | 2 +-
.../accumulo/server/master/state/MergeInfo.java | 2 +-
.../master/state/MetaDataTableScanner.java | 2 +-
.../master/state/TabletLocationState.java | 2 +-
.../server/master/state/TabletMigration.java | 2 +-
.../master/state/TabletStateChangeIterator.java | 2 +-
.../rpc/SaslServerDigestCallbackHandler.java | 2 +-
.../TCredentialsUpdatingInvocationHandler.java | 4 +-
.../security/AuditedSecurityOperation.java | 4 +-
.../server/security/SecurityOperation.java | 2 +-
.../server/security/SystemCredentials.java | 2 +-
.../AuthenticationTokenSecretManager.java | 6 +-
.../security/handler/KerberosAuthenticator.java | 4 +-
.../tabletserver/LargestFirstMemoryManager.java | 2 +-
.../tabletserver/MemoryManagementActions.java | 2 +-
.../server/tabletserver/MemoryManager.java | 2 +-
.../server/tabletserver/TabletState.java | 2 +-
.../org/apache/accumulo/server/util/Admin.java | 2 +-
.../server/util/CheckForMetadataProblems.java | 2 +-
.../apache/accumulo/server/util/FileUtil.java | 2 +-
.../server/util/FindOfflineTablets.java | 2 +-
.../server/util/MasterMetadataUtil.java | 2 +-
.../accumulo/server/util/MetadataTableUtil.java | 4 +-
.../util/RemoveEntriesForMissingFiles.java | 4 +-
.../server/util/ReplicationTableUtil.java | 4 +-
.../accumulo/server/util/TableDiskUsage.java | 2 +-
.../accumulo/server/util/TabletIterator.java | 2 +-
.../server/util/VerifyTabletAssignments.java | 4 +-
.../server/AccumuloServerContextTest.java | 2 +-
.../server/client/BulkImporterTest.java | 4 +-
.../balancer/ChaoticLoadBalancerTest.java | 2 +-
.../balancer/DefaultLoadBalancerTest.java | 2 +-
.../master/balancer/GroupBalancerTest.java | 2 +-
.../master/balancer/TableLoadBalancerTest.java | 2 +-
.../server/master/state/MergeInfoTest.java | 2 +-
.../master/state/TabletLocationStateTest.java | 2 +-
.../rpc/SaslDigestCallbackHandlerTest.java | 2 +-
.../server/security/SystemCredentialsTest.java | 2 +-
.../AuthenticationTokenSecretManagerTest.java | 2 +-
.../apache/accumulo/server/util/CloneTest.java | 2 +-
.../server/util/ReplicationTableUtilTest.java | 4 +-
.../server/util/TabletIteratorTest.java | 2 +-
.../accumulo/gc/GarbageCollectionAlgorithm.java | 2 +-
.../accumulo/gc/GarbageCollectionTest.java | 2 +-
.../accumulo/gc/SimpleGarbageCollectorTest.java | 2 +-
.../CloseWriteAheadLogReferencesTest.java | 1 +
.../java/org/apache/accumulo/master/Master.java | 2 +-
.../master/MasterClientServiceHandler.java | 4 +-
.../accumulo/master/TabletGroupWatcher.java | 2 +-
.../master/recovery/RecoveryManager.java | 2 +-
.../accumulo/master/state/MergeStats.java | 2 +-
.../accumulo/master/tableOps/BulkImport.java | 2 +-
.../accumulo/master/tableOps/CompactRange.java | 2 +-
.../accumulo/master/tableOps/CreateTable.java | 2 +-
.../accumulo/master/tableOps/DeleteTable.java | 2 +-
.../accumulo/master/tableOps/ExportTable.java | 2 +-
.../accumulo/master/tableOps/ImportTable.java | 2 +-
.../accumulo/master/tableOps/TableRangeOp.java | 2 +-
.../master/ReplicationOperationsImplTest.java | 4 +-
.../apache/accumulo/master/TestMergeState.java | 2 +-
.../replication/SequentialWorkAssignerTest.java | 2 +-
.../master/replication/StatusMakerTest.java | 2 +-
.../replication/UnorderedWorkAssignerTest.java | 2 +-
.../master/state/RootTabletStateStoreTest.java | 2 +-
.../monitor/servlets/TServersServlet.java | 2 +-
.../monitor/servlets/TablesServlet.java | 2 +-
.../tserver/ActiveAssignmentRunnable.java | 2 +-
.../tserver/ConditionalMutationSet.java | 2 +-
.../apache/accumulo/tserver/FileManager.java | 2 +-
.../org/apache/accumulo/tserver/RowLocks.java | 2 +-
.../apache/accumulo/tserver/TabletServer.java | 2 +-
.../tserver/TabletServerResourceManager.java | 2 +-
.../accumulo/tserver/TservConstraintEnv.java | 2 +-
.../apache/accumulo/tserver/WriteTracker.java | 2 +-
.../compaction/MajorCompactionRequest.java | 2 +-
.../tserver/constraints/ConstraintChecker.java | 2 +-
.../apache/accumulo/tserver/log/DfsLogger.java | 2 +-
.../accumulo/tserver/log/SortedLogRecovery.java | 2 +-
.../tserver/log/TabletServerLogger.java | 2 +-
.../accumulo/tserver/logger/LogFileKey.java | 2 +-
.../accumulo/tserver/logger/LogReader.java | 2 +-
.../mastermessage/SplitReportMessage.java | 2 +-
.../mastermessage/TabletStatusMessage.java | 2 +-
.../replication/AccumuloReplicaSystem.java | 2 +-
.../accumulo/tserver/scan/LookupTask.java | 2 +-
.../tserver/session/MultiScanSession.java | 2 +-
.../accumulo/tserver/session/ScanSession.java | 2 +-
.../accumulo/tserver/session/UpdateSession.java | 2 +-
.../accumulo/tserver/tablet/CommitSession.java | 2 +-
.../accumulo/tserver/tablet/CompactionInfo.java | 2 +-
.../accumulo/tserver/tablet/Compactor.java | 2 +-
.../tserver/tablet/DatafileManager.java | 2 +-
.../apache/accumulo/tserver/tablet/Tablet.java | 2 +-
.../tserver/tablet/TabletCommitter.java | 2 +-
.../LargestFirstMemoryManagerTest.java | 2 +-
.../accumulo/tserver/AssignmentWatcherTest.java | 2 +-
.../tserver/CheckTabletMetadataTest.java | 2 +-
.../tserver/TabletResourceManagerTest.java | 2 +-
.../DefaultCompactionStrategyTest.java | 2 +-
.../SizeLimitCompactionStrategyTest.java | 2 +-
.../ConfigurableCompactionStrategyTest.java | 2 +-
.../constraints/ConstraintCheckerTest.java | 2 +-
.../tserver/log/SortedLogRecoveryTest.java | 2 +-
.../accumulo/tserver/logger/LogFileTest.java | 2 +-
.../replication/AccumuloReplicaSystemTest.java | 2 +-
.../replication/ReplicationProcessorTest.java | 2 +-
.../accumulo/tserver/tablet/TabletTest.java | 2 +-
.../apache/accumulo/shell/ShellOptionsJC.java | 4 +-
.../commands/ActiveCompactionIterator.java | 2 +-
.../shell/commands/ActiveScanIterator.java | 2 +-
.../shell/commands/CreateTableCommand.java | 2 +-
.../shell/commands/GetSplitsCommand.java | 2 +-
.../accumulo/shell/commands/InsertCommand.java | 6 +-
.../accumulo/test/QueryMetadataTable.java | 2 +-
.../org/apache/accumulo/test/TestIngest.java | 6 +-
.../apache/accumulo/test/WrongTabletTest.java | 4 +-
.../continuous/ContinuousStatsCollector.java | 4 +-
.../metadata/MetadataBatchScanTest.java | 2 +-
.../performance/scan/CollectTabletStats.java | 4 +-
.../test/performance/thrift/NullTserver.java | 2 +-
.../randomwalk/security/AlterTablePerm.java | 2 +-
.../test/randomwalk/security/Authenticate.java | 2 +-
.../test/randomwalk/security/ChangePass.java | 2 +-
.../test/randomwalk/security/DropTable.java | 2 +-
.../test/randomwalk/security/SetAuths.java | 2 +-
.../randomwalk/security/WalkingSecurity.java | 2 +-
.../randomwalk/sequential/MapRedVerifyTool.java | 4 +-
.../StandaloneAccumuloClusterConfiguration.java | 3 +-
.../server/security/SystemCredentialsIT.java | 2 +-
.../test/MasterRepairsDualAssignmentIT.java | 4 +-
.../accumulo/test/MetaConstraintRetryIT.java | 4 +-
.../accumulo/test/MultiTableBatchWriterIT.java | 2 +-
.../org/apache/accumulo/test/NamespacesIT.java | 6 +-
.../org/apache/accumulo/test/ShellServerIT.java | 3 +-
.../apache/accumulo/test/SplitRecoveryIT.java | 2 +-
.../accumulo/test/TransportCachingIT.java | 2 +-
.../java/org/apache/accumulo/test/VolumeIT.java | 2 +-
.../test/functional/AccumuloInputFormatIT.java | 2 +-
.../functional/BalanceAfterCommsFailureIT.java | 2 +-
.../BalanceInPresenceOfOfflineTableIT.java | 2 +-
.../test/functional/ConfigurableMacIT.java | 3 +-
.../test/functional/DynamicThreadPoolsIT.java | 2 +-
.../accumulo/test/functional/KerberosIT.java | 37 +-
.../test/functional/MasterAssignmentIT.java | 4 +-
.../test/functional/MetadataMaxFilesIT.java | 2 +-
.../accumulo/test/functional/PermissionsIT.java | 2 +-
.../functional/SimpleBalancerFairnessIT.java | 2 +-
.../accumulo/test/functional/SplitIT.java | 2 +-
.../test/functional/SplitRecoveryIT.java | 2 +-
.../accumulo/test/functional/TableIT.java | 2 +-
.../functional/TabletStateChangeIteratorIT.java | 2 +-
...bageCollectorCommunicatesWithTServersIT.java | 2 +-
...UnusedWalDoesntCloseReplicationStatusIT.java | 2 +-
276 files changed, 2699 insertions(+), 1798 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
index 90ce692,7fe61d1..ab70bb0
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
@@@ -16,14 -16,14 +16,14 @@@
*/
package org.apache.accumulo.core.tabletserver.log;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import org.apache.accumulo.core.data.Key;
- import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Value;
+ import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.core.metadata.schema.MetadataSchema;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
----------------------------------------------------------------------
diff --cc server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
index 9fcfec9,3115de1..78a5bd5
--- a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
@@@ -48,9 -48,11 +48,10 @@@ import org.apache.accumulo.core.conf.Si
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
+ import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.CurrentLogsSection;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
import org.apache.accumulo.core.protobuf.ProtobufUtil;
import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
import org.apache.accumulo.core.replication.ReplicationTable;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
index 838cce8,a3c7e46..f1763be
--- a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
@@@ -25,12 -25,11 +25,12 @@@ import org.apache.accumulo.core.client.
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.data.Key;
- import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
+ import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.server.cli.ClientOpts;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/master/src/test/java/org/apache/accumulo/master/ReplicationOperationsImplTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 7d16aae,1d385d9..bc77ffb
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@@ -35,13 -33,11 +35,13 @@@ import java.util.concurrent.locks.ReadW
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.accumulo.core.client.Durability;
- import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Mutation;
+ import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.core.protobuf.ProtobufUtil;
import org.apache.accumulo.core.replication.ReplicationConfigurationUtil;
+import org.apache.accumulo.core.util.SimpleThreadPool;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.server.TabletLevel;
import org.apache.accumulo.server.conf.TableConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.replication.StatusUtil;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java
index 41b7795,d908f1d..dee705c
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java
@@@ -16,10 -16,11 +16,10 @@@
*/
package org.apache.accumulo.tserver.tablet;
-import java.util.ArrayList;
import java.util.List;
- import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Mutation;
+ import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.tserver.InMemoryMap;
import org.apache.accumulo.tserver.log.DfsLogger;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb25f3b1/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
----------------------------------------------------------------------