[ntuple] Refactor RNTupleJoinProcessor::LoadEntry
#17270
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test Results 18 files 18 suites 3d 22h 56m 12s ⏱️ Results for commit 8fa6570. ♻️ This comment has been updated with latest results. |
jblomer
approved these changes
Dec 16, 2024
| } | ||
|
|
||
| // For each auxiliary field, load its value according to the entry number we just found of the ntuple it belongs to. | ||
| for (auto &[fieldName, fieldContext] : fFieldContexts) { |
There was a problem hiding this comment.
Suggested change
| for (auto &[fieldName, fieldContext] : fFieldContexts) { | |
| for (const auto &[_, fieldContext] : fFieldContexts) { |
| @@ -403,32 +403,42 @@ ROOT::Experimental::NTupleSize_t ROOT::Experimental::RNTupleJoinProcessor::Advan | |||
|
|
|||
| void ROOT::Experimental::RNTupleJoinProcessor::LoadEntry() | |||
| { | |||
| // Read the values of the primary ntuple. If no index is used (i.e., the join is aligned), also read the values of | |||
| // auxiliary ntuples. | |||
| for (auto &[fieldName, fieldContext] : fFieldContexts) { | |||
There was a problem hiding this comment.
Suggested change
| for (auto &[fieldName, fieldContext] : fFieldContexts) { | |
| for (const auto &[_, fieldContext] : fFieldContexts) { |
This refactor (along with more documentation) makes it easier to follow the entry loading logic.
enirolf
force-pushed
the
ntuple-processor-join-refactor
branch
from
396441f to
8fa6570
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactoring
RNTupleJoinProcessor::LoadEntry, along with the added documentation should make it easier to follow the entry loading logic (in particular between the primary ntuple and the auxiliary one, and the different code paths for aligned and unaligned joins) and more robust to other (future) code changes.Related to #17132.