fix(group_model): optimize group.filter_to_team query to not do a full table scan #88393
Conversation
This file contains 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
JoshFerge
approved these changes
Mar 31, 2025
|
Fixes SENTRY-2HWB |
|
should also fix SENTRY-3JZW |
JoshFerge
reviewed
Mar 31, 2025
src/sentry/models/group.py
Outdated
| Q(team=team) | Q(user_id__in=user_ids) | ||
| ).values_list("group_id", flat=True) | ||
|
|
||
| assigned_groups = GroupAssignee.objects.filter(team=team).values_list( |
There was a problem hiding this comment.
i think if you do
assigned_groups = (
GroupAssignee.objects.filter(team=team) |
GroupAssignee.objects.filter(user_id__in=user_ids)
).values_list("group_id", flat=True)
it can do it in one query instead of two?
wedamija
requested changes
Mar 31, 2025
src/sentry/models/group.py
Outdated
Comment on lines
511
to
514
| assigned_groups = ( | ||
| GroupAssignee.objects.filter(team=team) | ||
| | GroupAssignee.objects.filter(user_id__in=user_ids) | ||
| ).values_list("group_id", flat=True) |
There was a problem hiding this comment.
print((GroupAssignee.objects.filter(user_id__in=[2,3,4]) | GroupAssignee.objects.filter(team_id=1)).values_list("group_id", flat=True).query)
produces:
SELECT "sentry_groupasignee"."group_id"
FROM "sentry_groupasignee"
WHERE ("sentry_groupasignee"."team_id" = 1 OR "sentry_groupasignee"."user_id" IN (2, 3, 4))`
Which is the same query as before, I think?
The problem you're trying to avoid is the OR I think, since it's breaking index usage? You probably want a union
print(GroupAssignee.objects.filter(user_id__in=[2,3,4]).union(GroupAssignee.objects.filter(team_id=1)).values_list("group_id", flat=True).query)
produces
(
SELECT "sentry_groupasignee"."group_id" AS "col1"
FROM "sentry_groupasignee"
WHERE "sentry_groupasignee"."user_id" IN (2, 3, 4)
)
UNION
(
SELECT "sentry_groupasignee"."group_id" AS "col1"
FROM "sentry_groupasignee"
WHERE "sentry_groupasignee"."team_id" = 1
)
There was a problem hiding this comment.
ah, i thought .union and | were equivalent.
There was a problem hiding this comment.
docs reference: https://docs.djangoproject.com/en/5.1/ref/models/querysets/#or, | operator does an OR
wedamija
approved these changes
Apr 1, 2025
MichaelSun48
added a commit
that referenced
this pull request
Apr 2, 2025
…88584) fixes SENTRY-2HWB fixes SENTRY-3JZW Parallel change to #88393, but for the GroupHistory model.
andrewshie-sentry
pushed a commit
that referenced
this pull request
Apr 8, 2025
…l table scan (#88393) Fixes SENTRY-2HWB Optimizes the group manager's filter_to_team query to not do a full table scan on the GroupAssignee table. It seems like Postgres was unable to use a combination of the team and user indexes when filtering for teams and users, and instead used the Group index, which caused a full table scan. --------- Co-authored-by: Josh Ferge <[email protected]>
andrewshie-sentry
pushed a commit
that referenced
this pull request
Apr 8, 2025
…88584) fixes SENTRY-2HWB fixes SENTRY-3JZW Parallel change to #88393, but for the GroupHistory model.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes SENTRY-2HWB
Optimizes the group manager's filter_to_team query to not do a full table scan on the GroupAssignee table.
It seems like Postgres was unable to use a combination of the team and user indexes when filtering for teams and users, and instead used the Group index, which caused a full table scan.