Skip to content

Propagate TTree bulk-read errors #15624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
autumn-mck wants to merge 1 commit into
base: dev
Choose a base branch
from
+14 −0
Open

Propagate TTree bulk-read errors #15624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Framework/AnalysisSupport/src/TTreePlugin.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ auto readBoolValues = [](uint8_t* target, ReadOps& op, TBufferFile& rootBuffer)
while (readEntries < op.rootBranchEntries) {
auto beginValue = readEntries;
readLast = op.branch->GetBulkRead().GetBulkEntries(readEntries, rootBuffer);
if (readLast < 0) {
throw runtime_error_f("Error while reading branch %s starting from %d.", op.branch->GetName(), readEntries);
}
int size = readLast * op.listSize;
readEntries += readLast;
for (int i = beginValue; i < beginValue + size; ++i) {
Expand All @@ -228,7 +231,18 @@ auto readVLAValues = [](uint8_t* target, ReadOps& op, ReadOps const& offsetOp, T
rootBuffer.Reset();
while (readEntries < op.rootBranchEntries) {
auto readLast = op.branch->GetBulkRead().GetEntriesSerialized(readEntries, rootBuffer);
if (readLast < 0) {
throw runtime_error_f("Error while reading branch %s starting from %d.", op.branch->GetName(), readEntries);
}
if (readEntries + readLast > op.rootBranchEntries) {
throw runtime_error_f("Invalid read range for branch %s: starting from %d, read %d entries, total entries %lld.",
op.branch->GetName(), readEntries, readLast, static_cast<long long>(op.rootBranchEntries));
}
int size = offsets[readEntries + readLast] - offsets[readEntries];
if (size < 0) {
throw runtime_error_f("Invalid offset range for branch %s: offsets[%d]=%d, offsets[%d]=%d.",
op.branch->GetName(), readEntries, offsets[readEntries], readEntries + readLast, offsets[readEntries + readLast]);
}
readEntries += readLast;
bigEndianCopy(target, rootBuffer.GetCurrent(), size, op.typeSize);
target += (ptrdiff_t)(size * op.typeSize);
Expand Down
Loading