[treereader] Correctly treat empty trees with range loop iteration#16257
Merged
dpiparo merged 1 commit intoroot-project:masterfrom Aug 18, 2024
Merged
[treereader] Correctly treat empty trees with range loop iteration#16257dpiparo merged 1 commit intoroot-project:masterfrom
dpiparo merged 1 commit intoroot-project:masterfrom
Conversation
Test Results 13 files 13 suites 2d 21h 30m 35s ⏱️ Results for commit fed262b. ♻️ This comment has been updated with latest results. |
pcanal
requested changes
Aug 16, 2024
tree/treeplayer/inc/TTreeReader.h
Outdated
Comment on lines
96
to
102
| if (fReader->GetTree()->GetEntries() == 0 && fEntry == 0 && !lhs.IsValid()) { | ||
| return true; | ||
| } | ||
| if (lhs.fReader->GetTree()->GetEntries() == 0 && lhs.fEntry == 0 && !IsValid()) { | ||
| return true; | ||
| } |
Member
There was a problem hiding this comment.
Suggested change
| if (fReader->GetTree()->GetEntries() == 0 && fEntry == 0 && !lhs.IsValid()) { | |
| return true; | |
| } | |
| if (lhs.fReader->GetTree()->GetEntries() == 0 && lhs.fEntry == 0 && !IsValid()) { | |
| return true; | |
| } | |
| if (fReader->GetTree()->GetEntriesFast() == 0 && fEntry == 0 && !lhs.IsValid()) { | |
| return true; | |
| } | |
| if (lhs.fReader->GetTree()->GetEntriesFast() == 0 && lhs.fEntry == 0 && !IsValid()) { | |
| return true; | |
| } |
If LoadTree(0) has been called and there is really zero elements in the chain then GetEntriesFast will be zero.
If there is code path where we can get here and LoadTree(0) has not been called I suspect we could call it safely here (but hopefully we don't have this case).
Member
Author
|
all comments addressed, code updated, tests restarted. |
instead of allowing a spurious iteration with zero entries. Fixes root-project#16249
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
2 participants
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.
instead of allowing a spurious iteration with zero entries.
Fixes #16249