You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ed...@apache.org on 2015/07/26 06:15:25 UTC
[2/2] accumulo git commit: Merge branch '1.6' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b83f88ca
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b83f88ca
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b83f88ca
Branch: refs/heads/1.6
Commit: b83f88caf758ee9561d5041cc8d6fac3e6a68f62
Parents: d55489a 967100d
Author: Ed Coleman <de...@etcoleman.com>
Authored: Sun Jul 26 00:13:45 2015 -0400
Committer: Ed Coleman <de...@etcoleman.com>
Committed: Sun Jul 26 00:13:45 2015 -0400
----------------------------------------------------------------------
CHANGES | 1069 ------------------
assemble/bin/accumulo | 5 -
assemble/bin/build_native_library.sh | 28 +-
assemble/bin/config.sh | 9 +
assemble/bin/start-server.sh | 4 +-
assemble/bin/stop-here.sh | 2 +-
assemble/build.sh | 85 +-
assemble/pom.xml | 2 +-
assemble/src/main/assemblies/component.xml | 1 -
.../main/scripts/generate-example-configs.sh | 7 +-
core/.gitignore | 1 +
core/pom.xml | 2 +-
.../accumulo/core/client/BatchScanner.java | 4 +
.../core/client/ClientConfiguration.java | 9 +
.../accumulo/core/client/ScannerBase.java | 21 +
.../client/impl/NamespaceOperationsImpl.java | 11 +-
.../core/client/impl/TableOperationsImpl.java | 30 +-
.../core/client/impl/thrift/ClientService.java | 122 +-
.../client/impl/thrift/ConfigurationType.java | 2 +-
.../client/impl/thrift/SecurityErrorCode.java | 2 +-
.../core/client/impl/thrift/TDiskUsage.java | 4 +-
.../core/client/impl/thrift/TableOperation.java | 2 +-
.../thrift/TableOperationExceptionType.java | 2 +-
.../impl/thrift/ThriftSecurityException.java | 4 +-
.../thrift/ThriftTableOperationException.java | 4 +-
.../core/client/impl/thrift/ThriftTest.java | 14 +-
.../client/mapred/AccumuloOutputFormat.java | 1 +
.../client/mapreduce/AccumuloOutputFormat.java | 1 +
.../core/client/mapreduce/RangeInputSplit.java | 2 +-
.../lib/impl/DistributedCacheHelper.java | 7 +-
.../accumulo/core/client/mock/MockShell.java | 9 +
.../conf/CredentialProviderFactoryShim.java | 22 +-
.../org/apache/accumulo/core/data/Mutation.java | 43 +-
.../core/data/thrift/InitialMultiScan.java | 4 +-
.../accumulo/core/data/thrift/InitialScan.java | 4 +-
.../accumulo/core/data/thrift/IterInfo.java | 4 +-
.../accumulo/core/data/thrift/MapFileInfo.java | 4 +-
.../core/data/thrift/MultiScanResult.java | 4 +-
.../accumulo/core/data/thrift/ScanResult.java | 4 +-
.../accumulo/core/data/thrift/TCMResult.java | 4 +-
.../accumulo/core/data/thrift/TCMStatus.java | 2 +-
.../accumulo/core/data/thrift/TColumn.java | 4 +-
.../accumulo/core/data/thrift/TCondition.java | 4 +-
.../core/data/thrift/TConditionalMutation.java | 4 +-
.../core/data/thrift/TConditionalSession.java | 4 +-
.../thrift/TConstraintViolationSummary.java | 4 +-
.../apache/accumulo/core/data/thrift/TKey.java | 4 +-
.../accumulo/core/data/thrift/TKeyExtent.java | 4 +-
.../accumulo/core/data/thrift/TKeyValue.java | 4 +-
.../accumulo/core/data/thrift/TMutation.java | 4 +-
.../accumulo/core/data/thrift/TRange.java | 4 +-
.../accumulo/core/data/thrift/UpdateErrors.java | 4 +-
.../core/gc/thrift/GCMonitorService.java | 6 +-
.../accumulo/core/gc/thrift/GCStatus.java | 4 +-
.../accumulo/core/gc/thrift/GcCycleStats.java | 4 +-
.../core/iterators/AggregatingIterator.java | 18 +-
.../conf/AggregatorConfiguration.java | 3 +-
.../aggregation/conf/AggregatorSet.java | 7 +-
.../system/SourceSwitchingIterator.java | 59 +-
.../accumulo/core/master/thrift/Compacting.java | 4 +-
.../accumulo/core/master/thrift/DeadServer.java | 4 +-
.../core/master/thrift/FateOperation.java | 2 +-
.../core/master/thrift/FateService.java | 18 +-
.../core/master/thrift/MasterClientService.java | 54 +-
.../core/master/thrift/MasterGoalState.java | 2 +-
.../core/master/thrift/MasterMonitorInfo.java | 4 +-
.../core/master/thrift/MasterState.java | 2 +-
.../core/master/thrift/RecoveryException.java | 4 +-
.../core/master/thrift/RecoveryStatus.java | 4 +-
.../accumulo/core/master/thrift/TableInfo.java | 4 +-
.../core/master/thrift/TabletLoadState.java | 2 +-
.../core/master/thrift/TabletServerStatus.java | 4 +-
.../core/master/thrift/TabletSplit.java | 4 +-
.../core/security/thrift/TCredentials.java | 4 +-
.../core/tabletserver/thrift/ActionStats.java | 4 +-
.../tabletserver/thrift/ActiveCompaction.java | 4 +-
.../core/tabletserver/thrift/ActiveScan.java | 4 +-
.../tabletserver/thrift/CompactionReason.java | 2 +-
.../tabletserver/thrift/CompactionType.java | 2 +-
.../thrift/ConstraintViolationException.java | 4 +-
.../tabletserver/thrift/IteratorConfig.java | 4 +-
.../thrift/NoSuchScanIDException.java | 4 +-
.../thrift/NotServingTabletException.java | 4 +-
.../core/tabletserver/thrift/ScanState.java | 2 +-
.../core/tabletserver/thrift/ScanType.java | 2 +-
.../tabletserver/thrift/TIteratorSetting.java | 4 +-
.../thrift/TabletClientService.java | 100 +-
.../core/tabletserver/thrift/TabletStats.java | 4 +-
.../thrift/TooManyFilesException.java | 4 +-
.../accumulo/core/trace/DistributedTrace.java | 2 +-
.../accumulo/core/trace/ZooTraceClient.java | 4 +-
.../apache/accumulo/core/util/shell/Shell.java | 40 +-
.../core/util/shell/ShellOptionsJC.java | 12 +
.../util/shell/commands/AddSplitsCommand.java | 17 +-
.../core/util/shell/commands/DUCommand.java | 13 +-
.../util/shell/commands/GetAuthsCommand.java | 19 +-
core/src/main/scripts/generate-thrift.sh | 50 +-
.../mapred/AccumuloFileOutputFormatTest.java | 6 +-
.../client/mapred/AccumuloInputFormatTest.java | 5 +-
.../AccumuloMultiTableInputFormatTest.java | 7 +-
.../client/mapred/AccumuloOutputFormatTest.java | 7 +-
.../mapred/AccumuloRowInputFormatTest.java | 7 +-
.../core/client/mapred/TokenFileTest.java | 1 +
.../mapreduce/AccumuloFileOutputFormatTest.java | 6 +-
.../mapreduce/AccumuloInputFormatTest.java | 12 +-
.../AccumuloMultiTableInputFormatTest.java | 7 +-
.../mapreduce/AccumuloOutputFormatTest.java | 7 +-
.../mapreduce/AccumuloRowInputFormatTest.java | 7 +-
.../core/client/mapreduce/TokenFileTest.java | 1 +
.../apache/accumulo/core/data/MutationTest.java | 28 +
.../core/iterators/AggregatingIteratorTest.java | 6 +-
.../conf/AggregatorConfigurationTest.java | 13 +-
.../core/util/shell/ShellConfigTest.java | 46 +-
.../core/util/shell/ShellSetInstanceTest.java | 15 +-
.../shell/commands/GetAuthsCommandTest.java | 44 +
docs/pom.xml | 2 +-
.../chapters/table_configuration.tex | 8 +-
docs/src/main/resources/administration.html | 16 +-
examples/simple/.gitignore | 1 +
examples/simple/pom.xml | 2 +-
.../simple/mapreduce/bulk/VerifyIngest.java | 18 +-
.../simple/filedata/ChunkInputFormatTest.java | 5 +-
fate/.gitignore | 1 +
fate/pom.xml | 2 +-
maven-plugin/.gitignore | 1 +
maven-plugin/pom.xml | 76 +-
minicluster/pom.xml | 2 +-
.../accumulo/cluster/RemoteShellOptions.java | 2 +-
.../impl/MiniAccumuloClusterControl.java | 31 +-
.../impl/MiniAccumuloClusterImpl.java | 4 +
.../impl/MiniAccumuloConfigImpl.java | 7 +
pom.xml | 12 +-
proxy/pom.xml | 7 +-
.../org/apache/accumulo/proxy/ProxyServer.java | 16 +-
.../proxy/thrift/AccumuloException.java | 4 +-
.../accumulo/proxy/thrift/AccumuloProxy.java | 308 ++---
.../proxy/thrift/AccumuloSecurityException.java | 4 +-
.../accumulo/proxy/thrift/ActiveCompaction.java | 4 +-
.../accumulo/proxy/thrift/ActiveScan.java | 4 +-
.../accumulo/proxy/thrift/BatchScanOptions.java | 4 +-
.../apache/accumulo/proxy/thrift/Column.java | 4 +-
.../accumulo/proxy/thrift/ColumnUpdate.java | 4 +-
.../accumulo/proxy/thrift/CompactionReason.java | 2 +-
.../accumulo/proxy/thrift/CompactionType.java | 2 +-
.../apache/accumulo/proxy/thrift/Condition.java | 4 +-
.../proxy/thrift/ConditionalStatus.java | 2 +-
.../proxy/thrift/ConditionalUpdates.java | 4 +-
.../proxy/thrift/ConditionalWriterOptions.java | 4 +-
.../apache/accumulo/proxy/thrift/DiskUsage.java | 4 +-
.../accumulo/proxy/thrift/IteratorScope.java | 2 +-
.../accumulo/proxy/thrift/IteratorSetting.java | 4 +-
.../org/apache/accumulo/proxy/thrift/Key.java | 4 +-
.../apache/accumulo/proxy/thrift/KeyExtent.java | 4 +-
.../apache/accumulo/proxy/thrift/KeyValue.java | 4 +-
.../accumulo/proxy/thrift/KeyValueAndPeek.java | 4 +-
.../thrift/MutationsRejectedException.java | 4 +-
.../proxy/thrift/NoMoreEntriesException.java | 4 +-
.../accumulo/proxy/thrift/PartialKey.java | 2 +-
.../org/apache/accumulo/proxy/thrift/Range.java | 4 +-
.../accumulo/proxy/thrift/ScanColumn.java | 4 +-
.../accumulo/proxy/thrift/ScanOptions.java | 4 +-
.../accumulo/proxy/thrift/ScanResult.java | 4 +-
.../apache/accumulo/proxy/thrift/ScanState.java | 2 +-
.../apache/accumulo/proxy/thrift/ScanType.java | 2 +-
.../accumulo/proxy/thrift/SystemPermission.java | 2 +-
.../proxy/thrift/TableExistsException.java | 4 +-
.../proxy/thrift/TableNotFoundException.java | 4 +-
.../accumulo/proxy/thrift/TablePermission.java | 2 +-
.../apache/accumulo/proxy/thrift/TimeType.java | 2 +-
.../accumulo/proxy/thrift/UnknownScanner.java | 4 +-
.../accumulo/proxy/thrift/UnknownWriter.java | 4 +-
.../accumulo/proxy/thrift/WriterOptions.java | 4 +-
.../apache/accumulo/proxy/ProxyServerTest.java | 114 ++
server/base/pom.xml | 2 +-
.../server/conf/ServerConfigurationFactory.java | 31 +-
.../apache/accumulo/server/init/Initialize.java | 2 +-
.../tabletserver/LargestFirstMemoryManager.java | 24 +-
.../accumulo/server/util/RestoreZookeeper.java | 2 +
server/gc/pom.xml | 2 +-
server/master/pom.xml | 2 +-
.../java/org/apache/accumulo/master/Master.java | 11 +-
.../accumulo/master/TabletGroupWatcher.java | 6 +
.../accumulo/master/tableOps/CloneTable.java | 13 +-
.../accumulo/master/tableOps/ImportTable.java | 4 +
server/monitor/pom.xml | 2 +-
.../accumulo/monitor/EmbeddedWebServer.java | 20 +-
.../org/apache/accumulo/monitor/Monitor.java | 22 +
.../accumulo/monitor/servlets/BasicServlet.java | 20 +-
server/native/pom.xml | 2 +-
server/native/src/main/resources/Makefile | 9 +-
server/tracer/.gitignore | 1 +
server/tracer/pom.xml | 2 +-
server/tserver/pom.xml | 2 +-
.../org/apache/accumulo/tserver/Tablet.java | 16 +-
.../apache/accumulo/tserver/TabletServer.java | 90 +-
.../tserver/log/LocalWALRecoveryTest.java | 2 +-
start/pom.xml | 2 +-
test/pom.xml | 2 +-
.../randomwalk/concurrent/CheckBalance.java | 109 --
.../concurrent/ConcurrentFixture.java | 2 -
.../test/randomwalk/concurrent/Config.java | 2 +-
.../accumulo/test/AccumuloOutputFormatIT.java | 125 ++
.../test/DetectDeadTabletServersIT.java | 96 ++
.../accumulo/test/functional/ExamplesIT.java | 2 +
.../accumulo/test/functional/ScanIdIT.java | 18 +-
test/system/continuous/run-verify.sh | 2 +-
.../randomwalk/conf/modules/Concurrent.xml | 5 -
trace/.gitignore | 1 +
trace/pom.xml | 2 +-
.../instrument/receivers/AsyncSpanReceiver.java | 22 +-
.../receivers/SendSpansViaThrift.java | 9 +-
.../instrument/receivers/ZooSpanClient.java | 4 +-
.../accumulo/trace/thrift/RemoteSpan.java | 4 +-
.../accumulo/trace/thrift/SpanReceiver.java | 4 +-
.../org/apache/accumulo/trace/thrift/TInfo.java | 4 +-
.../accumulo/trace/thrift/TestService.java | 6 +-
trace/src/main/scripts/generate-thrift.sh | 4 +
217 files changed, 1789 insertions(+), 2038 deletions(-)
----------------------------------------------------------------------