This is an automated email from the ASF dual-hosted git repository. miroslav pushed a change to branch issue/OAK-10464 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from fa4a1148cd OAK-10464 testcontainers dependency add 2c83efbefc OAK-10334: Node.addMixin() may overwrite existing mixins add 0b8223f113 OAK-10334: Node.addMixin() may overwrite existing mixins add cf521f072e Merge branch 'trunk' into OAK-10334 add 028e8d3618 OAK-10334: Node.addMixin() may overwrite existing mixins add 46109d1d84 Merge branch 'trunk' into OAK-10334 add 04ad212826 [maven-release-plugin] prepare for next development iteration add 921467d8ef OAK-10399 Automatically pick a merged index over multiple levels add 79bd999aef OAK-10399 Automatically pick a merged index over multiple levels add cb5df597c8 OAK-10420 Tool to compare Lucene index content add 81e49e5f8d Revert "OAK-10399 Automatically pick a merged index over multiple levels" add 1d50d20bd6 Revert "Revert "OAK-10399 Automatically pick a merged index over multiple levels"" add 482c5ac821 Revert "OAK-10420 Tool to compare Lucene index content" add 77f36b3252 OAK-10399 Automatically pick a merged index over multiple levels add 009ef2c185 Merge pull request #1066 from apache/OAK-10399 add 8c3116832b Clarified a pitfall with --merge-paths add e11d20cb3d Merge pull request #161 from sbluhm/patch-1 add 5ee4afcaa9 OAK-10419: Release Oak 1.56.0 - fix project versions add e91361faa5 Merge branch 'trunk' into OAK-10334 add dcb47fc0bc Merge pull request #1011 from mreutegg/OAK-10334 add 634cb27d07 OAK-10413: DocumentStoreIndexerIT hanging add 42eee1060b OAK-10427: Clear cache on NodeDocumentCache close add a90f97d02a Merge pull request #1098 from mreutegg/OAK-10427 add ad1a4298f2 OAK-10426: oak-segment-azure: enable baseline check (#1097) add 757553face OAK-10425: Ability to remove mixin type without read permission on jcr:mixinTypes property add 09aaa8164f Merge pull request #1100 from mreutegg/OAK-10425 add 0be1b75008 Merge branch 'trunk' into OAK-10413 add f4b86c806d Merge pull request #1099 from mreutegg/OAK-10413 add cccd6b68e9 OAK-10430: oak-*-azure: add to OSGi tests (#1102) add 2d51b15ee0 OAK-10358 - Filter by path on MongoDB query when downloading repository in Indexing job (#1042) add f948e36cfb OAK-10371: oak-segment-azure/oak-blob-cloud-azure require provided Guava, embed it instead (#1105) add 6ec7926e90 OAK-10423 - Improve logging of metrics in the indexing job (#1093) add 13dbe7d6a7 OAK-10439: Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.12 (#1109) add 70c4eb84c5 OAK-10433 | Throttle warn logs for multivalued ordered property (#1108) add 95ce8d2768 Revert "OAK-10371: oak-segment-azure/oak-blob-cloud-azure require provided Guava, embed it instead (#1105)" add 1e55c01b22 OAK-10384: Fix stripping of large indexed ordered properties (#1071) add e13a933fe4 OAK-10441: exclude snakeyaml from oak-search-elastic (#1110) add 485288d555 OAK-10043: refactor AbstractDataStoreService so that it doesn't need the statisticsProvider OSGi reference (#1113) add 2a0ecd4226 Revert "OAK-10441: exclude snakeyaml from oak-search-elastic (#1110)" add bfcafd230a Revert "OAK-10430: oak-*-azure: add to OSGi tests (#1102)" add 41741a19a5 OAK-10430: oak-*-azure: add to OSGi tests (#1102) add a2c9de28a9 Revert "OAK-10043: refactor AbstractDataStoreService so that it doesn't need the statisticsProvider OSGi reference (#1113)" add 64f49fc0e0 OAK-10443: refactor AbstractDataStoreService so that it doesn't need the statisticsProvider OSGi reference (#1115) add ab253320c9 OAK-10441: exclude snakeyaml from oak-search-elastic (#1116) add 3a829df266 OAK-6759: Convert oak-blob-cloud-azure to OSGi R6 annotations (#1112) add 39f524a342 OAK-10446: Upgrade jackson-databind dependency to 2.15.2 (#1119) add dcd46825e2 OAK-10447: update Tomcat JDBC dependency to 9.0.80 (#1120) add 094941333e OAK-10371: oak-segment-azure/oak-blob-cloud-azure require provided Guava, embed it instead (#1105) (#1117) add 33dbf0b8b9 OAK-10442 | Fixing docs to reflect aggregation does not support node type inheritence. (#1118) add 488050fc91 OAK-10434: oak-segment-azure/oak-blob-cloud-azure: update SDK dependencies (#1122) add d4410fd149 OAK-10448 Convert o.a.j.api.security.user.Query back to ConsumerType (#1121) add e354eed2c2 OAK-10445 downgrade INFO log message to DEBUG (#1124) add 59f62bafa5 OAK-10449: bump zookeeper to v3.4.14 (#1127) add f8a06bc258 OAK-10377: Checked-out state of non-versionable nodes is not handled correctly (#1126) 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)" new 13ed6312d6 OAK-10464 - merge with trunk 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: oak-api/pom.xml | 2 +- oak-auth-external/pom.xml | 2 +- oak-auth-ldap/pom.xml | 2 +- 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 | 24 +- .../blobstorage/AbstractAzureDataStoreService.java | 10 +- .../azure/blobstorage/AzureDataStoreService.java | 20 +- oak-blob-cloud/pom.xml | 2 +- .../blob/cloud/s3/AbstractS3DataStoreService.java | 14 + oak-blob-plugins/pom.xml | 2 +- .../blob/AbstractSharedCachingDataStore.java | 2 +- .../blob/datastore/AbstractDataStoreService.java | 21 +- .../plugins/blob/datastore/DbDataStoreService.java | 12 + .../blob/datastore/FileDataStoreService.java | 13 + oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- .../oak/plugins/index/FormattingUtils.java | 27 +- .../oak/plugins/index/MetricsFormatter.java | 64 ++++ .../oak/plugins/index/importer/IndexImporter.java | 27 +- .../plugins/version/ReadOnlyVersionManager.java | 2 +- .../oak/plugins/version/VersionEditor.java | 2 +- .../oak/plugins/index/MetricsFormatterTest.java} | 25 +- .../version/ReadOnlyVersionManagerTest.java | 14 +- oak-doc-railroad-macro/pom.xml | 2 +- oak-doc/pom.xml | 2 +- oak-doc/src/site/markdown/migration.md | 2 + oak-doc/src/site/markdown/query/lucene.md | 2 + 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 | 25 +- oak-it-osgi/test-bundles.xml | 4 + oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- .../apache/jackrabbit/api/security/user/Query.java | 4 +- .../jackrabbit/api/security/user/package-info.java | 2 +- oak-jcr/pom.xml | 5 +- .../jackrabbit/oak/jcr/delegate/NodeDelegate.java | 6 +- .../jackrabbit/oak/jcr/session/NodeImpl.java | 13 +- .../security/authorization/ReadPropertyTest.java | 73 +++++ .../oak/jcr/version/VersionableTest.java | 75 +++++ oak-lucene/pom.xml | 2 +- .../plugins/index/lucene/LuceneDocumentMaker.java | 62 +++- .../composite/blueGreen/CustomizedIndexTest.java | 40 ++- .../oak/composite/blueGreen/IndexUtils.java | 1 - .../lucene/LuceneLargeStringPropertyTest.java | 116 ++++++- oak-parent/pom.xml | 19 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml | 2 +- oak-run-commons/pom.xml | 2 +- .../jackrabbit/oak/index/IndexerSupport.java | 6 +- .../indexer/document/DocumentStoreIndexerBase.java | 74 ++++- .../flatfile/FlatFileNodeStoreBuilder.java | 130 +++++--- .../indexer/document/flatfile/FlatFileStore.java | 41 ++- .../document/flatfile/FlatFileStoreUtils.java | 4 + .../MultithreadedTraverseWithSortStrategy.java | 54 ++-- .../document/flatfile/NodeStateEntryReader.java | 6 +- .../document/flatfile/NodeStateEntryWriter.java | 4 +- .../document/flatfile/SimpleNodeStateHolder.java | 2 +- .../indexer/document/flatfile/SortStrategy.java | 4 + .../document/flatfile/StoreAndSortStrategy.java | 42 ++- .../flatfile/TraverseWithSortStrategy.java | 45 +-- .../flatfile/pipelined/PipelinedMergeSortTask.java | 31 +- .../pipelined/PipelinedMongoDownloadTask.java | 301 +++++++++++++----- .../flatfile/pipelined/PipelinedSortBatchTask.java | 22 +- .../flatfile/pipelined/PipelinedStrategy.java | 95 ++++-- .../flatfile/pipelined/PipelinedTransformTask.java | 37 ++- .../pipelined/TransformStageStatistics.java | 36 +-- .../incrementalstore/IncrementalFlatFileStore.java | 47 +++ .../IncrementalFlatFileStoreEditor.java | 117 +++++++ ...crementalFlatFileStoreNodeStateEntryReader.java | 11 +- ...crementalFlatFileStoreNodeStateEntryWriter.java | 70 +++++ .../IncrementalFlatFileStoreStrategy.java | 170 +++++++++++ .../IncrementalIndexStoreMetadata.java | 64 ++++ .../IncrementalIndexStoreSortStrategy.java} | 22 +- .../incrementalstore/IncrementalStoreBuilder.java | 150 +++++++++ .../incrementalstore/IncrementalStoreOperand.java | 19 +- .../MergeIncrementalFlatFileStore.java | 220 ++++++++++++++ .../incrementalstore/MergeIncrementalStore.java | 11 +- .../IndexStore.java} | 23 +- .../document/indexstore/IndexStoreMetadata.java | 43 ++- .../indexstore/IndexStoreMetadataOperator.java | 12 +- .../indexstore/IndexStoreMetadataOperatorImpl.java | 69 +++++ .../IndexStoreSortStrategy.java} | 28 +- .../indexstore/IndexStoreSortStrategyBase.java | 94 ++++++ .../IndexStoreUtils.java} | 52 +++- .../document/flatfile/MergeIncrementalFFSTest.java | 130 ++++++++ .../document/flatfile/pipelined/PipelinedIT.java | 174 +++++++++-- .../pipelined/PipelinedMongoDownloadTaskTest.java | 33 +- ...entalFlatFileStoreNodeStateEntryWriterTest.java | 71 +++++ .../incrementalstore/IncrementalStoreIT.java | 335 +++++++++++++++++++++ oak-run-elastic/pom.xml | 2 +- .../oak/index/ElasticDocumentStoreIndexer.java | 2 +- oak-run/pom.xml | 2 +- .../apache/jackrabbit/oak/index/IndexCommand.java | 11 +- .../indexer/document/DocumentStoreIndexer.java | 2 +- .../oak/indexversion/PurgeOldIndexVersionIT.java | 2 + oak-search-elastic/pom.xml | 22 +- .../elastic/index/ElasticBulkProcessorHandler.java | 7 +- .../index/elastic/ElasticReliabilityTest.java | 24 +- .../plugins/index/elastic/ElasticTestServer.java | 4 +- oak-search-mt/pom.xml | 2 +- oak-search/pom.xml | 2 +- .../search/spi/editor/FulltextDocumentMaker.java | 33 +- .../plugins/index/search/spi/query/IndexName.java | 50 ++- .../index/search/spi/query/IndexNameTest.java | 17 +- oak-security-spi/pom.xml | 2 +- .../jackrabbit/oak/plugins/tree/TreeUtil.java | 43 ++- .../jackrabbit/oak/plugins/tree/package-info.java | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml | 34 +-- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-shaded-guava/pom.xml | 2 +- oak-solr-core/pom.xml | 2 +- oak-solr-osgi/pom.xml | 5 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- .../plugins/document/cache/NodeDocumentCache.java | 2 + .../document/mongo/LeaseUpdateSocketTimeoutIT.java | 13 +- oak-store-spi/pom.xml | 2 +- .../jackrabbit/oak/spi/filter/PathFilter.java | 19 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 +- 133 files changed, 3397 insertions(+), 608 deletions(-) copy oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/RemoteStoreMonitorAdapter.java => oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java (56%) create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java copy oak-core/src/{main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateCallback.java => test/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatterTest.java} (55%) 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-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/split/SplitBlobStore.java => oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreNodeStateEntryReader.java (70%) 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-store-spi/src/test/java/org/apache/jackrabbit/oak/fixture/MemoryFixture.java => oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreOperand.java (71%) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/MergeIncrementalFlatFileStore.java copy oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/split/SplitBlobStore.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%) copy oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FacetSearcher.java => oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/indexstore/IndexStoreMetadata.java (50%) copy oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTDirectoryFactory.java => oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/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/{NodeStateIndexer.java => indexstore/IndexStoreSortStrategy.java} (59%) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/indexstore/IndexStoreSortStrategyBase.java copy oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/{flatfile/FlatFileStoreUtils.java => indexstore/IndexStoreUtils.java} (59%) 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/incrementalstore/IncrementalFlatFileStoreNodeStateEntryWriterTest.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreIT.java