This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 729115a63b Merge branch 'main' into elasticity
add 5e2acad48c Make sure existing file path is used for metadata updates
(#3432)
add 256e277052 Merge branch '2.1'
add ee8da3cc27 adds tests for file misnormalization (#3435)
add 775cd62fa3 Merge branch '2.1'
add 8232c9b929 Remove the deprecated -s (safemode) option from ConfigOpts
(#3444)
add 74af36606c Merge branch '2.1'
add d6d81de07f Refactor StoredTabletFile to contain a TabletFile (#3417)
add 23bca6905c Rename TabletFile to ReferencedTabletFile (#3449)
add 96814b81f9 Add a new TabletFile interface (#3450)
new 4ba6c499e2 Merge branch 'main' into elasticity
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/accumulo/core/cli/ConfigOpts.java | 34 ---
.../accumulo/core/clientImpl/OfflineIterator.java | 5 +-
.../accumulo/core/file/BloomFilterLayer.java | 6 +-
.../accumulo/core/file/DispatchingFileFactory.java | 4 +-
.../apache/accumulo/core/file/FileOperations.java | 26 +--
.../accumulo/core/file/rfile/RFileOperations.java | 4 +-
.../apache/accumulo/core/logging/TabletLogger.java | 6 +-
.../accumulo/core/metadata/AbstractTabletFile.java | 11 +-
.../{TabletFile.java => ReferencedTabletFile.java} | 18 +-
.../core/metadata/ScanServerRefTabletFile.java | 4 +-
.../accumulo/core/metadata/StoredTabletFile.java | 55 ++++-
.../apache/accumulo/core/metadata/TabletFile.java | 126 +----------
.../core/metadata/UnreferencedTabletFile.java | 4 +-
.../accumulo/core/metadata/schema/Ample.java | 16 +-
.../schema/ExternalCompactionMetadata.java | 15 +-
.../core/metadata/schema/TabletMetadata.java | 7 +-
.../org/apache/accumulo/core/summary/Gatherer.java | 43 ++--
...FileTest.java => ReferencedTabletFileTest.java} | 20 +-
.../accumulo/server/compaction/CompactionInfo.java | 4 +-
.../accumulo/server/compaction/FileCompactor.java | 20 +-
.../org/apache/accumulo/server/fs/FileManager.java | 66 +++---
.../org/apache/accumulo/server/fs/VolumeUtil.java | 6 +-
.../server/init/FileSystemInitializer.java | 4 +-
.../iterators/TabletIteratorEnvironment.java | 6 +-
.../metadata/ConditionalTabletMutatorImpl.java | 4 +-
.../server/metadata/TabletMutatorBase.java | 20 +-
.../org/apache/accumulo/server/util/FileUtil.java | 47 ++--
.../accumulo/server/util/ListVolumesUsed.java | 3 +-
.../accumulo/server/util/ManagerMetadataUtil.java | 13 +-
.../accumulo/server/util/MetadataTableUtil.java | 15 +-
.../accumulo/server/util/TableDiskUsage.java | 9 +-
.../manager/state/RootTabletStateStoreTest.java | 3 +-
.../accumulo/server/util/TableDiskUsageTest.java | 12 +-
.../org/apache/accumulo/compactor/Compactor.java | 5 +-
.../main/java/org/apache/accumulo/gc/GCRun.java | 2 +-
.../apache/accumulo/manager/split/Splitter.java | 9 +-
.../tableOps/bulkVer2/CleanUpBulkImport.java | 3 +-
.../manager/tableOps/bulkVer2/LoadFiles.java | 13 +-
.../manager/tableOps/split/UpdateTablets.java | 2 +-
.../org/apache/accumulo/tserver/ScanServer.java | 7 +-
.../accumulo/tserver/TabletClientHandler.java | 9 +-
.../tserver/compactions/ExternalCompactionJob.java | 10 +-
.../accumulo/tserver/tablet/CompactableImpl.java | 7 +-
.../accumulo/tserver/tablet/CompactableUtils.java | 13 +-
.../accumulo/tserver/tablet/DatafileManager.java | 27 +--
.../tserver/tablet/MinorCompactionTask.java | 9 +-
.../accumulo/tserver/tablet/MinorCompactor.java | 5 +-
.../accumulo/tserver/tablet/ScanDataSource.java | 6 +-
.../accumulo/tserver/tablet/SnapshotTablet.java | 6 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 57 ++---
.../apache/accumulo/tserver/tablet/TabletBase.java | 3 +-
.../apache/accumulo/tserver/tablet/TabletData.java | 10 +-
.../tserver/compaction/CompactableUtilsTest.java | 9 +-
.../tserver/tablet/CompactableImplTest.java | 7 +-
.../test/functional/AmpleConditionalWriterIT.java | 8 +-
.../test/functional/FileNormalizationIT.java | 238 +++++++++++++++++++++
.../test/functional/GarbageCollectorTrashBase.java | 4 +-
.../accumulo/test/functional/PerTableCryptoIT.java | 2 +-
.../accumulo/test/functional/SplitRecoveryIT.java | 22 +-
.../test/performance/scan/CollectTabletStats.java | 25 +--
60 files changed, 660 insertions(+), 494 deletions(-)
copy core/src/main/java/org/apache/accumulo/core/metadata/{TabletFile.java =>
ReferencedTabletFile.java} (89%)
rename
core/src/test/java/org/apache/accumulo/core/metadata/schema/{TabletFileTest.java
=> ReferencedTabletFileTest.java} (86%)
create mode 100644
test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT.java
