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 8514864 Merge pull request #524 from klcodanr/elastic-function-support new ea1e15e add simple serialize with test new 2c845ba a good state with uncompressed can be merged new a2a0154 finish gzip part new 602cffc fix unit test new b056ebb lexigraphicla new fd2b896 remove deserialization new 5b65d22 parallel merge new b34e971 done with comments new 2e726a8 keep only parallel merge code new ff097ac fix resume test new 2b82c89 multithread parallel merge new 9561450 address review comments new 1dc5593 address review comment new ce0bd76 separate out Merge class new 0dc296d add test case for MergeRunner new 5b06983 address review comment new 635df52 Merge branch 'trunk' into parallel-merge new 2d3bc30 add test cases new 64a916b Merge pull request #508 from Ewocker/parallel-merge The 17600 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-run-commons/pom.xml | 7 + .../flatfile/FlatFileNodeStoreBuilder.java | 23 +- .../indexer/document/flatfile/MergeRunner.java | 301 +++++++++++++++++++++ .../MultithreadedTraverseWithSortStrategy.java | 88 +++--- .../document/flatfile/TraverseAndSortTask.java | 11 +- .../indexer/document/flatfile/MergeRunnerTest.java | 280 +++++++++++++++++++ .../document/flatfile/TraverseAndSortTaskTest.java | 3 +- 7 files changed, 663 insertions(+), 50 deletions(-) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunner.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunnerTest.java