[ntuple] Throw instead of asserting in RMiniFileReader::ReadBuffer #20986
+23
−3
Conversation
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
jblomer
approved these changes
Jan 22, 2026
| // Read first chunk | ||
| nread = fRawFile->ReadAt(bufCur, fMaxKeySize, offset); | ||
| R__ASSERT(nread == fMaxKeySize); | ||
| if (R__unlikely(nread != fMaxKeySize)) |
Contributor
There was a problem hiding this comment.
I think we should use R__(un)likley only on performance critical paths.
Suggested change
| if (R__unlikely(nread != fMaxKeySize)) | |
| if (nread != fMaxKeySize) |
Contributor
Author
There was a problem hiding this comment.
I used it as a "safe default" since it's also there in R__ASSERT, but it's probably not really impactful in this case.
Test Results 21 files 21 suites 3d 11h 28m 36s ⏱️ Results for commit e742851. |
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.
Corrupted files may cause
ReadBufferto fail, so the proper way of handling it is by returning aRResultrather than asserting.In the interest of not changing the many places using
ReadBuffer, I made it wrap aTryReadBufferfunction that returnsRResultand simply callThrowOnErroron it.This gives similar semantics as before, except
ReadBufferwill throw rather than asserting.