Skip to content

[ntuple] Split primary and auxiliary models in RNTupleJoinProcessor::CreateJoin #17936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 27, 2025

Conversation

enirolf
Copy link
Contributor

@enirolf enirolf commented Mar 10, 2025

To reflect the interface changes introduced in #17964, instead of a single list of models (one per primary/auxiliary ntuple), a distinction is made between the models of the primary and auxiliary ntuples.

Same as before, internally they are combined into one singular model used by the processor. This model has to have the schemas of auxiliary RNTuples as untyped record fields, where the name of the record field is the name of the RNTuple.

A new addition is the added support for partial model specification in the list of auxiliary models. This means that users can pass a null pointer in the position of the corresponding ntuple, and then only for that ntuple, the processor will infer the model from the on-disk descriptor.

Helps move forward #17132.

@enirolf enirolf self-assigned this Mar 10, 2025
@enirolf enirolf requested a review from jblomer as a code owner March 10, 2025 12:49
Copy link

github-actions bot commented Mar 10, 2025

Test Results

    19 files      19 suites   5d 2h 14m 13s ⏱️
 2 729 tests  2 728 ✅ 0 💤 1 ❌
50 035 runs  50 034 ✅ 0 💤 1 ❌

For more details on these failures, see this check.

Results for commit 5666021.

♻️ This comment has been updated with latest results.

@enirolf enirolf marked this pull request as draft March 12, 2025 15:11
@enirolf enirolf force-pushed the ntuple-processor-join-model branch 2 times, most recently from cc09ee6 to 1c01b4e Compare March 12, 2025 16:02
@enirolf enirolf changed the title [ntuple] Require single model in RNTupleJoinProcessor::Create [ntuple] Split primary and auxiliary models in RNTupleJoinProcessor::CreateJoin Mar 13, 2025
@enirolf enirolf force-pushed the ntuple-processor-join-model branch from 1c01b4e to af05f1e Compare March 13, 2025 07:47
@enirolf enirolf marked this pull request as ready for review March 13, 2025 10:16
@enirolf enirolf requested a review from pcanal March 13, 2025 10:17
@enirolf enirolf force-pushed the ntuple-processor-join-model branch 2 times, most recently from 435ae83 to be24fe8 Compare March 18, 2025 09:18
@enirolf enirolf requested a review from hahnjo March 18, 2025 09:19
Copy link
Member

@hahnjo hahnjo left a comment

Choose a reason for hiding this comment

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

One final comment when looking at the code again; we probably want to test a mixture of bare and non-bare models...

@enirolf enirolf force-pushed the ntuple-processor-join-model branch from be24fe8 to 1965191 Compare March 18, 2025 14:56
Copy link
Member

@hahnjo hahnjo left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM! (should have a second approval)

@enirolf enirolf force-pushed the ntuple-processor-join-model branch from 1965191 to 29540c8 Compare March 21, 2025 16:22
enirolf added 5 commits March 24, 2025 08:48
To reflect the interface changes introduced in rev d5b4931, instead of a
single list of models (one per primary/auxiliary ntuple), a distinction
is made between the models of the primary and auxiliary ntuples. Same as
before, internally they are combined into one singular model used by the
processor.
@enirolf enirolf force-pushed the ntuple-processor-join-model branch from 29540c8 to 5666021 Compare March 24, 2025 08:22
@enirolf enirolf requested a review from silverweed March 26, 2025 08:10
Copy link
Contributor

@silverweed silverweed left a comment

Choose a reason for hiding this comment

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

LGTM

@enirolf enirolf merged commit 1d75a7e into root-project:master Mar 27, 2025
21 of 24 checks passed
@enirolf enirolf deleted the ntuple-processor-join-model branch March 27, 2025 13:30
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.

4 participants