You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2017/05/23 12:22:58 UTC
[12/13] accumulo git commit: Merge branch 'master' into IGNITE
Merge branch 'master' into IGNITE
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81379f06
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81379f06
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81379f06
Branch: refs/heads/IGNITE
Commit: 81379f06f67b71b16e30fcbfa41370eae201b7db
Parents: a72c4f2 452732c
Author: Dave Marion <dl...@apache.org>
Authored: Mon May 22 15:44:36 2017 -0400
Committer: Dave Marion <dl...@apache.org>
Committed: Mon May 22 15:44:36 2017 -0400
----------------------------------------------------------------------
core/src/main/findbugs/exclude-filter.xml | 4 +-
.../apache/accumulo/core/cli/ClientOpts.java | 5 +-
.../accumulo/core/client/ZooKeeperInstance.java | 4 +-
.../core/client/impl/OfflineIterator.java | 5 +-
.../lib/impl/FileOutputConfigurator.java | 3 +-
.../core/client/mock/MockNamespace.java | 4 +-
.../core/client/mock/MockScannerBase.java | 10 +-
.../accumulo/core/client/mock/MockTable.java | 6 +-
.../core/client/mock/MockTableOperations.java | 4 +-
.../core/client/rfile/RFileScanner.java | 5 +-
.../client/rfile/RFileSummariesRetriever.java | 3 +-
.../core/client/rfile/RFileWriterBuilder.java | 3 +-
.../accumulo/core/compaction/SizeType.java | 4 +-
.../core/conf/AccumuloConfiguration.java | 208 +------------------
.../accumulo/core/conf/ConfigSanityCheck.java | 2 +-
.../core/conf/ConfigurationTypeHelper.java | 139 +++++++++++++
.../core/conf/DefaultConfiguration.java | 24 +--
.../accumulo/core/file/BloomFilterLayer.java | 3 +-
.../accumulo/core/file/rfile/CreateEmpty.java | 2 +-
.../apache/accumulo/core/file/rfile/RFile.java | 4 +-
.../accumulo/core/file/rfile/SplitLarge.java | 2 +-
.../iterators/user/RowEncodingIterator.java | 8 +-
.../iterators/user/TransformingIterator.java | 6 +-
.../accumulo/core/trace/DistributedTrace.java | 3 +-
.../core/client/mock/MockScannerTest.java | 103 +++++++++
.../client/mock/MockTableOperationsTest.java | 4 +-
.../accumulo/core/client/rfile/RFileTest.java | 4 +-
.../core/conf/AccumuloConfigurationTest.java | 73 +------
.../core/conf/ConfigurationTypeHelperTest.java | 118 +++++++++++
.../core/conf/DefaultConfigurationTest.java | 6 +-
.../apache/accumulo/core/conf/PropertyTest.java | 67 ++----
.../core/file/BloomFilterLayerLookupTest.java | 4 +-
.../accumulo/core/file/FileOperationsTest.java | 3 +-
.../blockfile/cache/BlockCacheFactoryTest.java | 6 +-
.../file/blockfile/cache/TestLruBlockCache.java | 12 +-
.../core/file/rfile/CreateCompatTestFile.java | 4 +-
.../core/file/rfile/MultiLevelIndexTest.java | 3 +-
.../core/file/rfile/MultiThreadedRFileTest.java | 5 +-
.../accumulo/core/file/rfile/RFileTest.java | 14 +-
.../iterators/DefaultIteratorEnvironment.java | 3 +-
.../iterators/user/IndexedDocIteratorTest.java | 4 +-
.../core/security/crypto/CryptoTest.java | 3 +-
.../standalone/StandaloneAccumuloCluster.java | 3 +-
.../impl/MiniAccumuloClusterImpl.java | 3 +-
.../impl/MiniAccumuloConfigImpl.java | 2 +-
.../java/org/apache/accumulo/proxy/Proxy.java | 4 +-
.../org/apache/accumulo/server/Accumulo.java | 2 +-
.../accumulo/server/AccumuloServerContext.java | 2 +-
.../server/client/ClientServiceHandler.java | 4 +-
.../accumulo/server/conf/ConfigSanityCheck.java | 2 +-
.../server/conf/NamespaceConfiguration.java | 24 +--
.../server/conf/ServerConfiguration.java | 5 +-
.../server/conf/ServerConfigurationFactory.java | 24 +--
.../accumulo/server/fs/VolumeManagerImpl.java | 2 +-
.../apache/accumulo/server/init/Initialize.java | 5 +-
.../balancer/HostRegexTableLoadBalancer.java | 12 +-
.../master/balancer/RegexGroupBalancer.java | 4 +-
.../tabletserver/LargestFirstMemoryManager.java | 4 +-
.../org/apache/accumulo/server/util/Admin.java | 2 +-
.../accumulo/server/util/LoginProperties.java | 2 +-
.../server/AccumuloServerContextTest.java | 2 +-
.../conf/ServerConfigurationFactoryTest.java | 2 +-
.../BaseHostRegexTableLoadBalancerTest.java | 2 +-
.../HostRegexTableLoadBalancerTest.java | 2 +-
.../accumulo/server/util/TServerUtilsTest.java | 23 +-
.../accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../accumulo/gc/SimpleGarbageCollectorTest.java | 2 +-
.../java/org/apache/accumulo/master/Master.java | 4 +-
.../master/tableOps/WriteExportFiles.java | 3 +-
.../org/apache/accumulo/monitor/Monitor.java | 6 +-
.../org/apache/accumulo/tracer/TraceServer.java | 4 +-
.../apache/accumulo/tserver/FileManager.java | 5 +-
.../apache/accumulo/tserver/TabletServer.java | 12 +-
.../tserver/TabletServerResourceManager.java | 10 +-
.../compaction/SizeLimitCompactionStrategy.java | 4 +-
.../compaction/TwoTierCompactionStrategy.java | 4 +-
.../replication/AccumuloReplicaSystem.java | 4 +-
.../tserver/replication/ReplicationWorker.java | 2 +-
.../tserver/tablet/DatafileManager.java | 4 +-
.../tserver/LargestFirstMemoryManagerTest.java | 14 +-
.../DefaultCompactionStrategyTest.java | 3 +-
.../SizeLimitCompactionStrategyTest.java | 7 +-
.../TwoTierCompactionStrategyTest.java | 10 +-
.../ConfigurableCompactionStrategyTest.java | 8 +-
.../tserver/tablet/DatafileManagerTest.java | 4 +-
.../accumulo/shell/commands/ConfigCommand.java | 4 +-
.../accumulo/shell/commands/DeleteCommand.java | 4 +-
.../accumulo/shell/commands/InsertCommand.java | 4 +-
.../accumulo/shell/commands/MergeCommand.java | 4 +-
.../accumulo/shell/commands/ScanCommand.java | 5 +-
.../accumulo/test/BulkImportMonitoringIT.java | 6 +-
.../apache/accumulo/test/CreateRandomRFile.java | 4 +-
.../org/apache/accumulo/test/ExistingMacIT.java | 4 +-
.../apache/accumulo/test/GetFileInfoBulkIT.java | 6 +-
.../apache/accumulo/test/LargeSplitRowIT.java | 8 +-
.../org/apache/accumulo/test/ShellServerIT.java | 3 +-
.../test/TableConfigurationUpdateIT.java | 4 +-
.../org/apache/accumulo/test/TestIngest.java | 4 +-
.../accumulo/test/TransportCachingIT.java | 4 +-
.../accumulo/test/functional/BulkFileIT.java | 2 +-
.../test/functional/DeleteEverythingIT.java | 6 +-
.../test/functional/DynamicThreadPoolsIT.java | 7 +-
.../test/functional/ScanSessionTimeOutIT.java | 7 +-
.../accumulo/test/functional/SplitIT.java | 4 +-
.../CloseWriteAheadLogReferencesIT.java | 2 +-
.../test/mapreduce/AccumuloInputFormatIT.java | 2 +-
.../performance/metadata/FastBulkImportIT.java | 4 +-
.../performance/scan/CollectTabletStats.java | 6 +-
108 files changed, 655 insertions(+), 595 deletions(-)
----------------------------------------------------------------------