[TTree] when merging, ignore trees without branches#17652
Merged
pcanal merged 4 commits intoroot-project:masterfrom Feb 28, 2025
Merged
[TTree] when merging, ignore trees without branches#17652pcanal merged 4 commits intoroot-project:masterfrom
pcanal merged 4 commits intoroot-project:masterfrom
Conversation
pcanal
reviewed
Feb 6, 2025
ferdymercury
commented
Feb 6, 2025
pcanal
reviewed
Feb 6, 2025
ferdymercury
commented
Feb 7, 2025
Test Results 18 files 18 suites 4d 6h 29m 39s ⏱️ Results for commit 7f6cce8. ♻️ This comment has been updated with latest results. |
Member
|
Part of my confusion is that #12510 is indeed about a file with branches and no entries. With the files https://github.com/root-project/root/files/11333378/dummyFiles.zip, we get: I.e. Row 0 is wrong. Nonetheless, it might (or might not) be fixed by this PR, in particular in my last proposal the part: i.e. cloning the structure even if there is no entries, might solve the issue. |
ferdymercury
commented
Feb 8, 2025
ferdymercury
commented
Feb 8, 2025
ferdymercury
commented
Feb 8, 2025
ferdymercury
commented
Feb 8, 2025
ferdymercury
commented
Feb 8, 2025
ferdymercury
commented
Feb 8, 2025
[TTree] when merging, do not clone branch structure if no entries Fixes root-project#14558 Fixes root-project#12510 [test] add fully qualified tree [tree] skip trees with zero branches in static merge By pcanal [test] amend tests with cases [tree] restore prev behavior [tree] skip "this" when Merge starts with empty-branch tree as implemented by pcanal [skip-ci] clarify comments [tree] early exit if all empty [test] fix merge substitution
a1c421d to
bde31d1
Compare
ferdymercury
commented
Feb 28, 2025
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.
This Pull request:
Alternative to #17650 as suggested by pcanal
Changes or fixes:
Fixes #14558
Fixes #12510