Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7de08b7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a7de08b7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a7de08b7 Branch: refs/heads/master Commit: a7de08b7cadfbb328876993c281cad26f444f29e Parents: 26d6691 6e2e678 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Apr 28 20:32:42 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Apr 28 20:32:42 2015 -0400 ---------------------------------------------------------------------- .../core/client/impl/OfflineIterator.java | 340 ++++++++++++ .../core/client/impl/OfflineScanner.java | 314 ----------- .../core/compaction/CompactionSettings.java | 42 -- .../accumulo/core/compaction/PatternType.java | 28 + .../accumulo/core/compaction/SizeType.java | 30 ++ .../accumulo/core/compaction/StringType.java | 24 + .../apache/accumulo/core/compaction/Type.java | 21 + .../accumulo/core/compaction/UIntType.java | 27 + .../core/file/DispatchingFileFactory.java | 136 +++++ .../accumulo/core/file/FileOperations.java | 106 ---- .../accumulo/core/cli/TestClientOpts.java | 5 + .../client/CountingVerifyingReceiver.java | 64 +++ .../simple/client/RandomBatchScanner.java | 38 -- pom.xml | 1 + .../accumulo/master/tableOps/BulkImport.java | 363 ------------- .../master/tableOps/CancelCompactions.java | 23 - .../accumulo/master/tableOps/ChooseDir.java | 53 ++ .../accumulo/master/tableOps/CleanUp.java | 287 ++++++++++ .../master/tableOps/CleanUpBulkImport.java | 64 +++ .../accumulo/master/tableOps/CloneInfo.java | 36 ++ .../accumulo/master/tableOps/CloneMetadata.java | 54 ++ .../master/tableOps/ClonePermissions.java | 73 +++ .../accumulo/master/tableOps/CloneTable.java | 195 ------- .../master/tableOps/CloneZookeeper.java | 76 +++ .../accumulo/master/tableOps/CompactRange.java | 159 ------ .../master/tableOps/CompactionDriver.java | 188 +++++++ .../master/tableOps/CompleteBulkImport.java | 45 ++ .../accumulo/master/tableOps/CopyFailed.java | 158 ++++++ .../accumulo/master/tableOps/CreateDir.java | 51 ++ .../master/tableOps/CreateImportDir.java | 61 +++ .../master/tableOps/CreateNamespace.java | 137 ----- .../accumulo/master/tableOps/CreateTable.java | 251 --------- .../master/tableOps/DeleteNamespace.java | 55 -- .../accumulo/master/tableOps/DeleteTable.java | 265 ---------- .../accumulo/master/tableOps/ExportInfo.java | 29 ++ .../accumulo/master/tableOps/ExportTable.java | 257 --------- .../master/tableOps/FinishCancelCompaction.java | 40 ++ .../master/tableOps/FinishCloneTable.java | 64 +++ .../master/tableOps/FinishCreateNamespace.java | 58 +++ .../master/tableOps/FinishCreateTable.java | 62 +++ .../master/tableOps/FinishImportTable.java | 68 +++ .../tableOps/ImportPopulateZookeeper.java | 104 ++++ .../master/tableOps/ImportSetupPermissions.java | 65 +++ .../accumulo/master/tableOps/ImportTable.java | 521 ------------------- .../master/tableOps/ImportedTableInfo.java | 31 ++ .../accumulo/master/tableOps/LoadFiles.java | 209 ++++++++ .../master/tableOps/MapImportFileNames.java | 111 ++++ .../master/tableOps/MoveExportedFiles.java | 71 +++ .../master/tableOps/NamespaceCleanUp.java | 75 +++ .../accumulo/master/tableOps/NamespaceInfo.java | 31 ++ .../master/tableOps/PopulateMetadata.java | 54 ++ .../master/tableOps/PopulateMetadataTable.java | 217 ++++++++ .../master/tableOps/PopulateZookeeper.java | 77 +++ .../PopulateZookeeperWithNamespace.java | 74 +++ .../tableOps/SetupNamespacePermissions.java | 55 ++ .../master/tableOps/SetupPermissions.java | 63 +++ .../accumulo/master/tableOps/TableInfo.java | 35 ++ .../accumulo/master/tableOps/TableRangeOp.java | 45 -- .../master/tableOps/TableRangeOpWait.java | 69 +++ .../master/tableOps/WriteExportFiles.java | 268 ++++++++++ .../apache/accumulo/tserver/InMemoryMap.java | 119 ----- .../accumulo/tserver/MemKeyComparator.java | 44 ++ .../tserver/MemKeyConversionIterator.java | 96 ++++ .../PartialMutationSkippingIterator.java | 54 ++ .../accumulo/test/EstimateInMemMapOverhead.java | 317 ----------- .../test/InMemoryMapMemoryUsageTest.java | 102 ++++ .../accumulo/test/IntObjectMemoryUsageTest.java | 65 +++ .../apache/accumulo/test/MemoryUsageTest.java | 64 +++ .../accumulo/test/MutationMemoryUsageTest.java | 98 ++++ .../accumulo/test/TextMemoryUsageTest.java | 82 +++ .../accumulo/test/continuous/HistData.java | 49 ++ .../accumulo/test/continuous/Histogram.java | 30 -- 72 files changed, 4406 insertions(+), 3237 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a7de08b7/pom.xml ----------------------------------------------------------------------
