Refactor the RNTupleWriter internals and reduce some code duplication #614
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
4 tasks
tmadlener
force-pushed
the
refactor-rntuple-writer
branch
2 times, most recently
from
0514a03 to
35713a9
Compare
- Lift common type defs into one header to not redefine them - Keep all root related utilitie classes in one header
tmadlener
force-pushed
the
refactor-rntuple-writer
branch
from
35713a9 to
ba9f090
Compare
hegner
requested changes
Jun 11, 2024
| { | ||
| auto& mtx = getMutex<T>(); | ||
| const auto& map = getMap<T>(); | ||
| std::lock_guard lock{mtx}; |
There was a problem hiding this comment.
Whenever locks are being used one should document where why and when they are needed
| TBranch* data{nullptr}; | ||
| std::vector<TBranch*> refs{}; | ||
| std::vector<TBranch*> vecs{}; | ||
| std::vector<std::string> refNames{}; ///< The names of the relation branches |
There was a problem hiding this comment.
in principle one could do indices instead of strings here, but for the sake of simplicity we stay with this.
There was a problem hiding this comment.
Indices would be harder to work with here IMHO, because we don't maintain a list of all TBranches that we have (let alone their order). We simply use this to group the pointers that we get from the TTree and let that do all the management.
4 tasks
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.
BEGINRELEASENOTES
RNTupleWriterinternals a bit and reduce some code duplication between theRNTupleWriterand theROOTWritergetKeysandgetValuesmethods toGenericParametersCollectionBranches.hheader and move all root related helpers intoutilities/RootHelpers.hENDRELEASENOTES
In more detail:
RNTupleWriter::CollectionInfostruct toRNTupleWriter::CategoryInfoand group the members that are used to store and write the GenericParameters data into that, such that all data belonging to a category are grouped togetherParamStorageto more easily refer to a pair of keys and values (vectors). This is done in preparation for another PR that is in the works for addressing GenericParameters should be stored the same way for TTree and RNTuple backends #590.ROOTWriterand theRNTupleWriterinto the newly createdutilities/RootHelpers.hheader