This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-10199
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from a2364cedc2 OAK-10199 : disable the detailGc in tearDown to avoid
side-effects
new db5a6f8fed OAK-10200 :
CompositeAccessControlManager.getEffectivePolicies(String) should filter
duplicate policies
new 3058767a67 OAK-10201: oak-blob-plugins: mark exported packages as
internal (#906)
new 14366cc2e8 OAK-10196: switch oak-store-document to shaded guava (#903)
new f433d4c0cf OAK-10202: change default fetch size to match lucene
behaviour (#907)
new 16d3eb8e5c OAK-10205: switch oak-http to shaded guava (#908)
new c4177d56af Revert "OAK-10201: oak-blob-plugins: mark exported packages
as internal (#906)"
new 603b83dd7d OAK-10201: oak-blob-plugins: mark exported packages as
internal (#906)
new 4a5a4819fa OAK-10201: oak-blob-plugins: mark exported packages as
internal
new d40f0a1e6f OAK-10199 : provided support for feature toggle & osgi
config for detailed gc
The 9 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:
.gitignore | 1 +
.../blob/datastore/directaccess/package-info.java | 5 +-
.../oak/plugins/blob/datastore}/package-info.java | 10 +-
.../jackrabbit/oak/plugins/blob}/package-info.java | 10 +-
.../composite/CompositeAccessControlManager.java | 3 +-
.../CompositeAccessControlManagerTest.java | 10 +
.../internal/SecurityProviderRegistrationTest.java | 6 +-
oak-http/pom.xml | 14 +-
.../apache/jackrabbit/oak/http/AcceptHeader.java | 2 +-
.../jackrabbit/oak/http/HtmlRepresentation.java | 2 +-
.../apache/jackrabbit/oak/fixture/OakFixture.java | 2 +-
.../plugins/document/DocumentNodeStoreHelper.java | 4 +-
.../jackrabbit/oak/run/RevisionsCommand.java | 3 +-
.../index/elastic/ElasticIndexDefinition.java | 2 +-
.../plugins/index/elastic/ElasticContentTest.java | 37 +++-
oak-store-document/pom.xml | 11 +-
.../oak/plugins/document/BatchCommit.java | 10 +-
.../oak/plugins/document/BatchCommitQueue.java | 4 +-
.../plugins/document/BlobReferenceIterator.java | 4 +-
.../jackrabbit/oak/plugins/document/Branch.java | 16 +-
.../document/CachingCommitValueResolver.java | 8 +-
.../oak/plugins/document/Checkpoints.java | 4 +-
.../oak/plugins/document/ClusterNodeInfo.java | 4 +-
.../plugins/document/ClusterNodeInfoDocument.java | 4 +-
.../jackrabbit/oak/plugins/document/Collision.java | 2 +-
.../jackrabbit/oak/plugins/document/Commit.java | 16 +-
.../oak/plugins/document/CommitBuilder.java | 4 +-
.../oak/plugins/document/CommitDiff.java | 2 +-
.../oak/plugins/document/CommitQueue.java | 6 +-
.../oak/plugins/document/Configuration.java | 9 +
.../oak/plugins/document/ConflictException.java | 2 +-
.../jackrabbit/oak/plugins/document/Document.java | 2 +-
.../document/DocumentBranchRootNodeState.java | 2 +-
.../oak/plugins/document/DocumentNodeBuilder.java | 2 +-
.../oak/plugins/document/DocumentNodeState.java | 14 +-
.../oak/plugins/document/DocumentNodeStore.java | 41 ++--
.../plugins/document/DocumentNodeStoreBranch.java | 8 +-
.../plugins/document/DocumentNodeStoreBuilder.java | 39 +++-
.../document/DocumentNodeStoreMBeanImpl.java | 14 +-
.../plugins/document/DocumentNodeStoreService.java | 24 ++-
.../DocumentNodeStoreServiceConfiguration.java | 4 +-
.../plugins/document/DocumentPropertyState.java | 2 +-
.../oak/plugins/document/DocumentRootBuilder.java | 2 +-
.../oak/plugins/document/DocumentStore.java | 2 +-
.../plugins/document/DocumentStoreException.java | 4 +-
.../oak/plugins/document/DocumentStoreStats.java | 2 +-
.../document/DocumentStoreStatsPrinter.java | 2 +-
.../oak/plugins/document/ExternalChange.java | 2 +-
.../document/FailedWithConflictException.java | 2 +-
.../oak/plugins/document/FormatVersion.java | 8 +-
.../oak/plugins/document/JournalDiffLoader.java | 6 +-
.../oak/plugins/document/JournalEntry.java | 12 +-
.../plugins/document/JournalGarbageCollector.java | 2 +-
.../plugins/document/JournalPropertyHandler.java | 4 +-
.../oak/plugins/document/LastRevRecoveryAgent.java | 16 +-
.../oak/plugins/document/LocalDiffCache.java | 2 +-
.../oak/plugins/document/MemoryDiffCache.java | 2 +-
.../oak/plugins/document/MergeCommit.java | 2 +-
.../oak/plugins/document/MissingBcSweeper2.java | 16 +-
.../oak/plugins/document/MissingLastRevSeeker.java | 4 +-
.../document/ModifiedDocumentNodeState.java | 2 +-
.../oak/plugins/document/NamePathRev.java | 2 +-
.../oak/plugins/document/NodeDocument.java | 54 ++++--
.../oak/plugins/document/NodeDocumentSweeper.java | 16 +-
.../jackrabbit/oak/plugins/document/Path.java | 6 +-
.../jackrabbit/oak/plugins/document/PathRev.java | 2 +-
.../oak/plugins/document/PrefetchDispatcher.java | 2 +-
.../oak/plugins/document/PropertyHistory.java | 16 +-
.../jackrabbit/oak/plugins/document/Range.java | 4 +-
.../jackrabbit/oak/plugins/document/ResetDiff.java | 2 +-
.../jackrabbit/oak/plugins/document/Revision.java | 2 +-
.../oak/plugins/document/RevisionVector.java | 18 +-
.../jackrabbit/oak/plugins/document/Rollback.java | 4 +-
.../oak/plugins/document/SplitDocumentCleanUp.java | 4 +-
.../oak/plugins/document/SplitOperations.java | 24 +--
.../oak/plugins/document/TieredDiffCache.java | 6 +-
.../oak/plugins/document/TimingHook.java | 2 +-
.../oak/plugins/document/UnmergedBranches.java | 4 +-
.../oak/plugins/document/UnsavedModifications.java | 16 +-
.../jackrabbit/oak/plugins/document/UpdateOp.java | 4 +-
.../oak/plugins/document/UpdateUtils.java | 4 +-
.../jackrabbit/oak/plugins/document/ValueMap.java | 4 +-
.../plugins/document/VersionGCRecommendations.java | 45 ++++-
.../oak/plugins/document/VersionGCSupport.java | 104 +++++-----
.../plugins/document/VersionGarbageCollector.java | 209 ++++++++++++---------
.../document/bundlor/BundledDocumentDiffer.java | 4 +-
.../document/bundlor/BundledTypesRegistry.java | 6 +-
.../document/bundlor/BundlingConfigHandler.java | 4 +-
.../plugins/document/bundlor/BundlingHandler.java | 4 +-
.../oak/plugins/document/bundlor/BundlorUtils.java | 10 +-
.../plugins/document/bundlor/CompositeMatcher.java | 4 +-
.../plugins/document/bundlor/DocumentBundlor.java | 6 +-
.../oak/plugins/document/bundlor/Include.java | 6 +-
.../document/bundlor/IncludeAllMatcher.java | 2 +-
.../document/cache/CacheChangesTracker.java | 8 +-
.../plugins/document/cache/ForwardingListener.java | 4 +-
.../plugins/document/cache/NodeDocumentCache.java | 8 +-
.../document/locks/StripedNodeDocumentLocks.java | 2 +-
.../document/memory/MemoryDocumentStore.java | 8 +-
.../document/mongo/MongoBlobReferenceIterator.java | 2 +-
.../oak/plugins/document/mongo/MongoBlobStore.java | 2 +-
.../oak/plugins/document/mongo/MongoDBConfig.java | 2 +-
.../plugins/document/mongo/MongoDBConnection.java | 2 +-
.../mongo/MongoDocumentNodeStoreBuilderBase.java | 2 +-
.../plugins/document/mongo/MongoDocumentStore.java | 32 ++--
.../document/mongo/MongoDocumentStoreMetrics.java | 2 +-
...MongoDocumentStoreThrottlingMetricsUpdater.java | 6 +-
.../document/mongo/MongoMissingLastRevSeeker.java | 2 +-
.../oak/plugins/document/mongo/MongoStatus.java | 4 +-
.../document/mongo/MongoThrottlerFactory.java | 4 +-
.../oak/plugins/document/mongo/MongoUtils.java | 4 +-
.../document/mongo/MongoVersionGCSupport.java | 58 ++++--
.../oak/plugins/document/mongo/RevisionEntry.java | 2 +-
.../document/persistentCache/CacheMetadata.java | 2 +-
.../document/persistentCache/NodeCache.java | 8 +-
.../document/persistentCache/PersistentCache.java | 2 +-
.../persistentCache/PersistentCacheStats.java | 4 +-
.../async/InvalidateCacheAction.java | 2 +-
.../oak/plugins/document/rdb/RDBBlobStore.java | 4 +-
.../document/rdb/RDBDocumentNodeStoreBuilder.java | 2 +-
.../document/rdb/RDBDocumentSerializer.java | 2 +-
.../oak/plugins/document/rdb/RDBDocumentStore.java | 22 +--
.../plugins/document/rdb/RDBDocumentStoreDB.java | 2 +-
.../plugins/document/rdb/RDBDocumentStoreJDBC.java | 12 +-
.../oak/plugins/document/rdb/RDBJDBCTools.java | 6 +-
.../plugins/document/rdb/RDBVersionGCSupport.java | 10 +-
.../secondary/DelegatingDocumentNodeState.java | 10 +-
.../document/secondary/PathFilteringDiff.java | 2 +-
.../document/secondary/SecondaryStoreBuilder.java | 2 +-
.../document/secondary/SecondaryStoreCache.java | 2 +-
.../secondary/SecondaryStoreCacheService.java | 2 +-
.../document/secondary/SecondaryStoreObserver.java | 2 +-
.../plugins/document/util/CloseableIterable.java | 2 +-
.../document/util/MergeSortedIterators.java | 4 +-
.../oak/plugins/document/util/MongoConnection.java | 8 +-
.../util/ReadOnlyDocumentStoreWrapperFactory.java | 2 +-
.../oak/plugins/document/util/RevisionsKey.java | 2 +-
.../oak/plugins/document/util/StringValue.java | 2 +-
.../oak/plugins/document/util/TimeInterval.java | 2 +-
.../oak/plugins/document/util/Utils.java | 21 ++-
.../oak/plugins/document/AbstractJournalTest.java | 2 +-
.../oak/plugins/document/AbstractTwoNodeTest.java | 2 +-
.../oak/plugins/document/BackgroundWriteTest.java | 4 +-
.../BaseDocumentDiscoveryLiteServiceTest.java | 2 +-
.../plugins/document/BasicDocumentStoreTest.java | 12 +-
.../oak/plugins/document/BlobCollectorTest.java | 2 +-
.../document/BlobReferenceIteratorTest.java | 4 +-
.../oak/plugins/document/BlobThroughPutTest.java | 8 +-
.../oak/plugins/document/BranchTest.java | 2 +-
.../document/BulkCreateOrUpdateClusterTest.java | 2 +-
.../plugins/document/CacheConsistencyRDBTest.java | 2 +-
.../oak/plugins/document/CacheConsistencyTest.java | 2 +-
.../plugins/document/CacheConsistencyTestBase.java | 4 +-
.../oak/plugins/document/CheckpointsTest.java | 2 +-
.../oak/plugins/document/ClusterConflictTest.java | 2 +-
.../oak/plugins/document/ClusterNodeInfoTest.java | 2 +-
.../document/ClusterRevisionComparisonTest.java | 4 +-
.../oak/plugins/document/ClusterTest.java | 4 +-
.../oak/plugins/document/CommitQueueTest.java | 4 +-
.../document/ConcurrentPrefetchAndUpdateIT.java | 2 +-
.../document/ConcurrentPropertyUpdateTest.java | 2 +-
.../document/ConcurrentQueryAndInvalidateIT.java | 2 +-
.../document/ConcurrentQueryAndUpdate2IT.java | 2 +-
.../document/ConcurrentQueryAndUpdateIT.java | 2 +-
.../plugins/document/ConcurrentReadAndAddTest.java | 2 +-
.../plugins/document/DocumentBatchSplitTest.java | 2 +-
.../oak/plugins/document/DocumentMK.java | 4 +-
.../plugins/document/DocumentMKBuilderTest.java | 2 +-
.../plugins/document/DocumentMKCommitAddTest.java | 2 +-
.../oak/plugins/document/DocumentNodeStoreIT.java | 2 +-
.../DocumentNodeStoreServiceConfigurationTest.java | 10 +
.../document/DocumentNodeStoreServiceTest.java | 2 +-
.../document/DocumentNodeStoreSweepTest.java | 4 +-
.../plugins/document/DocumentNodeStoreTest.java | 12 +-
.../document/DocumentPropertyStateTest.java | 4 +-
.../oak/plugins/document/DocumentSplitTest.java | 14 +-
.../document/DocumentStoreExceptionTest.java | 2 +-
.../oak/plugins/document/DocumentStoreFixture.java | 2 +-
.../oak/plugins/document/DocumentStoreStatsIT.java | 4 +-
.../plugins/document/DocumentStoreStatsTest.java | 2 +-
.../oak/plugins/document/ExternalChangesTest.java | 12 +-
.../oak/plugins/document/FailingDocumentStore.java | 2 +-
.../oak/plugins/document/FormatVersionTest.java | 2 +-
.../plugins/document/GetChildNodeCountTest.java | 2 +-
.../plugins/document/HierarchyConflictTest.java | 6 +-
.../oak/plugins/document/InitializerTest.java | 2 +-
.../plugins/document/JournalDiffLoaderTest.java | 4 +-
.../oak/plugins/document/JournalEntryTest.java | 4 +-
.../oak/plugins/document/JournalGCTest.java | 2 +-
.../oak/plugins/document/JournalTest.java | 2 +-
.../plugins/document/LargeMergeRecoveryTest.java | 4 +-
.../plugins/document/LastRevRecoveryAgentTest.java | 2 +-
.../document/LastRevRecoveryRandomizedIT.java | 4 +-
.../oak/plugins/document/LastRevRecoveryTest.java | 6 +-
.../document/LastRevSingleNodeRecoveryTest.java | 4 +-
.../oak/plugins/document/LocalDiffCacheTest.java | 2 +-
.../oak/plugins/document/ManyChildNodesTest.java | 2 +-
.../oak/plugins/document/ManyClusterNodesTest.java | 4 +-
.../oak/plugins/document/MeasureMemory.java | 2 +-
.../plugins/document/MissingLastRevSeekerTest.java | 2 +-
.../oak/plugins/document/MongoBlobGCTest.java | 14 +-
.../plugins/document/MongoConnectionFactory.java | 2 +-
.../oak/plugins/document/MongoDocumentStoreIT.java | 4 +-
.../document/MongoDocumentStoreLimitsTest.java | 2 +-
.../plugins/document/MongoDocumentStoreTest.java | 2 +-
.../MongoVersionGCSupportDefaultNoBranchTest.java | 10 +-
.../plugins/document/MultiDocumentStoreTest.java | 4 +-
.../document/NodeDocumentIdComparatorTest.java | 2 +-
.../plugins/document/NodeDocumentSweeperTest.java | 2 +-
.../oak/plugins/document/NodeDocumentTest.java | 12 +-
.../oak/plugins/document/NodeStoreDiffTest.java | 4 +-
.../plugins/document/OptimizedChildFetchTest.java | 2 +-
.../oak/plugins/document/OrphanedBranchTest.java | 2 +-
.../oak/plugins/document/PathComparatorTest.java | 2 +-
.../plugins/document/PrefetchDispatcherTest.java | 4 +-
.../oak/plugins/document/PreviousDocCacheTest.java | 2 +-
.../document/ResurrectNodeAfterRevisionGCTest.java | 2 +-
.../oak/plugins/document/RevisionTest.java | 8 +-
.../oak/plugins/document/RevisionVectorTest.java | 6 +-
.../plugins/document/SharedBlobStoreGCTest.java | 8 +-
.../plugins/document/SimpleRecoveryHandler.java | 2 +-
.../oak/plugins/document/SimpleTest.java | 2 +-
.../oak/plugins/document/Sweep2Test.java | 2 +-
.../oak/plugins/document/TestNodeObserver.java | 4 +-
.../jackrabbit/oak/plugins/document/TestUtils.java | 10 +-
.../document/ThrottlingStatsCollectorImplTest.java | 2 +-
.../oak/plugins/document/UpdateOpTest.java | 2 +-
.../oak/plugins/document/ValueMapTest.java | 4 +-
.../plugins/document/VersionGCDeletionTest.java | 4 +-
.../oak/plugins/document/VersionGCQueryTest.java | 12 +-
.../plugins/document/VersionGCSplitDocTest.java | 2 +-
.../oak/plugins/document/VersionGCStatsTest.java | 2 +-
.../oak/plugins/document/VersionGCSupportTest.java | 4 +-
.../oak/plugins/document/VersionGCSweepTest.java | 2 +-
.../oak/plugins/document/VersionGCTest.java | 15 +-
.../plugins/document/VersionGCWithSplitTest.java | 6 +-
.../document/VersionGarbageCollectorIT.java | 34 ++--
.../document/VersionGarbageCollectorLogTest.java | 2 +-
.../oak/plugins/document/VisibleChangesTest.java | 2 +-
.../plugins/document/blob/RDBBlobStoreTest.java | 4 +-
.../blob/ds/DocumentMKDataStoreReadTest.java | 2 +-
.../bundlor/BundledDocumentDifferTest.java | 6 +-
.../bundlor/BundlingConfigHandlerTest.java | 4 +-
.../document/bundlor/BundlingHandlerTest.java | 2 +-
.../document/bundlor/DocumentBundlingTest.java | 10 +-
.../document/cache/CacheChangesTrackerTest.java | 4 +-
.../document/mongo/AcquireRecoveryLockTest.java | 2 +-
.../document/mongo/CacheInvalidationIT.java | 2 +-
.../mongo/MongoDocumentNodeStoreBuilderTest.java | 12 ++
.../mongo/MongoMissingLastRevSeekerTest.java | 4 +-
.../document/mongo/MongoThrottlerFactoryTest.java | 2 +-
.../document/mongo/MongodProcessFactory.java | 2 +-
.../oak/plugins/document/mongo/QueryHintTest.java | 2 +-
.../document/mongo/ReplicaSetResilienceIT.java | 2 +-
.../document/persistentCache/AsyncQueueTest.java | 2 +-
.../document/persistentCache/NodeCacheTest.java | 2 +-
.../document/prefetch/CacheWarmingTest.java | 2 +-
.../document/rdb/RDBDocumentStoreJDBCTest.java | 2 +-
.../plugins/document/rdb/RDBDocumentStoreTest.java | 4 +-
.../secondary/DelegatingDocumentNodeStateTest.java | 2 +-
.../secondary/SecondaryStoreCacheServiceTest.java | 2 +-
.../secondary/SecondaryStoreCacheTest.java | 6 +-
.../secondary/SecondaryStoreObserverTest.java | 2 +-
.../oak/plugins/document/util/BaseUpdaterTest.java | 4 +-
.../document/util/CreateMetricUpdaterTest.java | 2 +-
.../document/util/MergeSortedIteratorsTest.java | 2 +-
.../util/ReadOnlyDocumentStoreWrapperTest.java | 4 +-
.../document/util/UpsertMetricUpdaterTest.java | 2 +-
.../oak/plugins/document/util/UtilsTest.java | 47 ++++-
269 files changed, 1096 insertions(+), 828 deletions(-)
copy {oak-api/src/main/java/org/apache/jackrabbit/oak/api/blob =>
oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore}/package-info.java
(85%)
copy {oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/annotations
=>
oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob}/package-info.java
(82%)
mode change 100755 => 100644
