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 2021/03/08 20:51:15 UTC
[accumulo] 01/01: Merge branch 'main' into
1451-external-compactions-feature
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 e967402f600534c1afc9fd1a29f4a46147f21abf
Merge: 214aeaf a77edef
Author: Dave Marion <dl...@apache.org>
AuthorDate: Mon Mar 8 20:41:59 2021 +0000
Merge branch 'main' into 1451-external-compactions-feature
.../file/blockfile/impl/ScanCacheProvider.java | 8 +--
...tionDirectives.java => CompactionDispatch.java} | 10 +--
...Builder.java => CompactionDispatchBuilder.java} | 12 ++--
...ctivesImpl.java => CompactionDispatchImpl.java} | 6 +-
.../core/spi/compaction/CompactionDispatcher.java | 2 +-
.../spi/compaction/SimpleCompactionDispatcher.java | 22 +++----
...canDirectives.java => DefaultScanDispatch.java} | 17 +++--
.../{ScanDirectives.java => ScanDispatch.java} | 12 ++--
...anDirectivesImpl.java => ScanDispatchImpl.java} | 12 ++--
.../accumulo/core/spi/scan/ScanDispatcher.java | 8 +--
.../core/spi/scan/SimpleScanDispatcher.java | 52 ++++++++--------
.../apache/accumulo/fate/zookeeper/ZooLock.java | 3 +-
.../core/spi/scan/SimpleScanDispatcherTest.java | 14 ++---
.../accumulo/minicluster/MiniAccumuloCluster.java | 15 ++++-
.../accumulo/minicluster/MiniAccumuloConfig.java | 15 +++++
.../MiniAccumuloClusterExistingZooKeepersTest.java | 72 +++++++---------------
.../tserver/TabletServerResourceManager.java | 14 ++---
.../accumulo/tserver/scan/ScanParameters.java | 12 ++--
.../accumulo/tserver/tablet/CompactableImpl.java | 4 +-
.../accumulo/tserver/tablet/ScanDataSource.java | 3 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 4 +-
21 files changed, 159 insertions(+), 158 deletions(-)