accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Date Fri, 01 May 2015 21:54:51 GMT
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/87af7f6d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/87af7f6d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/87af7f6d

Branch: refs/heads/master
Commit: 87af7f6d8c876bcffb67f01a4072427de6288bed
Parents: 086c6ac e7fc66c
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Fri May 1 17:54:39 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Fri May 1 17:54:39 2015 -0400

----------------------------------------------------------------------
 core/pom.xml                                    |   8 +-
 .../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 ----
 .../core/iterators/SortedKeyValueIterator.java  |   8 +
 .../org/apache/accumulo/core/trace/Span.java    |  87 +---
 .../apache/accumulo/core/conf/config-header.txt |   9 +
 core/src/main/scripts/generate-thrift.sh        |   6 +-
 .../accumulo/core/cli/TestClientOpts.java       |   5 +
 .../main/asciidoc/chapters/administration.txt   |  24 +
 .../main/asciidoc/chapters/iterator_design.txt  |  27 +-
 .../client/CountingVerifyingReceiver.java       |  64 +++
 .../simple/client/RandomBatchScanner.java       |  40 +-
 pom.xml                                         |  23 +-
 .../server/rpc/TNonblockingServerSocket.java    |   2 +-
 .../server/security/SecurityOperation.java      |   3 +-
 .../server/security/handler/ZKPermHandler.java  |   5 +-
 .../accumulo/server/util/RestoreZookeeper.java  |   2 +
 .../accumulo/server/util/TableDiskUsage.java    |   2 +-
 .../gc/GarbageCollectWriteAheadLogs.java        |   2 +-
 .../java/org/apache/accumulo/master/Master.java |   7 +
 .../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  | 160 +-----
 .../master/tableOps/CompactionDriver.java       | 188 +++++++
 .../master/tableOps/CompleteBulkImport.java     |  45 ++
 .../accumulo/master/tableOps/CopyFailed.java    | 161 ++++++
 .../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     | 114 ++++
 .../accumulo/master/tableOps/MasterRepo.java    |   3 -
 .../master/tableOps/MoveExportedFiles.java      |  74 +++
 .../master/tableOps/NamespaceCleanUp.java       |  75 +++
 .../accumulo/master/tableOps/NamespaceInfo.java |  31 ++
 .../master/tableOps/PopulateMetadata.java       |  54 ++
 .../master/tableOps/PopulateMetadataTable.java  | 220 ++++++++
 .../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  |  48 +-
 .../master/tableOps/TableRangeOpWait.java       |  72 +++
 .../apache/accumulo/master/tableOps/Utils.java  |   4 +-
 .../master/tableOps/WriteExportFiles.java       | 268 ++++++++++
 .../monitor/servlets/trace/ShowTrace.java       |  10 +-
 .../accumulo/monitor/ShowTraceLinkTypeTest.java |   3 +-
 server/native/pom.xml                           |   1 +
 server/native/src/main/resources/Makefile       |   3 +-
 .../accumulo/tracer/AsyncSpanReceiver.java      |  13 +-
 .../accumulo/tracer/SendSpansViaThrift.java     |   9 +-
 .../apache/accumulo/tracer/TraceFormatter.java  |   9 +-
 .../apache/accumulo/tracer/ZooTraceClient.java  |   3 +-
 .../accumulo/tracer/thrift/RemoteSpan.java      |  68 +--
 server/tracer/src/main/thrift/tracer.thrift     |   4 +-
 .../apache/accumulo/tserver/InMemoryMap.java    | 119 -----
 .../accumulo/tserver/MemKeyComparator.java      |  44 ++
 .../tserver/MemKeyConversionIterator.java       |  96 ++++
 .../PartialMutationSkippingIterator.java        |  54 ++
 .../apache/accumulo/tserver/TabletServer.java   |   4 +
 .../tserver/log/TabletServerLogger.java         |   8 +
 .../accumulo/tserver/scan/NextBatchTask.java    |   2 +-
 .../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 --
 .../apache/accumulo/trace/instrument/Span.java  |  20 +-
 102 files changed, 4604 insertions(+), 3438 deletions(-)
----------------------------------------------------------------------



Mime
View raw message