This is an automated email from the ASF dual-hosted git repository. thomasm pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 13b66d0a85 Merge pull request #540 from apache/OAK-9749 new 983f82ebe9 OAK-9748 Parallel Merge does not handle download retry correctly new 9b78dc8de1 OAK-9747 Download resume needs to save progress and handle hidden node on exception new 5f0f173d72 OAK-9748 OAK-9748 address review comment new 6ca4dd7506 Merge pull request #536 from Ewocker/GRANITE-38710 The 17638 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: .../indexer/document/DocumentStoreIndexerBase.java | 26 +-- .../indexer/document/NodeStateEntryTraverser.java | 52 +---- .../flatfile/FlatFileNodeStoreBuilder.java | 9 +- .../indexer/document/flatfile/MergeRunner.java | 56 ++++- .../MultithreadedTraverseWithSortStrategy.java | 25 ++- .../document/flatfile/TraverseAndSortTask.java | 42 +++- .../document/flatfile/FlatFileStoreTest.java | 231 ++++++++++++++++++--- .../MultithreadedTraverseWithSortStrategyTest.java | 4 +- .../document/flatfile/TraverseAndSortTaskTest.java | 2 +- 9 files changed, 338 insertions(+), 109 deletions(-)