Skip to content

fix: Batch commit file change queries to avoid timeouts #103170

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 3 commits into from
Nov 12, 2025
Merged

fix: Batch commit file change queries to avoid timeouts #103170

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae6dd86
fix: Batch commit file change queries to avoid timeouts
seer-by-sentry[bot] Nov 11, 2025
8b3d8dc
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] Nov 11, 2025
46ae8f4
refactor to use `chunked` for batching
yuvmen Nov 12, 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
19 changes: 15 additions & 4 deletions src/sentry/utils/committers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@
from sentry.users.services.user.service import user_service
from sentry.utils.event_frames import find_stack_frames, munged_filename_and_frames
from sentry.utils.hashlib import hash_values
from sentry.utils.iterators import chunked

PATH_SEPARATORS = frozenset(["/", "\\"])
# Limit the number of commits to batch in a single query to avoid query timeouts
# from large IN clauses combined with complex LIKE conditions
COMMIT_BATCH_SIZE = 50


def tokenize_path(path: str) -> Iterator[str]:
Expand Down Expand Up @@ -96,11 +100,18 @@ def _get_commit_file_changes(
# build a single query to get all of the commit file that might match the first n frames
path_query = reduce(operator.or_, (Q(filename__iendswith=path) for path in filenames))

commit_file_change_matches = CommitFileChange.objects.filter(
path_query, commit_id__in=[c.id for c in commits]
)
# Batch commits to avoid query timeouts from large IN clauses
# combined with complex LIKE conditions
all_file_changes: list[CommitFileChange] = []
commit_ids = [c.id for c in commits]

for batch_commit_ids in chunked(commit_ids, COMMIT_BATCH_SIZE):
commit_file_change_matches = CommitFileChange.objects.filter(
path_query, commit_id__in=batch_commit_ids
)
all_file_changes.extend(list(commit_file_change_matches))

return list(commit_file_change_matches)
return all_file_changes


def _match_commits_paths(
Expand Down
Loading