[ntuple] Add Merger tests for Streamer fields#19484
Merged
silverweed merged 2 commits intoroot-project:masterfrom Aug 8, 2025
Merged
[ntuple] Add Merger tests for Streamer fields#19484silverweed merged 2 commits intoroot-project:masterfrom
silverweed merged 2 commits intoroot-project:masterfrom
Conversation
Test Results 21 files 21 suites 3d 3h 55m 54s ⏱️ For more details on these failures, see this check. Results for commit 0b91676. ♻️ This comment has been updated with latest results. |
jblomer
reviewed
Aug 1, 2025
027e773 to
bfb6c8f
Compare
jblomer
approved these changes
Aug 6, 2025
pcanal
reviewed
Aug 6, 2025
pcanal
reviewed
Aug 6, 2025
Also change the failure in GenerateZeroPages from a R__LOG_FATAL to a ROOT::Result failure
Also add [[nodiscard]] to RResultBase::ForwardError to prevent erroneous use of R__FORWARD_ERROR
bfb6c8f to
0b91676
Compare
hahnjo
reviewed
Aug 8, 2025
Comment on lines
+833
to
+837
| if (fIsInitialized) | ||
| for (const auto &field : changeset.fAddedFields) | ||
| if (field->GetStructure() == ENTupleStructure::kStreamer) | ||
| throw ROOT::RException(R__FAIL("a Model cannot be extended with Streamer fields")); | ||
|
|
Member
There was a problem hiding this comment.
This change should probably also be tested outside the merger, in tree/ntuple/test/ntuple_modelext.cxx, as it's a general restriction...
This file contains hidden or 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
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.
Also change the failure in GenerateZeroPages from a R__LOG_FATAL to a ROOT::Result failure (we don't really need to abort the whole process if merging fails)
Checklist: