This is an automated email from the ASF dual-hosted git repository. adulceanu pushed a change to branch issues/OAK-3349 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
discard 92d96801e2 OAK-3349 Partial Compaction omit 5136d82b9a OAK-9949 Offline Tail Compaction omit b375d8fa57 OAK-9922 Parallel Compaction Export package org.apache.jackrabbit.oak.plugins.index.counter from oak-core omit 1d9095709b OAK-9922 Parallel Compaction add 563c038a43 OAK-10452 - Mongo query that downloads ancestors of base path for regex filtering is doing a column scan (#1129) add 8752a2eaa7 OAK-10429: Implementation for IncrementalFFS (#1123) add 7be9852aa2 OAK-10456: log index name when bulk update fails (#1132) add 189caed371 OAK-10450: bump testcontainers (#1131) add ebd83ac64f OAK-10461: oak-search-elastic does not build under Java 17 - disable Felix SCR plugin (#1134) add ad64ecbcfb Set LZ4 as the default compression algorithm for the indexing job. (#1133) add cef242abb2 Revert "Set LZ4 as the default compression algorithm for the indexing job. (#1133)" add 0b6e538736 OAK-10453 - Pipelined strategy: enforce size limit on memory taken by objects in the queue between download and transform thread (#1130) add c6b4b08da6 OAK-9922: Parallel Compaction (#1043) add 1f3cfa3b3d OAK-10465 : added io.netty netty-transport-native-unix-common embedded dependency for oak-segment-tar (#1137) add f4343950c1 OAK-10458 - Set LZ4 as the default compression algorithm for the indexing job. (#1136) add b2ffbb446c OAK-10463: Retrieve flatFileStore for indexing from baseFlatFileStore (#1135) add c747535b92 OAK-9922: segment-tar: parallel compaction - remove oak-core dependency add 8ef2cf89db OAK-10475 - Expose the Mongo client connection in MongoDocumentNodeStoreBuilderBase (#1142) add 6b8aba2e76 OAK-10474: Release Oak 1.58.0 (#1145) add 25568d29fe [maven-release-plugin] prepare release jackrabbit-oak-1.58.0 add 82ba25c3fc [maven-release-plugin] prepare for next development iteration add 62a3f776cb OAK-10471: Implement ConflictHandler for UserPrincipalProvider Cache add 763031951c OAK-10490 Suggest queries return duplicate entries if prefetch is enabled (#1148) add 6a341e9dd1 OAK-10492: Update (shaded) Guava to 32.1.3 (#1153) add ab772d73a9 OAK-10474: Release Oak 1.58.0 - version cleanup add da19433ebe OAK-10486 : Resolution of inherited groups may terminate pre-maturely for external users (#1147) add d7816c62b9 OAK-10491 - Indexing: pass a MongoDatabase instance instead of MongoConnection to indexing logic (#1151) add 9c1fd98d68 OAK-10471 Implement ConflictHandler for UserPrincipalProvider Cache - fix tests (#1154) add 13889a17d1 OAK-10495: Ignore DocumentStoreIndexerIT#parallelReindex* tests (#1157) add 31a3341ac3 OAK-10487: replaced lsm estimator with cacheable count (#1149) add 4c7e9f4144 OAK-10502: oak-segment-azure/oak-blob-cloud-azure: update embedded Guava to 31.0 (#1162) add 274398d483 OAK-10507: oak-segment-azure/oak-blob-cloud-azure: update embedded Guava to 31.1 (#1163) add 9aeef93e59 OAK-10508: oak-segment-azure/oak-blob-cloud-azure: update embedded Guava to 32.0.0 (#1164) add e3c2dd6303 OAK-10510: oak-segment-azure/oak-blob-cloud-azure: update embedded Guava to 32.0.1 (#1167) add 63aef2f4a1 OAK-10497 Properties order in FFS can be different across runs: option to sort (#1159) add 1b31a22066 OAK-10512: oak-segment-azure/oak-blob-cloud-azure: update embedded Guava to 32.1.0 (#1170) add c255d16fed OAK-10497 Properties order in FFS can be different across runs: sort (#1175) add 2a10b89f3e OAK-10513: oak-segment-azure/oak-blob-cloud-azure: update embedded Guava to 32.1.1 (#1176) add 9d54f6f23f OAK-10515: oak-segment-azure/oak-blob-cloud-azure: update embedded Guava to 32.1.2 (#1177) add e904e45942 OAK-10503 | Handle Exception in case of diff failures while building incremental FFS and handling Add operations during merging of incremental FFS. (#1172) add bb98a83554 OAK-10516: oak-segment-azure/oak-blob-cloud-azure: update embedded Guava to 32.1.3 (#1178) add 8d307fcdaa OAK-6760: Convert oak-blob-cloud to OSGi R6 annotations (#1144) add d9ab316b2b OAK-10505 - Make PIPELINED the default indexing strategy. (#1168) add abcfb39909 Deprecate all Mongo download strategies except for Pipelined. (#1169) add b0ec30536f OAK-10514: Utility method to remove unmerged branch changes add 9377d05a39 Merge pull request #1173 from mreutegg/OAK-10514 add 380467dbfe OAK-10504- Add log messages with start and end of the indexing job. (#1165) add 9013717676 OAK-301 Improve documentation - fix the lucene documentation add e682bc06c6 OAK-301 Improve documentation - fix the lucene documentation add 546e889da6 OAK-10460 - PIPELINED strategy: support eager merging of intermediate sorted files (#1156) add a4ca2a5b7a OAK-10518 IndexInfo should have a isActive() method (#1180) add 7b650db0aa OAK-9705: fix explain output for elastic queries (#1161) add 9014aff808 Issue/oak 9459b (#1183) add 134b5af793 OAK-10460 - PIPELINED strategy: support eager merging of intermediate sorted files - fix test issue on Windows platform add f12b415983 OAK-10478: Update Mockito dependency to 5.x add ca7ea054c2 OAK-10524: SameNameSiblingTest: add (failing) test for getName() semantics add facfe0e539 OAK-10521: Update Easymock dependency to 5.2 add ae576b4646 OAK-10464: Use Testcontainers instead of com.arakelian:docker-junit-rule (#1143) add 84bf4f2d78 OAK-10517 : Consistently clean membership when switch between default and dynamic sync add 893c0e4bb6 OAK-10525 : DefaultSyncContext.createValues : return value should be annotated with @NotNull add 30a9407eec OAK-10462: o.a.j.o.plugins.version.VersionEditor#propertyAdded() may mistakenly assume an ongoing restore operation. (#1141) add 68058e85bd OAK-10529: oak-run server: update Jetty to 9.4.53.v20231009 (#1188) add 1d17b0e524 OAK-10522: o.a.j.o.index.ReindexIT#reindexIgnoreMissingTikaDepThrow() fails with Java 21 add a9307fc658 OAK-9949 Offline Tail Compaction (#1166) add 9f8b7d8502 OAK-10526 : test to reproduce split doc GC with referenced revisions (#1184) add 8d0d3c40c7 OAK-10420 Tool to compare Lucene index content (#1086) add 0de5e850ec OAK-10511 - Get blobId without network roundtrip (#1171) add 664ae24457 OAK-10537: Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.13 (#1192) add 04f3c97136 OAK-10527 Improve readability of the explain query output (#1187) add 04e3b7d85a OAK-10543 skip writeAndReadManySegments test add 873434545c OAK-10543 added issue number to the ignore declaration add ef27c970ea OAK-10543 ignored writeAndReadManySegments in the abstract class add e2a3d46934 OAK-10545: oak-jcr: add test for observing effect of remapping a namespace prefix to a different namespace name (#1196) add d7edc02a09 OAK-10538 - Pipeline strategy: eliminate unnecessary intermediate copy of entries in transform stage (#1194) add b138cf736c OAK-10545: oak-jcr: add test for observing effect of remapping a namespace prefix to a different namespace name - simplified not to use spi-commons add 392ede19fe OAK-10547 - Fix: Indexing job fails at the end of reindexing if it took more than 24h to run (#1203) add d1cd2bc18e OAK-10539: oak-search-elastic: migrate ingestion from Rest High Level Client to the new Java API Client (#1193) add 5be575223d OAK-10526 : set split doc maxRev to 'now' at split time, to avoid it being GCed too early add d177262672 Merge pull request #1190 from apache/OAK-10526 add d28e5b3c41 OAK-10539: fix oak-search-elastic bundle import packages (#1207) add 0a0b252668 OAK-10550: add oak-search-elastic bundle test in oak-it-osgi (#1208) add e73cb97510 OAK-10526 : fix test regression for mongo 70 split doc (#1209) add 9d3d31127d OAK-10548: bump zookeeper to 3.9.1, re-organized optional import packages (#1205) add 299002b63b OAK-6757: Convert oak-auth-ldap to OSGi R6 annotations (#1197) add 0ba9cc4f9d OAK-10542 : test reproducing ignorance of split deleted properties (#1195) new 057ccb8555 OAK-3349 Partial Compaction This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (92d96801e2) \ N -- N -- N refs/heads/issues/OAK-3349 (057ccb8555) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: RELEASE-NOTES.txt | 100 ++- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml | 2 +- .../external/basic/DefaultSyncContext.java | 11 +- .../external/basic/package-info.java | 2 +- .../external/impl/DynamicSyncContext.java | 19 +- .../external/impl/ExternalIdentityConstants.java | 9 + .../principal/InheritedMembershipIterator.java | 29 +- .../external/impl/DynamicSyncContextTest.java | 5 +- .../external/impl/DynamicSyncTest.java | 66 ++ .../external/impl/SwitchSyncModeTest.java | 161 +++++ oak-auth-ldap/pom.xml | 7 +- .../ldap/impl/LdapIdentityProvider.java | 21 +- .../ldap/impl/LdapProviderConfig.java | 680 ++++++++------------- oak-authorization-cug/pom.xml | 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml | 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 20 +- .../cloud/azure/blobstorage/AzuriteDockerRule.java | 128 ++-- oak-blob-cloud/pom.xml | 6 +- .../blob/cloud/s3/AbstractS3DataStoreService.java | 16 - .../oak/blob/cloud/s3/S3DataStoreService.java | 19 +- .../blob/cloud/s3/SharedS3DataStoreService.java | 19 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- .../jackrabbit/oak/commons/sort/ExternalSort.java | 231 +++++-- .../oak/commons/sort/ExternalSortByteArray.java | 223 +++++++ .../jackrabbit/oak/commons/sort/package-info.java | 2 +- .../commons/sort/ExternalSortByteArrayTest.java | 183 ++++++ .../oak/commons/sort/ExternalSortTest.java | 293 +++++---- .../jackrabbit/oak/commons/sort/test-file-2.csv | 6 + oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 3 +- .../oak/plugins/index/FormattingUtils.java | 21 +- .../jackrabbit/oak/plugins/index/IndexInfo.java | 11 + .../oak/plugins/index/IndexInfoServiceImpl.java | 26 +- .../jackrabbit/oak/plugins/index}/IndexName.java | 3 +- .../oak/plugins/index/IndexPathService.java | 9 + .../oak/plugins/index/IndexPathServiceImpl.java | 7 +- .../oak/plugins/index/inventory/IndexPrinter.java | 1 + .../oak/plugins/index/nodetype/NodeTypeIndex.java | 5 +- .../index/property/PropertyIndexInfoProvider.java | 10 + .../plugins/index/property/PropertyIndexPlan.java | 22 +- .../plugins/index/reference/ReferenceIndex.java | 17 +- .../oak/plugins/version/VersionEditor.java | 16 +- .../oak/plugins/version/VersionableState.java | 84 ++- .../jackrabbit/oak/query/QueryEngineImpl.java | 5 +- .../jackrabbit/oak/query/QueryEngineSettings.java | 2 +- .../jackrabbit/oak/query/QueryFormatter.java | 156 +++++ .../org/apache/jackrabbit/oak/query/QueryImpl.java | 4 - .../jackrabbit/oak/query/ast/SelectorImpl.java | 9 +- .../oak/query/index/TraversingIndex.java | 25 +- .../oak/security/user/CacheConflictHandler.java | 95 +++ .../oak/security/user/UserConfigurationImpl.java | 2 +- .../oak/plugins/index/FormattingUtilsTest.java | 88 +++ .../plugins/index/inventory/IndexPrinterTest.java | 10 + .../index/nodetype/NodeTypeIndexQueryTest.java | 15 +- .../index/property/MultiPropertyOrTest.java | 15 +- .../index/property/OptionIndexTagTests.java | 8 +- .../index/property/PropertyIndexDisabledTest.java | 13 +- .../jackrabbit/oak/query/QueryFormatterTest.java | 183 ++++++ .../security/user/CacheConflictHandlerTest.java | 121 ++++ .../security/user/UserConfigurationImplTest.java | 2 +- .../org/apache/jackrabbit/oak/query/sql2_index.txt | 253 +++++--- oak-doc-railroad-macro/pom.xml | 2 +- oak-doc/pom.xml | 2 +- oak-doc/src/site/markdown/query/lucene.md | 12 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 8 +- oak-it-osgi/test-bundles.xml | 1 + oak-it/pom.xml | 6 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 7 +- .../apache/jackrabbit/oak/jcr/NamePathTest.java | 59 ++ .../jackrabbit/oak/jcr/SameNameSiblingTest.java | 13 + .../oak/jcr/query/QueryFulltextTest.java | 7 +- .../jackrabbit/oak/jcr/query/QueryPlanTest.java | 68 +-- .../apache/jackrabbit/oak/jcr/query/QueryTest.java | 25 +- .../jackrabbit/oak/jcr/version/RestoreTest.java | 9 + oak-lucene/pom.xml | 6 +- .../index/lucene/LuceneIndexInfoProvider.java | 11 + .../index/lucene/tools/IndexComparator.java | 247 ++++++++ .../CompositeNodeStoreLuceneIndexTest.java | 20 +- .../oak/composite/CompositeNodeStoreQueryTest.java | 10 +- .../composite/blueGreen/CustomizedIndexTest.java | 50 ++ .../oak/composite/blueGreen/Persistence.java | 6 +- .../index/lucene/LuceneIndexAugmentTest.java | 12 +- .../index/lucene/LuceneIndexQueryCommonTest.java | 3 +- .../lucene/LucenePropertyIndexCommonTest.java | 4 +- .../index/lucene/LucenePropertyIndexTest.java | 117 ++-- .../dynamicBoost/LuceneDynamicBoostTest.java | 5 +- .../property/SynchronousPropertyIndexTest.java | 4 +- oak-parent/pom.xml | 18 +- oak-pojosr/pom.xml | 6 +- oak-query-spi/pom.xml | 2 +- oak-run-commons/pom.xml | 6 +- .../jackrabbit/oak/index/IndexerSupport.java | 57 +- .../indexer/document/DocumentStoreIndexerBase.java | 81 ++- .../flatfile/FlatFileNodeStoreBuilder.java | 149 +++-- .../document/flatfile/FlatFileSplitter.java | 15 +- .../indexer/document/flatfile/FlatFileStore.java | 41 +- .../document/flatfile/FlatFileStoreUtils.java | 10 +- .../MultithreadedTraverseWithSortStrategy.java | 57 +- .../document/flatfile/NodeStateEntryReader.java | 6 +- .../document/flatfile/NodeStateEntryWriter.java | 35 +- .../document/flatfile/SimpleNodeStateHolder.java | 2 +- .../indexer/document/flatfile/SortStrategy.java | 4 + .../document/flatfile/StoreAndSortStrategy.java | 47 +- .../flatfile/TraverseWithSortStrategy.java | 51 +- .../flatfile/pipelined/NodeDocumentCodec.java | 161 +++++ .../pipelined/NodeDocumentCodecProvider.java | 45 ++ .../flatfile/pipelined/NodeStateEntryBatch.java | 47 +- .../flatfile/pipelined/NodeStateHolder.java | 23 +- .../flatfile/pipelined/NodeStateHolderFactory.java | 84 +++ .../flatfile/pipelined/PathElementComparator.java | 7 +- .../flatfile/pipelined/PipelinedMergeSortTask.java | 273 +++++++-- .../pipelined/PipelinedMongoDownloadTask.java | 156 ++--- .../flatfile/pipelined/PipelinedSortBatchTask.java | 25 +- .../flatfile/pipelined/PipelinedStrategy.java | 282 +++++---- .../flatfile/pipelined/PipelinedTransformTask.java | 118 ++-- .../incrementalstore/IncrementalFlatFileStore.java | 47 ++ .../IncrementalFlatFileStoreEditor.java | 117 ++++ ...rementalFlatFileStoreNodeStateEntryReader.java} | 15 +- ...crementalFlatFileStoreNodeStateEntryWriter.java | 70 +++ .../IncrementalFlatFileStoreStrategy.java | 174 ++++++ .../IncrementalIndexStoreMetadata.java | 64 ++ .../IncrementalIndexStoreSortStrategy.java} | 22 +- .../incrementalstore/IncrementalStoreBuilder.java | 147 +++++ .../IncrementalStoreOperand.java} | 25 +- .../MergeIncrementalFlatFileStore.java | 223 +++++++ .../incrementalstore/MergeIncrementalStore.java | 13 +- .../IndexStore.java} | 23 +- .../document/indexstore/IndexStoreMetadata.java | 56 ++ .../IndexStoreMetadataOperator.java} | 13 +- .../indexstore/IndexStoreMetadataOperatorImpl.java | 69 +++ .../IndexStoreSortStrategy.java} | 27 +- .../indexstore/IndexStoreSortStrategyBase.java | 94 +++ .../document/indexstore/IndexStoreUtils.java | 148 +++++ .../oak/indexversion/IndexVersionOperation.java | 2 +- .../oak/indexversion/PurgeOldIndexVersion.java | 2 +- .../oak/indexversion/PurgeOldVersionUtils.java | 2 +- .../oak/run/cli/DocumentFixtureProvider.java | 2 + .../flatfile/FlatFileNodeStoreBuilderTest.java | 64 +- .../document/flatfile/FlatFileStoreTest.java | 7 +- .../document/flatfile/MergeIncrementalFFSTest.java | 130 ++++ .../pipelined/NodeStateEntryBatchTest.java | 34 +- .../document/flatfile/pipelined/PipelinedIT.java | 135 ++-- .../PipelinedMergeSortTaskParameterizedTest.java | 117 ++++ .../pipelined/PipelinedMergeSortTaskTest.java | 137 +++-- .../pipelined/PipelinedMergeSortTaskTestBase.java | 129 ++++ .../pipelined/PipelinedMongoDownloadTaskTest.java | 47 +- .../pipelined/PipelinedSortBatchTaskTest.java | 55 +- ...entalFlatFileStoreNodeStateEntryWriterTest.java | 71 +++ .../incrementalstore/IncrementalStoreIT.java | 497 +++++++++++++++ .../src/test/resources/logback-test.xml | 2 + oak-run-elastic/pom.xml | 5 +- .../indexversion/ElasticIndexVersionOperation.java | 2 +- .../indexversion/ElasticPurgeOldIndexVersion.java | 2 +- .../index/indexer/document/ElasticIndexerTest.java | 25 +- .../ElasticPurgeOldIndexVersionTest.java | 3 +- oak-run/pom.xml | 8 +- .../apache/jackrabbit/oak/index/IndexCommand.java | 15 +- .../oak/index/merge/IndexDefMergerUtils.java | 2 +- .../jackrabbit/oak/index/merge/IndexDiff.java | 2 +- .../indexversion/LuceneIndexVersionOperation.java | 2 +- .../indexversion/LucenePurgeOldIndexVersion.java | 3 +- oak-run/src/main/js/oak-mongo.js | 77 +++ .../oak/index/DocumentStoreIndexerIT.java | 142 ++--- .../org/apache/jackrabbit/oak/index/ReindexIT.java | 59 +- .../apache/jackrabbit/oak/run/JsonIndexTest.java | 23 +- oak-search-elastic/pom.xml | 107 +--- .../plugins/index/elastic/ElasticConnection.java | 23 +- .../index/elastic/ElasticIndexDefinition.java | 12 +- .../index/elastic/ElasticIndexInfoProvider.java | 10 + .../index/elastic/ElasticIndexStatistics.java | 44 +- .../elastic/index/ElasticBulkProcessorHandler.java | 241 ++++---- .../index/elastic/index/ElasticCustomAnalyzer.java | 8 +- .../index/ElasticCustomAnalyzerMappings.java | 4 +- .../index/elastic/index/ElasticDocument.java | 138 ++--- .../index/elastic/index/ElasticIndexHelper.java | 41 +- .../index/elastic/index/ElasticIndexWriter.java | 47 +- .../plugins/index/elastic/query/ElasticIndex.java | 41 +- .../index/elastic/query/ElasticQueryIterator.java | 17 +- .../index/elastic/query/ElasticRequestHandler.java | 2 +- .../elastic/query/ElasticSpellcheckIterator.java | 71 ++- .../elastic/query/ElasticSuggestIterator.java | 29 +- .../query/async/ElasticResultRowAsyncIterator.java | 40 +- .../index/elastic/ElasticDynamicBoostTest.java | 15 +- .../index/elastic/ElasticIndexQueryCommonTest.java | 20 +- .../index/elastic/ElasticIndexStatisticsTest.java | 16 + .../elastic/ElasticIndexSuggestionCommonTest.java | 26 + .../index/elastic/ElasticPropertyIndexTest.java | 12 +- .../index/elastic/ElasticReliabilityTest.java | 24 +- .../index/elastic/ElasticSpellcheckCommonTest.java | 28 + .../plugins/index/elastic/ElasticTestServer.java | 7 +- .../index/ElasticBulkProcessorHandlerTest.java | 17 +- .../elastic/index/ElasticIndexWriterTest.java | 48 +- oak-search-mt/pom.xml | 2 +- oak-search/pom.xml | 2 +- .../index/search/spi/query/FulltextIndex.java | 191 +++--- .../search/spi/query/FulltextIndexPlanner.java | 4 +- .../plugins/index/search/spi/query/IndexName.java | 13 +- .../oak/plugins/index/DynamicBoostCommonTest.java | 17 +- .../oak/plugins/index/FunctionIndexCommonTest.java | 42 +- .../oak/plugins/index/IndexQueryCommonTest.java | 6 +- .../plugins/index/IndexSuggestionCommonTest.java | 22 +- .../oak/plugins/index/OrderByCommonTest.java | 24 +- .../oak/plugins/index/PropertyIndexCommonTest.java | 16 +- .../oak/plugins/index/SpellcheckCommonTest.java | 4 +- .../index/search/spi/query/FulltextIndexTest.java | 161 ++++- .../index/search/spi/query/IndexNameTest.java | 1 + oak-security-spi/pom.xml | 2 +- .../AbstractAccessControlManagerTest.java | 10 +- oak-segment-aws/pom.xml | 7 +- oak-segment-azure/pom.xml | 19 +- oak-segment-remote/pom.xml | 2 +- .../AbstractPersistentCacheTest.java | 2 + .../persistentcache/PersistentRedisCacheTest.java | 1 - oak-segment-tar/pom.xml | 10 +- .../jackrabbit/oak/segment/ApproximateCounter.java | 186 ++++++ .../oak/segment/DefaultSegmentWriter.java | 8 + .../jackrabbit/oak/segment/ParallelCompactor.java | 1 - .../oak/segment/DefaultSegmentWriterTest.java | 40 +- .../oak/segment/test/TemporaryBlobStore.java | 33 +- .../oak/segment/test/TemporaryFileStore.java | 37 +- oak-shaded-guava/pom.xml | 6 +- oak-solr-core/pom.xml | 2 +- oak-solr-osgi/pom.xml | 50 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 7 +- .../oak/plugins/document/SplitOperations.java | 16 +- .../mongo/MongoDocumentNodeStoreBuilderBase.java | 21 +- .../plugins/document/MongoConnectionFactory.java | 2 +- .../plugins/document/VersionGCSplitDocTest.java | 17 +- .../document/VersionGarbageCollectorIT.java | 248 ++++++++ .../document/mongo/LeaseUpdateSocketTimeoutIT.java | 13 +- .../plugins/document/mongo/MongoDockerRule.java | 124 ++-- oak-store-spi/pom.xml | 2 +- oak-upgrade/pom.xml | 10 +- pom.xml | 2 +- 248 files changed, 8738 insertions(+), 2940 deletions(-) create mode 100644 oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SwitchSyncModeTest.java create mode 100644 oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortByteArray.java create mode 100644 oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortByteArrayTest.java copy {oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query => oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index}/IndexName.java (98%) create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryFormatter.java create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheConflictHandler.java create mode 100644 oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java create mode 100644 oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryFormatterTest.java create mode 100644 oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/CacheConflictHandlerTest.java create mode 100644 oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/tools/IndexComparator.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodecProvider.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeStateHolderFactory.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStore.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreEditor.java copy oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/{flatfile/SortStrategy.java => incrementalstore/IncrementalFlatFileStoreNodeStateEntryReader.java} (66%) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreNodeStateEntryWriter.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalIndexStoreMetadata.java copy oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/{flatfile/SortStrategy.java => incrementalstore/IncrementalIndexStoreSortStrategy.java} (65%) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreBuilder.java copy oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/{flatfile/SortStrategy.java => incrementalstore/IncrementalStoreOperand.java} (69%) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/MergeIncrementalFlatFileStore.java copy oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexPathService.java => oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/MergeIncrementalStore.java (79%) copy oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/{flatfile/SortStrategy.java => indexstore/IndexStore.java} (64%) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/indexstore/IndexStoreMetadata.java copy oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/{flatfile/SortStrategy.java => indexstore/IndexStoreMetadataOperator.java} (66%) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/indexstore/IndexStoreMetadataOperatorImpl.java copy oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/{flatfile/SortStrategy.java => indexstore/IndexStoreSortStrategy.java} (59%) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/indexstore/IndexStoreSortStrategyBase.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/indexstore/IndexStoreUtils.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeIncrementalFFSTest.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTaskParameterizedTest.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTaskTestBase.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreNodeStateEntryWriterTest.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreIT.java copy oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/package-info.java => oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticQueryIterator.java (58%) create mode 100644 oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ApproximateCounter.java