Skip to content

[ntuple] Add slow merging strategy - #23739

Merged
silverweed merged 5 commits into
root-project:masterfrom
silverweed:ntuple_merge_slow_4_2
Oct 26, 2026
Merged

silverweed merged 5 commits into
root-project:masterfrom
silverweed:ntuple_merge_slow_4_2

Conversation

@silverweed

@silverweed silverweed commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

This PR adds preliminary support for L4 ("slow") merging in the RNTupleMerger.
It does so by adding a new MergeStrategy that implements the slow merging flow. This is not yet enabled in any case by this PR but it will be used by attribute merging in a later PR.
I tested as much as I could this new flow and it works for most cases (the test failures that one would have by setting doSlowMerge = true are almost entirely due to test expectations that don't hold for slow merging).

Proper testing will be added when slow merging is enabled in the future, but for 6.42 it'll only be used by attributes, and they will get proper tests.

@silverweed
silverweed requested review from enirolf and hahnjo October 16, 2026 13:59
@silverweed silverweed self-assigned this Oct 16, 2026
@github-actions

github-actions Bot commented Oct 16, 2026 •

Copy link
Copy Markdown

Test Results

    24 files      24 suites   4d 3h 8m 21s ⏱️
 3 897 tests  3 897 ✅ 0 💤 0 ❌
83 436 runs  83 436 ✅ 0 💤 0 ❌

Results for commit d5f8107.

♻️ This comment has been updated with latest results.

@silverweed
silverweed force-pushed the ntuple_merge_slow_4_2 branch 5 times, most recently from a1f9236 to 028c7c6 Compare October 23, 2026 08:40
@silverweed
silverweed requested a review from pcanal October 23, 2026 08:44
@silverweed
silverweed marked this pull request as ready for review October 23, 2026 08:44
@silverweed
silverweed requested a review from jblomer as a code owner October 23, 2026 08:44
@silverweed silverweed added this to the 6.42.00 milestone Oct 23, 2026
@silverweed
silverweed force-pushed the ntuple_merge_slow_4_2 branch from 028c7c6 to 75e930a Compare October 23, 2026 11:33
Comment thread tree/ntuple/inc/ROOT/RFieldBase.hxx Outdated
Comment thread tree/ntuple/src/RNTupleMerger.cxx Outdated
@silverweed
silverweed force-pushed the ntuple_merge_slow_4_2 branch 2 times, most recently from 486f2e0 to 8cfc0e7 Compare October 23, 2026 14:59
@silverweed
silverweed force-pushed the ntuple_merge_slow_4_2 branch from 8cfc0e7 to d5f8107 Compare October 26, 2026 07:57
@silverweed
silverweed merged commit 3baf0a3 into root-project:master Oct 26, 2026
35 of 36 checks passed
@silverweed
silverweed deleted the ntuple_merge_slow_4_2 branch October 26, 2026 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants