[ntuple] allow for writing into TFile subdir (WIP) #16838
Draft
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 17 files 17 suites 3d 17h 29m 37s ⏱️ Results for commit 535f543. |
pcanal
reviewed
Nov 6, 2024
| @@ -1124,7 +1139,9 @@ void ROOT::Experimental::Internal::RNTupleFileWriter::Commit() | |||
| { | |||
| if (fFileProper) { | |||
| // Easy case, the ROOT file header and the RNTuple streaming is taken care of by TFile | |||
| fFileProper.fFile->WriteObject(&fNTupleAnchor, fNTupleName.c_str()); | |||
| auto dir = fFileProper.fFile->GetDirectory(fFileProper.fDirectory.c_str()); | |||
| dir->cd(); | |||
There was a problem hiding this comment.
A priori the cd is not needed. If it is then we need to use also a TDirectory::TContext to make the function have no net effect on gDirectory.
pcanal
reviewed
Nov 6, 2024
| std::unique_ptr<ROOT::Experimental::Internal::RNTupleFileWriter> | ||
| ROOT::Experimental::Internal::RNTupleFileWriter::Append(std::string_view ntupleName, TFile &file, | ||
| std::uint64_t maxKeySize) | ||
| { | ||
| auto writer = std::unique_ptr<RNTupleFileWriter>(new RNTupleFileWriter(ntupleName, maxKeySize)); | ||
| auto [dir, name] = SplitNTupleName(ntupleName); |
There was a problem hiding this comment.
Note that it would also be nice to have:
ROOT::Experimental::Internal::RNTupleFileWriter::Append(std::string_view ntupleName, TDIrectory &dir,
std::uint64_t maxKeySize)
{
if (!dir.GetFile())
throw "We need a file";
auto writer = std::unique_ptr<RNTupleFileWriter>(new RNTupleFileWriter(name, maxKeySize));
writer->fFileProper.fFile = dir->GetFile();
writer->fFileProper.fDirectory = &dir;
(oups the type of fDirectory is wrong).
pcanal
reviewed
Nov 6, 2024
| @@ -104,6 +104,7 @@ class RNTupleFileWriter { | |||
| private: | |||
| struct RFileProper { | |||
| TFile *fFile = nullptr; | |||
| std::string fDirectory; | |||
There was a problem hiding this comment.
Either
Suggested change
| std::string fDirectory; | |
| TDirectory* fDirectory; |
or
Suggested change
| std::string fDirectory; | |
| std::string fDirectoryPath; |
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.
Work in progress.
With the patch,
RNTupleWriter::Append()can process a directory and a name like "subdir/ntpl". On the reading side, if the RNTupleReader uses the anchor directly, reading already works.Fixes #14007