From 5b5159a6966d09b954fa331fbc5d5ce20fb550fe Mon Sep 17 00:00:00 2001 From: Brett Hoerner Date: Tue, 14 Nov 2017 13:31:05 -0600 Subject: [PATCH] db: Add project_id to EventTag queries and deletes --- src/sentry/tagstore/legacy/backend.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/sentry/tagstore/legacy/backend.py b/src/sentry/tagstore/legacy/backend.py index d41395b6f05754..1e04273de2fa7d 100644 --- a/src/sentry/tagstore/legacy/backend.py +++ b/src/sentry/tagstore/legacy/backend.py @@ -44,7 +44,10 @@ def setup(self): default_manager.register(EventTag, BulkModelDeletionTask) default_manager.add_dependencies(Group, [ - lambda instance: ModelRelation(EventTag, {'group_id': instance.id}), + lambda instance: ModelRelation(EventTag, { + 'group_id': instance.id, + 'project_id': instance.project_id, + }), lambda instance: ModelRelation(GroupTagKey, {'group_id': instance.id}), lambda instance: ModelRelation(GroupTagValue, {'group_id': instance.id}), ]) @@ -56,7 +59,13 @@ def setup(self): ]) default_manager.add_bulk_dependencies(Event, [ lambda instance_list: ModelRelation(EventTag, - {'event_id__in': [i.id for i in instance_list]}, + { + 'event_id__in': [i.id for i in instance_list], + 'project_id__in': { + instance.project_id + for instance in instance_list + }, + }, ModelDeletionTask), ]) @@ -331,6 +340,7 @@ def get_group_event_ids(self, project_id, group_id, tags): EventTag.objects.filter( key_id=k, value_id=v, + project_id=project_id, group_id=group_id, ).values_list('event_id', flat=True)[:1000] ) @@ -343,6 +353,7 @@ def get_group_event_ids(self, project_id, group_id, tags): key_id=k, value_id=v, event_id__in=matches, + project_id=project_id, group_id=group_id, ).values_list('event_id', flat=True)[:1000] )