This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 1451-external-compactions-feature
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 1a9527aa3ad1acc1ea54169d08159baf6c095909
Merge: 7d088d2 0a09c28
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Mar 8 17:27:51 2021 +0000
Merge remote-tracking branch 'upstream/main' into
1451-external-compactions-feature
LICENSE | 60 +-
assemble/bin/accumulo | 11 +
assemble/pom.xml | 85 +--
assemble/src/main/assemblies/component.xml | 38 +-
assemble/src/main/resources/LICENSE | 814 +++++++++++----------
assemble/src/main/resources/NOTICE | 41 +-
assemble/src/main/scripts/create-jshell.sh | 77 ++
core/src/main/appended-resources/META-INF/LICENSE | 17 +-
.../core/client/sample/AbstractHashSampler.java | 29 +-
.../core/client/sample/RowColumnSampler.java | 10 +-
.../accumulo/core/client/sample/Sampler.java | 8 +
.../accumulo/core/clientImpl/OfflineIterator.java | 4 +-
.../core/clientImpl/TableOperationsImpl.java | 4 +-
.../clientImpl/bulk/ConcurrentKeyExtentCache.java | 4 +-
.../org/apache/accumulo/core/conf/Property.java | 2 +-
.../CryptoEnvironmentImpl.java | 2 +-
.../accumulo/core/crypto/CryptoServiceFactory.java | 2 +-
.../apache/accumulo/core/crypto/CryptoUtils.java | 14 +
.../accumulo/core/cryptoImpl/AESKeyUtils.java | 95 ---
.../apache/accumulo/core/file/rfile/PrintInfo.java | 2 +-
.../accumulo/core/file/rfile/bcfile/BCFile.java | 6 +-
.../accumulo/core/metadata/schema/Ample.java | 8 +
.../accumulo/core/metadata/schema/AmpleImpl.java | 10 +-
.../core/metadata/schema/TabletsMetadata.java | 23 +-
.../accumulo/core/sample/impl/SamplerFactory.java | 13 +-
.../core/spi/compaction/CompactionDirectives.java | 17 +-
...tives.java => CompactionDirectivesBuilder.java} | 38 +-
.../compaction/CompactionDirectivesImpl.java} | 26 +-
.../spi/compaction/CompactionsDirectiveImpl.java | 85 ---
.../spi/compaction/SimpleCompactionDispatcher.java | 8 +-
.../crypto}/AESCryptoService.java | 81 +-
.../crypto}/NoCryptoService.java | 7 +-
.../crypto}/NoFileDecrypter.java | 5 +-
.../crypto}/NoFileEncrypter.java | 5 +-
.../org/apache/accumulo/core/summary/Gatherer.java | 8 +-
.../java/org/apache/accumulo/core/util/Merge.java | 4 +-
core/src/main/spotbugs/exclude-filter.xml | 4 +
.../accumulo/core/conf/SiteConfigurationTest.java | 4 +-
.../apache/accumulo/core/crypto/CryptoTest.java | 49 +-
.../apache/accumulo/core/file/rfile/RFileTest.java | 2 +-
core/src/test/resources/accumulo2.properties | 2 +-
.../src/main/spotbugs/exclude-filter.xml | 4 +
pom.xml | 327 +++------
.../manager/balancer/BalancerEnvironmentImpl.java | 4 +-
.../server/master/balancer/GroupBalancer.java | 4 +-
.../accumulo/server/util/ListVolumesUsed.java | 4 +-
.../accumulo/server/util/MetadataTableUtil.java | 4 +-
.../manager/state/RootTabletStateStoreTest.java | 6 +
.../apache/accumulo/gc/SimpleGarbageCollector.java | 4 +-
.../manager/ManagerClientServiceHandler.java | 5 +-
.../accumulo/manager/recovery/RecoveryManager.java | 2 +-
.../manager/tableOps/bulkVer2/LoadFiles.java | 4 +-
.../manager/tableOps/bulkVer2/PrepBulkImport.java | 7 +-
.../manager/tableOps/compact/CompactionDriver.java | 5 +-
server/monitor/pom.xml | 51 +-
.../src/main/appended-resources/META-INF/LICENSE | 51 +-
.../apache/accumulo/monitor/EmbeddedWebServer.java | 2 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 2 +-
.../accumulo/monitor/rest/SummaryInformation.java | 2 +-
.../apache/accumulo/monitor/rest/XMLResource.java | 14 +-
.../rest/bulkImports/BulkImportResource.java | 10 +-
.../monitor/rest/gc/GarbageCollectorResource.java | 10 +-
.../monitor/rest/logs/DeadLoggerInformation.java | 2 +-
.../accumulo/monitor/rest/logs/LogResource.java | 14 +-
.../monitor/rest/manager/ManagerResource.java | 10 +-
.../rest/problems/ProblemDetailInformation.java | 2 +-
.../rest/problems/ProblemSummaryInformation.java | 2 +-
.../monitor/rest/problems/ProblemsResource.java | 20 +-
.../rest/replication/ReplicationResource.java | 10 +-
.../accumulo/monitor/rest/scans/ScansResource.java | 10 +-
.../rest/statistics/StatisticsResource.java | 10 +-
.../monitor/rest/status/StatusResource.java | 10 +-
.../monitor/rest/tables/TableInformation.java | 2 +-
.../monitor/rest/tables/TablesResource.java | 16 +-
.../monitor/rest/trace/TracesResource.java | 22 +-
.../rest/tservers/BadTabletServerInformation.java | 2 +-
.../monitor/rest/tservers/CurrentOperations.java | 2 +-
.../rest/tservers/DeadServerInformation.java | 2 +-
.../tservers/ServerShuttingDownInformation.java | 2 +-
.../rest/tservers/TabletServerInformation.java | 2 +-
.../rest/tservers/TabletServerResource.java | 22 +-
.../monitor/rest/zk/ZookeeperResource.java | 8 +-
.../monitor/util/JaxbAbstractIdSerializer.java | 2 +-
.../org/apache/accumulo/monitor/view/WebViews.java | 24 +-
.../external/{ => datatables/plugins}/ellipsis.js | 0
.../external/{ => jquery}/jquery-3.2.1.js | 0
.../monitor/resources/external/select2.css | 484 ------------
.../apache/accumulo/monitor/templates/default.ftl | 4 +-
.../apache/accumulo/monitor/templates/server.ftl | 2 +-
.../org/apache/accumulo/monitor/it/WebViewsIT.java | 12 +-
.../org/apache/accumulo/tserver/log/DfsLogger.java | 9 +-
.../tserver/memory/LargestFirstMemoryManager.java | 2 +-
.../memory/LargestFirstMemoryManagerTest.java | 55 +-
.../shell/commands/ListTabletsCommand.java | 2 +-
.../categories/ZooKeeperTestingServerTests.java | 18 +-
.../src/main/spotbugs/exclude-filter.xml | 5 +-
.../accumulo/harness/MiniClusterHarness.java | 7 +-
.../apache/accumulo/test/CompactionExecutorIT.java | 4 +-
.../accumulo/test/CountNameNodeOpsBulkIT.java | 2 +-
.../accumulo/test/fate/zookeeper/ZooLockIT.java | 44 +-
.../zookeeper}/ZooMutatorIT.java | 38 +-
.../accumulo/test/functional/AccumuloClientIT.java | 1 -
.../apache/accumulo/test/functional/BulkNewIT.java | 4 +-
.../test/functional/ConfigurableMacBase.java | 9 +-
.../test/functional/FunctionalTestUtils.java | 12 +
.../accumulo/test/functional/MetadataIT.java | 71 ++
.../accumulo/test/functional/MonitorSslIT.java | 2 +-
.../accumulo/test/functional/ReadWriteIT.java | 2 +-
.../test/functional/WriteAheadLogEncryptedIT.java | 2 +-
.../accumulo/test/manager/SuspendedTabletsIT.java | 71 +-
.../{FateMetricsTest.java => FateMetricsIT.java} | 12 +-
.../org/apache/accumulo/test/util/CertUtils.java | 4 +-
.../test/zookeeper/ZooKeeperTestingServer.java | 3 +-
test/src/main/spotbugs/exclude-filter.xml | 4 +
.../apache/accumulo/test/util/CertUtilsTest.java | 2 +-
115 files changed, 1449 insertions(+), 1880 deletions(-)
