You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/06/09 14:00:09 UTC
[jackrabbit-oak] 01/01: Merge branch 'trunk' into OAK-10274
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10274
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 98a7335468224621e3de7efbcd5ae35ddbfdec0e
Merge: ea19473d0e 04c23cb1da
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Fri Jun 9 14:59:48 2023 +0100
Merge branch 'trunk' into OAK-10274
.../impl/principal/AutoMembershipPrincipals.java | 12 ++-
.../impl/principal/AutoMembershipCycleTest.java | 109 ++++++++++++++++++++
...lasticFullTextWithoutGlobalIndexSearchTest.java | 2 +-
.../benchmark/util/ElasticGlobalInitializer.java | 2 +-
.../org/apache/jackrabbit/oak/run/ElasticMain.java | 2 +-
.../jackrabbit/oak/benchmark/HybridIndexTest.java | 10 +-
...LuceneFullTextWithoutGlobalIndexSearchTest.java | 2 +-
...LucenePropertyFTIndexedContentAvailability.java | 2 +-
...pertyFTSeparatedIndexedContentAvailability.java | 2 +-
.../oak/benchmark/LucenePropertySearchTest.java | 2 +-
.../oak/benchmark/util/OakLuceneIndexUtils.java | 4 +-
.../org/apache/jackrabbit/oak/run/LuceneMain.java | 2 +-
.../benchmarks/search/AggregateNodeSearcher.java | 2 +-
.../suites/ScalabilityBlobSearchSuite.java | 10 +-
.../suites/ScalabilityNodeRelationshipSuite.java | 10 +-
.../scalability/suites/ScalabilityNodeSuite.java | 14 +--
.../org/apache/jackrabbit/oak/run/SolrMain.java | 2 +-
.../jackrabbit/oak/benchmark/AbstractTest.java | 2 +-
.../jackrabbit/oak/benchmark/BenchmarkRunner.java | 6 +-
.../jackrabbit/oak/benchmark/BundlingNodeTest.java | 4 +-
.../oak/benchmark/CompositeAuthorizationTest.java | 2 +-
.../oak/benchmark/ConcurrentFileWriteTest.java | 2 +-
.../oak/benchmark/ConcurrentHasPermissionTest.java | 2 +-
.../oak/benchmark/ContinuousRevisionGCTest.java | 2 +-
.../apache/jackrabbit/oak/benchmark/CugTest.java | 2 +-
.../jackrabbit/oak/benchmark/FacetSearchTest.java | 8 +-
.../IsCheckedOutAddMixinSetPropertyTest.java | 2 +-
.../jackrabbit/oak/benchmark/LoginSystemTest.java | 2 +-
.../jackrabbit/oak/benchmark/MemberBaseTest.java | 2 +-
.../jackrabbit/oak/benchmark/ObservationTest.java | 2 +-
.../oak/benchmark/PropertyFullTextTest.java | 4 +-
.../jackrabbit/oak/benchmark/ReadManyTest.java | 2 +-
.../jackrabbit/oak/benchmark/ReadPropertyTest.java | 2 +-
.../jackrabbit/oak/benchmark/RevisionGCTest.java | 2 +-
.../jackrabbit/oak/benchmark/SearchTest.java | 6 +-
.../jackrabbit/oak/benchmark/SetPropertyTest.java | 2 +-
.../oak/benchmark/SmallFileReadTest.java | 2 +-
.../external/AbstractExternalTest.java | 6 +-
.../authentication/external/ExternalLoginTest.java | 2 +-
.../external/PrincipalNameResolutionTest.java | 2 +-
.../authorization/AbstractHasItemGetItemTest.java | 4 +-
.../benchmark/authorization/AceCreationTest.java | 2 +-
.../GetPrivilegeCollectionIncludeNamesTest.java | 4 +-
.../HasPermissionHasItemGetItemTest.java | 2 +-
.../permission/EagerCacheSizeTest.java | 4 +-
.../principalbased/PermissionEvaluationTest.java | 2 +-
.../principalbased/PrinicipalBasedReadTest.java | 12 +--
.../oak/benchmark/util/OakIndexUtils.java | 4 +-
.../oak/benchmark/wikipedia/WikipediaImport.java | 2 +-
.../java/org/apache/jackrabbit/oak/run/Main.java | 2 +-
.../oak/scalability/ScalabilityRunner.java | 10 +-
.../benchmarks/search/ConcurrentReader.java | 2 +-
.../standby/StandbyBulkTransferBenchmark.java | 2 +-
.../suites/ScalabilityAbstractSuite.java | 12 +--
.../cloud/azure/blobstorage/AzuriteDockerRule.java | 29 +++++-
.../oak/security/user/MembershipProvider.java | 2 +-
.../oak/standalone/RepositoryInitializer.java | 6 +-
.../java/org/apache/jackrabbit/j2ee/TomcatIT.java | 2 +-
.../java/org/apache/jackrabbit/oak/OakAssert.java | 2 +-
.../org/apache/jackrabbit/oak/api/TreeTest.java | 6 +-
.../oak/composite/AtomicCompositeMergeTest.java | 6 +-
.../CompositeNodeStoreClusterObservationTest.java | 2 +-
.../oak/composite/CompositeNodeStoreTest.java | 6 +-
.../jackrabbit/oak/core/MutableTreeTest.java | 2 +-
.../blob/DocumentBlobGCRegistrationTest.java | 2 +-
.../blob/DocumentBlobTrackerRegistrationTest.java | 2 +-
.../blob/datastore/DataStoreTrackerGCTest.java | 12 +--
.../DocumentCachingDataStoreStatsTest.java | 2 +-
.../index/AsyncIndexUpdateClusterTestIT.java | 6 +-
.../plugins/index/AsyncIndexUpdateLeaseTest.java | 4 +-
.../name/ReadWriteNamespaceRegistryTest.java | 2 +-
.../oak/segment/SegmentAzureDataStoreBlobGCIT.java | 2 +-
.../oak/segment/SegmentBlobGCRegistrationTest.java | 2 +-
.../segment/SegmentCachingDataStoreStatsTest.java | 2 +-
.../oak/segment/SegmentS3DataStoreBlobGCIT.java | 2 +-
.../oak/spi/commit/CommitContextTest.java | 2 +-
.../jackrabbit/oak/spi/state/CheckpointTest.java | 2 +-
.../jackrabbit/oak/spi/state/NodeStoreTest.java | 8 +-
.../jackrabbit/oak/jcr/TransientMoveTest.java | 110 +++++++++++++++++++++
.../oak/index/ElasticDocumentStoreIndexer.java | 2 +-
.../jackrabbit/oak/index/ElasticIndexCommand.java | 10 +-
.../oak/index/ElasticIndexImporterSupport.java | 2 +-
.../jackrabbit/oak/run/AvailableElasticModes.java | 2 +-
.../jackrabbit/oak/run/AzuriteDockerRule.java | 106 --------------------
.../oak/run/DataStoreCopyCommandTest.java | 1 +
.../index/elastic/query/ElasticIndexPlanner.java | 1 +
.../oak/plugins/index/OrderByCommonTest.java | 59 +++++++++++
oak-segment-azure/pom.xml | 7 ++
.../segment/azure/tool/SegmentCopyTestBase.java | 3 +-
.../oak/segment/azure/AzureArchiveManagerTest.java | 1 +
.../oak/segment/azure/AzureGCJournalTest.java | 2 +
.../oak/segment/azure/AzureJournalFileTest.java | 1 +
.../oak/segment/azure/AzureManifestFileTest.java | 2 +
.../oak/segment/azure/AzureReadSegmentTest.java | 1 +
.../oak/segment/azure/AzureRepositoryLockTest.java | 2 +
.../azure/AzureSegmentStoreServiceTest.java | 2 +
.../oak/segment/azure/AzureTarFileTest.java | 2 +
.../oak/segment/azure/AzureTarFilesTest.java | 2 +
.../oak/segment/azure/AzureTarWriterTest.java | 2 +
.../oak/segment/azure/AzuriteDockerRule.java | 106 --------------------
.../azure/journal/AzureJournalReaderTest.java | 3 +-
.../azure/journal/AzureTarRevisionsTest.java | 3 +-
.../azure/journal/ReverseFileReaderTest.java | 3 +-
.../oak/segment/azure/tool/ToolUtilsTest.java | 3 +-
.../split/SplitPersistenceBlobTest.java | 2 +-
.../persistence/split/SplitPersistenceTest.java | 2 +-
.../plugins/document/mongo/MongoDockerRule.java | 41 +++++++-
oak-upgrade/pom.xml | 19 +---
.../jackrabbit/oak/upgrade/AsciiArtTicker.java | 2 +-
.../jackrabbit/oak/upgrade/BundleLoader.java | 2 +-
.../oak/upgrade/JackrabbitNodeState.java | 22 ++---
.../jackrabbit/oak/upgrade/PersistingDiff.java | 6 +-
.../oak/upgrade/RepositorySidegrade.java | 12 +--
.../jackrabbit/oak/upgrade/RepositoryUpgrade.java | 32 +++---
.../oak/upgrade/SameNameSiblingsEditor.java | 8 +-
.../jackrabbit/oak/upgrade/SimpleTicker.java | 2 +-
.../oak/upgrade/blob/LengthCachingDataStore.java | 12 +--
.../upgrade/checkpoint/CheckpointRetriever.java | 6 +-
.../jackrabbit/oak/upgrade/cli/CliUtils.java | 2 +-
.../oak/upgrade/cli/MigrationFactory.java | 4 +-
.../jackrabbit/oak/upgrade/cli/OakUpgrade.java | 4 +-
.../upgrade/cli/blob/AzureDataStoreFactory.java | 6 +-
.../oak/upgrade/cli/blob/BlobStoreFactory.java | 2 +-
.../upgrade/cli/blob/ConstantBlobStoreFactory.java | 2 +-
.../upgrade/cli/blob/DummyBlobStoreFactory.java | 2 +-
.../oak/upgrade/cli/blob/FileBlobStoreFactory.java | 2 +-
.../oak/upgrade/cli/blob/FileDataStoreFactory.java | 2 +-
.../oak/upgrade/cli/blob/LoopbackBlobStore.java | 2 +-
.../upgrade/cli/blob/LoopbackBlobStoreFactory.java | 4 +-
.../oak/upgrade/cli/blob/S3DataStoreFactory.java | 6 +-
.../upgrade/cli/blob/SafeDataStoreBlobStore.java | 2 +-
.../oak/upgrade/cli/node/Jackrabbit2Factory.java | 2 +-
.../oak/upgrade/cli/node/JdbcFactory.java | 2 +-
.../oak/upgrade/cli/node/MongoFactory.java | 2 +-
.../oak/upgrade/cli/node/NodeStoreFactory.java | 2 +-
.../oak/upgrade/cli/node/SegmentAzureFactory.java | 4 +-
.../oak/upgrade/cli/node/SegmentFactory.java | 2 +-
.../oak/upgrade/cli/node/SegmentTarFactory.java | 2 +-
.../oak/upgrade/cli/node/StoreFactory.java | 2 +-
.../oak/upgrade/cli/parser/DatastoreArguments.java | 2 +-
.../upgrade/nodestate/NameFilteringNodeState.java | 2 +-
.../oak/upgrade/CopyCheckpointsTest.java | 2 +-
.../oak/upgrade/CopyVersionHistoryTest.java | 4 +-
.../oak/upgrade/IgnoreMissingBinariesTest.java | 2 +-
.../oak/upgrade/PrivilegeUpgradeTest.java | 8 +-
.../oak/upgrade/RepositoryUpgradeTest.java | 2 +-
.../oak/upgrade/SameNodeSiblingsTest.java | 4 +-
.../oak/upgrade/UpgradeOldSegmentTest.java | 2 +-
.../upgrade/blob/LengthCachingDataStoreTest.java | 4 +-
.../oak/upgrade/cli/AbstractOak2OakTest.java | 6 +-
.../upgrade/cli/SegmentAzureToSegmentTarTest.java | 2 +-
.../upgrade/cli/SegmentTarToSegmentAzureTest.java | 2 +-
.../oak/upgrade/cli/blob/CopyBinariesTest.java | 2 +-
.../cli/blob/LoopbackBlobStoreFactoryTest.java | 2 +-
.../cli/container/AzureDataStoreContainer.java | 2 +-
.../cli/container/FileDataStoreContainer.java | 2 +-
.../cli/container/JdbcNodeStoreContainer.java | 2 +-
.../cli/container/MongoNodeStoreContainer.java | 2 +-
.../cli/container/S3DataStoreContainer.java | 2 +-
.../container/SegmentAzureNodeStoreContainer.java | 4 +-
.../oak/upgrade/util/VersionCopyTestUtils.java | 2 +-
161 files changed, 649 insertions(+), 511 deletions(-)