This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch issue/oak-10462
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from c6e49a4b44 OAK-10462:
o.a.j.o.plugins.version.VersionEditor#propertyAdded() may mistakenly assume an
ongoing restore operation.
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 2c180e47b4 Merge branch 'trunk' into issue/oak-10462
No new revisions were added by this update.
Summary of changes:
RELEASE-NOTES.txt | 100 ++++----
oak-api/pom.xml | 2 +-
oak-auth-external/pom.xml | 2 +-
.../principal/InheritedMembershipIterator.java | 29 ++-
.../external/impl/DynamicSyncTest.java | 66 +++++
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 | 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 | 2 +-
.../oak/commons/sort/ExternalSortByteArray.java | 223 +++++++++++++++++
.../jackrabbit/oak/commons/sort/package-info.java | 2 +-
.../commons/sort/ExternalSortByteArrayTest.java | 183 ++++++++++++++
.../oak/commons/sort/ExternalSortTest.java | 4 +-
oak-core-spi/pom.xml | 2 +-
oak-core/pom.xml | 2 +-
.../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 +
.../index/property/PropertyIndexInfoProvider.java | 10 +
.../oak/plugins/version/VersionableState.java | 84 ++++---
.../jackrabbit/oak/query/QueryEngineSettings.java | 2 +-
.../oak/security/user/CacheConflictHandler.java | 95 +++++++
.../oak/security/user/UserConfigurationImpl.java | 2 +-
.../plugins/index/inventory/IndexPrinterTest.java | 10 +
.../security/user/CacheConflictHandlerTest.java | 121 +++++++++
.../security/user/UserConfigurationImplTest.java | 2 +-
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 | 2 +-
oak-it/pom.xml | 6 +-
oak-jackrabbit-api/pom.xml | 2 +-
oak-jcr/pom.xml | 7 +-
.../jackrabbit/oak/jcr/SameNameSiblingTest.java | 13 +
oak-lucene/pom.xml | 6 +-
.../index/lucene/LuceneIndexInfoProvider.java | 11 +
.../composite/blueGreen/CustomizedIndexTest.java | 50 ++++
.../oak/composite/blueGreen/Persistence.java | 6 +-
oak-parent/pom.xml | 14 +-
oak-pojosr/pom.xml | 6 +-
oak-query-spi/pom.xml | 2 +-
oak-run-commons/pom.xml | 6 +-
.../indexer/document/DocumentStoreIndexerBase.java | 17 +-
.../flatfile/FlatFileNodeStoreBuilder.java | 19 +-
.../document/flatfile/FlatFileStoreUtils.java | 6 -
.../MultithreadedTraverseWithSortStrategy.java | 3 +
.../document/flatfile/NodeStateEntryWriter.java | 4 +
.../document/flatfile/StoreAndSortStrategy.java | 5 +
.../flatfile/TraverseWithSortStrategy.java | 6 +-
.../flatfile/pipelined/NodeStateHolder.java | 23 +-
.../flatfile/pipelined/NodeStateHolderFactory.java | 84 +++++++
.../flatfile/pipelined/PathElementComparator.java | 7 +-
.../flatfile/pipelined/PipelinedMergeSortTask.java | 273 +++++++++++++++++----
.../pipelined/PipelinedMongoDownloadTask.java | 12 +-
.../flatfile/pipelined/PipelinedSortBatchTask.java | 25 +-
.../flatfile/pipelined/PipelinedStrategy.java | 56 ++---
.../IncrementalFlatFileStoreStrategy.java | 6 +-
.../MergeIncrementalFlatFileStore.java | 5 +-
.../document/indexstore/IndexStoreUtils.java | 7 +
.../oak/indexversion/IndexVersionOperation.java | 2 +-
.../oak/indexversion/PurgeOldIndexVersion.java | 2 +-
.../oak/indexversion/PurgeOldVersionUtils.java | 2 +-
.../oak/run/cli/DocumentFixtureProvider.java | 2 +
.../flatfile/FlatFileNodeStoreBuilderTest.java | 58 +++--
.../document/flatfile/FlatFileStoreTest.java | 5 -
.../document/flatfile/pipelined/PipelinedIT.java | 33 +--
.../PipelinedMergeSortTaskParameterizedTest.java | 117 +++++++++
.../pipelined/PipelinedMergeSortTaskTest.java | 137 +++++++----
.../pipelined/PipelinedMergeSortTaskTestBase.java | 129 ++++++++++
.../pipelined/PipelinedMongoDownloadTaskTest.java | 5 +-
.../pipelined/PipelinedSortBatchTaskTest.java | 39 +--
.../incrementalstore/IncrementalStoreIT.java | 11 +-
oak-run-elastic/pom.xml | 2 +-
.../indexversion/ElasticIndexVersionOperation.java | 2 +-
.../indexversion/ElasticPurgeOldIndexVersion.java | 2 +-
oak-run/pom.xml | 6 +-
.../apache/jackrabbit/oak/index/IndexCommand.java | 7 -
.../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 | 9 +-
oak-search-elastic/pom.xml | 4 +-
.../index/elastic/ElasticIndexInfoProvider.java | 10 +
.../index/elastic/ElasticIndexStatistics.java | 44 +++-
.../plugins/index/elastic/query/ElasticIndex.java | 41 ++--
.../index/elastic/query/ElasticQueryIterator.java | 20 +-
.../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 | 14 +-
.../index/elastic/ElasticIndexQueryCommonTest.java | 10 +-
.../index/elastic/ElasticIndexStatisticsTest.java | 16 ++
.../elastic/ElasticIndexSuggestionCommonTest.java | 26 ++
.../index/elastic/ElasticSpellcheckCommonTest.java | 28 +++
oak-search-mt/pom.xml | 2 +-
oak-search/pom.xml | 2 +-
.../index/search/spi/query/FulltextIndex.java | 159 +++++++-----
.../search/spi/query/FulltextIndexPlanner.java | 2 +-
.../plugins/index/search/spi/query/IndexName.java | 13 +-
.../oak/plugins/index/IndexQueryCommonTest.java | 2 +-
.../plugins/index/IndexSuggestionCommonTest.java | 22 +-
.../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 +-
oak-segment-tar/pom.xml | 2 +-
oak-shaded-guava/pom.xml | 6 +-
oak-solr-core/pom.xml | 2 +-
oak-solr-osgi/pom.xml | 2 +-
oak-store-composite/pom.xml | 2 +-
oak-store-document/pom.xml | 7 +-
.../mongo/MongoDocumentNodeStoreBuilderBase.java | 21 +-
.../plugins/document/MongoConnectionFactory.java | 2 +-
.../plugins/document/mongo/MongoDockerRule.java | 124 ++++++----
oak-store-spi/pom.xml | 2 +-
oak-upgrade/pom.xml | 10 +-
pom.xml | 2 +-
145 files changed, 2691 insertions(+), 853 deletions(-)
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/security/user/CacheConflictHandler.java
create mode 100644
oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/CacheConflictHandlerTest.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/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
copy
oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/MemoryBlobStoreTest.java
=>
oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticQueryIterator.java
(59%)
