This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 9c733bd2db Merge branch 'main' into elasticity
add 031b9c24b7 Fix DefaultCompactionPlanner SPI
add aa442195db Merge branch '2.1'
add fdabdc5133 Remove broken support for map files (#3378)
add 617bfcbd36 fixes race condition in metadata consistency check (#3392)
add 6f7d3212d0 halts when nested error seen in uncaught exception handler
(#3396)
add 9c6db1f3b6 Merge remote-tracking branch 'upstream/2.1'
add 1e8960dc8a Merge remote-tracking branch 'upstream/main' into elasticity
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/accumulo/core/Constants.java | 1 -
.../accumulo/core/clientImpl/bulk/BulkImport.java | 6 +-
.../core/clientImpl/bulk/LoadMappingIterator.java | 4 +-
.../org/apache/accumulo/core/conf/Property.java | 2 +-
.../apache/accumulo/core/conf/PropertyType.java | 7 +-
.../accumulo/core/file/BloomFilterLayer.java | 2 +-
.../accumulo/core/file/DispatchingFileFactory.java | 10 +-
.../apache/accumulo/core/file/FileOperations.java | 3 +-
.../accumulo/core/file/map/MapFileOperations.java | 186 ---------------------
.../apache/accumulo/core/file/map/MapFileUtil.java | 52 ------
.../core/iteratorsImpl/system/MapFileIterator.java | 176 -------------------
.../spi/compaction/DefaultCompactionPlanner.java | 18 +-
.../threads/AccumuloUncaughtExceptionHandler.java | 11 +-
.../thrift/DataFileInfo.java} | 58 +++----
.../thrift/TabletIngestClientService.java | 86 +++++-----
core/src/main/thrift/data.thrift | 4 -
core/src/main/thrift/tabletingest.thrift | 6 +-
.../accumulo/core/conf/PropertyTypeTest.java | 7 +
.../iterators/user/IndexedDocIteratorTest.java | 2 +-
.../compaction/DefaultCompactionPlannerTest.java | 2 +-
.../AccumuloUncaughtExceptionHandlerTest.java | 6 +-
.../accumulo/server/compaction/FileCompactor.java | 22 +--
.../org/apache/accumulo/server/util/FileUtil.java | 90 +++++-----
.../server/util/RemoveEntriesForMissingFiles.java | 2 +-
.../manager/tableOps/bulkVer2/LoadFiles.java | 12 +-
.../accumulo/manager/tableOps/delete/CleanUp.java | 2 +-
.../tableOps/tableImport/MapImportFileNames.java | 6 +-
.../accumulo/tserver/TabletClientHandler.java | 10 +-
.../org/apache/accumulo/tserver/TabletServer.java | 4 +-
.../tserver/TabletServerResourceManager.java | 6 +-
.../accumulo/tserver/tablet/CompactableImpl.java | 4 +-
.../accumulo/tserver/tablet/DatafileManager.java | 74 ++++----
.../tserver/tablet/MinorCompactionTask.java | 2 +-
.../accumulo/tserver/tablet/MinorCompactor.java | 2 +-
.../accumulo/tserver/tablet/ScanDataSource.java | 8 +-
.../apache/accumulo/tserver/tablet/Scanner.java | 2 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 36 ++--
.../apache/accumulo/tserver/tablet/TabletBase.java | 2 +-
.../accumulo/test/functional/BulkFailureIT.java | 39 +----
.../test/functional/BulkSplitOptimizationIT.java | 4 +-
.../test/functional/FunctionalTestUtils.java | 2 +-
.../apache/accumulo/test/functional/MaxOpenIT.java | 2 +-
.../accumulo/test/functional/SplitRecoveryIT.java | 24 +--
.../accumulo/test/performance/NullTserver.java | 4 +-
.../test/performance/scan/CollectTabletStats.java | 11 +-
45 files changed, 290 insertions(+), 729 deletions(-)
delete mode 100644
core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
delete mode 100644
core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
delete mode 100644
core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/MapFileIterator.java
rename
core/src/main/thrift-gen-java/org/apache/accumulo/core/{dataImpl/thrift/MapFileInfo.java
=> tabletingest/thrift/DataFileInfo.java} (86%)
