Skip to content

perf: faster reading of files with many branches #1448

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

Merged
merged 6 commits into from
Jun 19, 2025
Merged

perf: faster reading of files with many branches #1448

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
401ec6f
Use branch names directly
ariostas Jun 11, 2025
b8725c6
Use offset instead of index for cache_key
ariostas Jun 11, 2025
78362d1
Use branch name directly only if it's alphanumeric
ariostas Jun 12, 2025
cf48ed4
Implement better computation for index of branches
ariostas Jun 12, 2025
459d970
Added explanation for caching of index of all parent branches
ariostas Jun 13, 2025
6d55f75
Better check to see if branchname is valid expression
ariostas Jun 16, 2025
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
18 changes: 12 additions & 6 deletions src/uproot/behaviors/TBranch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import sys
import threading
from collections.abc import Iterable, Mapping, MutableMapping
from keyword import iskeyword

import numpy

Expand Down Expand Up @@ -1977,11 +1978,11 @@ def index(self):
:ref:`uproot.behaviors.TBranch.TBranch.name` is not unique: the
non-recursive index is always unique.
"""
for i, branch in enumerate(self.parent.branches):
if branch is self:
return i
else:
raise AssertionError
if not hasattr(self, "_index"):
# cache index of all branches of the parent to avoid repeating this loop for other branches
for i, branch in enumerate(self.parent.branches):
branch._index = i
return self._index

@property
def interpretation(self):
Expand Down Expand Up @@ -2921,9 +2922,14 @@ def _regularize_expressions(
uproot.interpretation.grouped.AsGrouped,
),
):
branchname_expression = (
branchname
if branchname.isidentifier() and not iskeyword(branchname)
else language.getter_of(branchname)
)
_regularize_expression(
hasbranches,
language.getter_of(branchname),
branchname_expression,
keys,
aliases,
language,
Expand Down
Loading