This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch no-chop-merge
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from d03972d95a Merge branch 'main' into no-chop-merge
add 3f491a4885 StoredTabletFile now lazy loads ReferencedTabletFile (#3502)
add 04b614c35f Merge branch 'main' into no-chop-merge
add fbb54c371e makes util.Pair instance variables private
add 85e1e25c89 Merge remote-tracking branch 'upstream/2.1'
add 9edc2b7cd7 [maven-release-plugin] prepare release rel/2.1.1
add 8096e0f5ea [maven-release-plugin] prepare for next development
iteration
add b759a14912 Merge branch '2.1.1-rc2-next' into 2.1
add 982ee88ff3 Merge branch '2.1'
add f3ef6aca07 Revert "StoredTabletFile now lazy loads
ReferencedTabletFile (#3502)"
add 2fbb779908 Avoid calling Path.getParent in TabletFile constructor
(#3509)
add 847654d6a6 Merge branch '2.1' and fix conflicts
add 06c55fbea4 Create Gson singleton to use in place of new instances
(#3516)
add 0214c6f99f Add missing validation to UnreferencedTabletFile
new 7fbb262b77 Merge branch 'main' into no-chop-merge
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:
.../core/clientImpl/bulk/BulkSerialize.java | 3 +-
.../apache/accumulo/core/lock/ServiceLockData.java | 11 +-
.../accumulo/core/metadata/AbstractTabletFile.java | 8 --
.../core/metadata/ReferencedTabletFile.java | 153 +++++++++++++++++----
.../accumulo/core/metadata/StoredTabletFile.java | 5 +
.../accumulo/core/metadata/TabletDirectory.java | 65 ---------
.../core/metadata/UnreferencedTabletFile.java | 9 ++
.../accumulo/core/metadata/ValidationUtil.java | 1 +
.../schema/ExternalCompactionFinalState.java | 8 +-
.../schema/ExternalCompactionMetadata.java | 9 +-
.../core/metadata/schema/RootTabletMetadata.java | 8 +-
.../spi/compaction/DefaultCompactionPlanner.java | 6 +-
.../spi/scan/ConfigurableScanServerSelector.java | 7 +-
.../apache/accumulo/core/util/ComparablePair.java | 6 +-
.../util/{Interner.java => GsonSingleton.java} | 34 +++--
.../java/org/apache/accumulo/core/util/Pair.java | 4 +-
.../metadata/schema/ReferencedTabletFileTest.java | 6 +-
pom.xml | 2 +-
.../accumulo/server/metadata/RootGcCandidates.java | 8 +-
.../accumulo/manager/tableOps/TraceRepo.java | 5 +-
.../util/logging/AccumuloMonitorAppender.java | 6 +-
.../accumulo/test/CountNameNodeOpsBulkIT.java | 5 +-
22 files changed, 194 insertions(+), 175 deletions(-)
delete mode 100644
core/src/main/java/org/apache/accumulo/core/metadata/TabletDirectory.java
copy core/src/main/java/org/apache/accumulo/core/util/{Interner.java =>
GsonSingleton.java} (55%)
