Skip to content

[ntuple] add support for attribute merging - #23808

Merged
dpiparo merged 7 commits into
root-project:masterfrom
silverweed:ntuple_merge_slow_4
Oct 28, 2026
Merged

dpiparo merged 7 commits into
root-project:masterfrom
silverweed:ntuple_merge_slow_4

Conversation

@silverweed

Copy link
Copy Markdown
Contributor

Depends on #23739.

Adds support for RNTupleAttributes merging via custom MergeActions + slow merging.

@silverweed silverweed added this to the 6.42.00 milestone Oct 23, 2026
@silverweed
silverweed requested review from enirolf and hahnjo October 23, 2026 09:31
@silverweed silverweed self-assigned this Oct 23, 2026
@github-actions

github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown

Test Results

    23 files      23 suites   3d 21h 19m 32s ⏱️
 3 900 tests  3 900 ✅ 0 💤 0 ❌
79 693 runs  79 693 ✅ 0 💤 0 ❌

Results for commit 4ccd8e7.

♻️ This comment has been updated with latest results.

@silverweed
silverweed force-pushed the ntuple_merge_slow_4 branch 5 times, most recently from 82ae349 to a117cca Compare October 27, 2026 08:07
@silverweed
silverweed marked this pull request as ready for review October 27, 2026 08:08
@jblomer jblomer modified the milestones: 6.42.00, 6.42.00-rc1 Oct 27, 2026

@jblomer jblomer left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Sorry, posted this too early. Amending.)

LGTM (but see the compiler warning in RNTupleMerger.cxx)

Maybe add one more test for merging one/two empty attribute sets (can be a different PR).

@jblomer jblomer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, as discussed, the model extension of subfields should be restricted to the attributes user-defined model's root field.

@silverweed
silverweed force-pushed the ntuple_merge_slow_4 branch 3 times, most recently from 19070ad to 4ccd8e7 Compare October 27, 2026 15:21
@dpiparo
dpiparo merged commit 602e98f into root-project:master Oct 28, 2026
27 of 33 checks passed
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.

3 participants