Drop ForeignKeys from TagKey, TagValue and GroupTagKey. (#6002)

Author: bretthoerner

bin/merge_legacy_releases

@@ -58,7 +58,7 @@ def update_version(release):
         id=release.id
     ).update(version=new_version)
     TagValue.objects.filter(
-        project__in=release.projects.all(),
+        project_id__in=release.projects.values_list('id', flat=True),
         key='sentry:release',
         value=old_version
     ).update(value=new_version)

src/sentry/api/endpoints/group_details.py

@@ -212,7 +212,7 @@ def get(self, request, group):
             last_release = self._get_release_info(request, group, last_release)
 
         tags = list(GroupTagKey.objects.filter(
-            group=group,
+            group_id=group.id,
         )[:100])
 
         participants = list(

src/sentry/api/endpoints/group_events.py

@@ -27,10 +27,10 @@ class GroupEventsEndpoint(GroupEndpoint):
     doc_section = DocSection.EVENTS
 
     def _tags_to_filter(self, group, tags):
-        project = group.project
+        project_id = group.project_id
         tagkeys = dict(
             TagKey.objects.filter(
-                project=project,
+                project_id=project_id,
                 key__in=tags.keys(),
             ).values_list('key', 'id')
         )
@@ -39,7 +39,7 @@ def _tags_to_filter(self, group, tags):
             (t[1], t[2]): t[0]
             for t in TagValue.objects.filter(
                 reduce(or_, (Q(key=k, value=v) for k, v in six.iteritems(tags))),
-                project=project,
+                project_id=project_id,
             ).values_list('id', 'key', 'value')
         }
 

src/sentry/api/endpoints/group_tagkey_details.py

@@ -45,7 +45,7 @@ def get(self, request, group, key):
 
         try:
             tag_key = TagKey.objects.get(
-                project=group.project_id,
+                project_id=group.project_id,
                 key=lookup_key,
                 status=TagKeyStatus.VISIBLE,
             )
@@ -54,7 +54,7 @@ def get(self, request, group, key):
 
         try:
             group_tag_key = GroupTagKey.objects.get(
-                group=group,
+                group_id=group.id,
                 key=lookup_key,
             )
         except GroupTagKey.DoesNotExist:

src/sentry/api/endpoints/group_tagkey_values.py

@@ -42,7 +42,7 @@ def get(self, request, group, key):
             lookup_key = key
 
         tagkey = TagKey.objects.filter(
-            project=group.project_id,
+            project_id=group.project_id,
             key=lookup_key,
             status=TagKeyStatus.VISIBLE,
         )

src/sentry/api/endpoints/group_tags.py

@@ -13,10 +13,10 @@
 class GroupTagsEndpoint(GroupEndpoint):
     def get(self, request, group):
         tag_keys = TagKey.objects.filter(
-            project=group.project,
+            project_id=group.project_id,
             status=TagKeyStatus.VISIBLE,
             key__in=GroupTagKey.objects.filter(
-                group=group,
+                group_id=group.id,
             ).values('key'),
         )
 

src/sentry/api/endpoints/project_tagkey_details.py

@@ -18,7 +18,7 @@ def get(self, request, project, key):
 
         try:
             tagkey = TagKey.objects.get(
-                project=project,
+                project_id=project.id,
                 key=lookup_key,
                 status=TagKeyStatus.VISIBLE,
             )
@@ -41,7 +41,7 @@ def delete(self, request, project, key):
 
         try:
             tagkey = TagKey.objects.get(
-                project=project,
+                project_id=project.id,
                 key=lookup_key,
             )
         except TagKey.DoesNotExist:

src/sentry/api/endpoints/project_tagkey_values.py

@@ -32,15 +32,15 @@ def get(self, request, project, key):
 
         try:
             tagkey = TagKey.objects.get(
-                project=project,
+                project_id=project.id,
                 key=lookup_key,
                 status=TagKeyStatus.VISIBLE,
             )
         except TagKey.DoesNotExist:
             raise ResourceDoesNotExist
 
         base_queryset = TagValue.objects.filter(
-            project=project,
+            project_id=project.id,
             key=tagkey.key,
         )
 
@@ -58,7 +58,7 @@ def get(self, request, project, key):
 
         else:
             queryset = TagValue.objects.filter(
-                project=project,
+                project_id=project.id,
                 key=tagkey.key,
             )
 

src/sentry/api/endpoints/project_tags.py

@@ -11,7 +11,7 @@
 class ProjectTagsEndpoint(ProjectEndpoint):
     def get(self, request, project):
         tag_keys = TagKey.objects.filter(
-            project=project,
+            project_id=project.id,
             status=TagKeyStatus.VISIBLE,
         )
 

src/sentry/api/serializers/models/group.py

@@ -126,9 +126,9 @@ def get_attrs(self, item_list, user):
 
         user_counts = dict(
             GroupTagKey.objects.filter(
-                group__in=item_list,
+                group_id__in=[g.id for g in item_list],
                 key='sentry:user',
-            ).values_list('group', 'values_seen')
+            ).values_list('group_id', 'values_seen')
         )
 
         ignore_items = {g.group_id: g for g in GroupSnooze.objects.filter(

src/sentry/api/serializers/models/grouptagkey.py

@@ -12,7 +12,9 @@ def get_attrs(self, item_list, user):
         tag_labels = {
             t.key: t.get_label()
             for t in
-            TagKey.objects.filter(project=item_list[0].project, key__in=[i.key for i in item_list])
+            TagKey.objects.filter(
+                project_id=item_list[0].project.id, key__in=[
+                    i.key for i in item_list])
         }
 
         result = {}

src/sentry/models/group.py

@@ -353,16 +353,16 @@ def get_tags(self, with_internal=True):
         from sentry.models import GroupTagKey, TagKey
         if not hasattr(self, '_tag_cache'):
             group_tags = GroupTagKey.objects.filter(
-                group=self,
-                project=self.project,
+                group_id=self.id,
+                project_id=self.project_id,
             )
             if not with_internal:
                 group_tags = group_tags.exclude(key__startswith='sentry:')
 
             group_tags = list(group_tags.values_list('key', flat=True))
 
             tag_keys = dict(
-                (t.key, t) for t in TagKey.objects.filter(project=self.project, key__in=group_tags)
+                (t.key, t) for t in TagKey.objects.filter(project_id=self.project_id, key__in=group_tags)
             )
 
             results = []
@@ -477,6 +477,6 @@ def count_users_seen(self):
         from sentry.models import GroupTagKey
 
         return GroupTagKey.objects.filter(
-            group=self,
+            group_id=self.id,
             key='sentry:user',
         ).aggregate(t=models.Sum('values_seen'))['t'] or 0

src/sentry/models/grouptagkey.py

@@ -11,7 +11,7 @@
 
 from sentry.constants import MAX_TAG_KEY_LENGTH
 from sentry.db.models import (
-    Model, BoundedPositiveIntegerField, BaseManager, FlexibleForeignKey, sane_repr
+    Model, BoundedPositiveIntegerField, BaseManager, sane_repr
 )
 
 
@@ -23,8 +23,8 @@ class GroupTagKey(Model):
     """
     __core__ = False
 
-    project = FlexibleForeignKey('sentry.Project', null=True)
-    group = FlexibleForeignKey('sentry.Group')
+    project_id = BoundedPositiveIntegerField(db_index=True, null=True)
+    group_id = BoundedPositiveIntegerField(db_index=True)
     key = models.CharField(max_length=MAX_TAG_KEY_LENGTH)
     values_seen = BoundedPositiveIntegerField(default=0)
 
@@ -33,6 +33,6 @@ class GroupTagKey(Model):
     class Meta:
         app_label = 'sentry'
         db_table = 'sentry_grouptagkey'
-        unique_together = (('project', 'group', 'key'), )
+        unique_together = (('project_id', 'group_id', 'key'), )
 
     __repr__ = sane_repr('project_id', 'group_id', 'key')

src/sentry/models/grouptagvalue.py

@@ -13,7 +13,8 @@
 from django.utils import timezone
 
 from sentry.constants import MAX_TAG_KEY_LENGTH, MAX_TAG_VALUE_LENGTH
-from sentry.db.models import (Model, BoundedPositiveIntegerField, BaseManager, sane_repr)
+from sentry.db.models import (
+    Model, BoundedPositiveIntegerField, BaseManager, sane_repr)
 from sentry.utils import db
 
 
@@ -24,13 +25,15 @@ class GroupTagValue(Model):
     """
     __core__ = False
 
-    project_id = BoundedPositiveIntegerField(null=True)
-    group_id = BoundedPositiveIntegerField()
+    project_id = BoundedPositiveIntegerField(db_index=True, null=True)
+    group_id = BoundedPositiveIntegerField(db_index=True)
     times_seen = BoundedPositiveIntegerField(default=0)
     key = models.CharField(max_length=MAX_TAG_KEY_LENGTH)
     value = models.CharField(max_length=MAX_TAG_VALUE_LENGTH)
-    last_seen = models.DateTimeField(default=timezone.now, db_index=True, null=True)
-    first_seen = models.DateTimeField(default=timezone.now, db_index=True, null=True)
+    last_seen = models.DateTimeField(
+        default=timezone.now, db_index=True, null=True)
+    first_seen = models.DateTimeField(
+        default=timezone.now, db_index=True, null=True)
 
     objects = BaseManager()
 

src/sentry/models/project.py

@@ -161,8 +161,8 @@ def merge_to(self, project):
                     if not created:
                         obj2.update(times_seen=F('times_seen') + obj.times_seen)
 
-        for fv in TagValue.objects.filter(project=self):
-            TagValue.objects.get_or_create(project=project, key=fv.key, value=fv.value)
+        for fv in TagValue.objects.filter(project_id=self.id):
+            TagValue.objects.get_or_create(project_id=project.id, key=fv.key, value=fv.value)
             fv.delete()
         self.delete()
 

src/sentry/models/tagkey.py

@@ -13,7 +13,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from sentry.constants import MAX_TAG_KEY_LENGTH, TAG_LABELS
-from sentry.db.models import (Model, BoundedPositiveIntegerField, FlexibleForeignKey, sane_repr)
+from sentry.db.models import (Model, BoundedPositiveIntegerField, sane_repr)
 from sentry.db.models.manager import BaseManager
 from sentry.utils.cache import cache
 
@@ -22,7 +22,8 @@
 
 # These tags are special and are used in pairing with `sentry:{}`
 # they should not be allowed to be set via data ingest due to abiguity
-INTERNAL_TAG_KEYS = frozenset(('release', 'dist', 'user', 'filename', 'function'))
+INTERNAL_TAG_KEYS = frozenset(
+    ('release', 'dist', 'user', 'filename', 'function'))
 
 
 # TODO(dcramer): pull in enum library
@@ -43,7 +44,7 @@ def all_keys(self, project):
         if result is None:
             result = list(
                 self.filter(
-                    project=project,
+                    project_id=project.id,
                     status=TagKeyStatus.VISIBLE,
                 ).order_by('-values_seen').values_list('key', flat=True)[:20]
             )
@@ -57,7 +58,7 @@ class TagKey(Model):
     """
     __core__ = False
 
-    project = FlexibleForeignKey('sentry.Project')
+    project_id = BoundedPositiveIntegerField(db_index=True)
     key = models.CharField(max_length=MAX_TAG_KEY_LENGTH)
     values_seen = BoundedPositiveIntegerField(default=0)
     label = models.CharField(max_length=64, null=True)
@@ -75,7 +76,7 @@ class TagKey(Model):
     class Meta:
         app_label = 'sentry'
         db_table = 'sentry_filterkey'
-        unique_together = (('project', 'key'), )
+        unique_together = (('project_id', 'key'), )
 
     __repr__ = sane_repr('project_id', 'key')
 

src/sentry/models/tagvalue.py

@@ -13,7 +13,7 @@
 
 from sentry.constants import MAX_TAG_KEY_LENGTH, MAX_TAG_VALUE_LENGTH
 from sentry.db.models import (
-    Model, BoundedPositiveIntegerField, FlexibleForeignKey, GzippedDictField, BaseManager, sane_repr
+    Model, BoundedPositiveIntegerField, GzippedDictField, BaseManager, sane_repr
 )
 from sentry.utils.http import absolute_uri
 
@@ -24,20 +24,22 @@ class TagValue(Model):
     """
     __core__ = False
 
-    project = FlexibleForeignKey('sentry.Project', null=True)
+    project_id = BoundedPositiveIntegerField(db_index=True, null=True)
     key = models.CharField(max_length=MAX_TAG_KEY_LENGTH)
     value = models.CharField(max_length=MAX_TAG_VALUE_LENGTH)
     data = GzippedDictField(blank=True, null=True)
     times_seen = BoundedPositiveIntegerField(default=0)
-    last_seen = models.DateTimeField(default=timezone.now, db_index=True, null=True)
-    first_seen = models.DateTimeField(default=timezone.now, db_index=True, null=True)
+    last_seen = models.DateTimeField(
+        default=timezone.now, db_index=True, null=True)
+    first_seen = models.DateTimeField(
+        default=timezone.now, db_index=True, null=True)
 
     objects = BaseManager()
 
     class Meta:
         app_label = 'sentry'
         db_table = 'sentry_filtervalue'
-        unique_together = (('project', 'key', 'value'), )
+        unique_together = (('project_id', 'key', 'value'), )
 
     __repr__ = sane_repr('project_id', 'key', 'value')
 
@@ -70,10 +72,12 @@ def get_absolute_url(self):
             return absolute_uri(
                 reverse(
                     url_name,
-                    args=[self.project.organization.slug, self.project.slug, self.key, self.id]
+                    args=[self.project.organization.slug,
+                          self.project.slug, self.key, self.id]
                 )
             )
 
         return absolute_uri(
-            reverse(url_name, args=[self.project.organization.slug, self.project.slug, self.id])
+            reverse(url_name, args=[
+                    self.project.organization.slug, self.project.slug, self.id])
         )

src/sentry/receivers/releases.py

@@ -4,7 +4,7 @@
 from django.db.models.signals import post_save
 
 from sentry.models import (
-    Activity, Commit, GroupAssignee, GroupCommitResolution, Release, TagValue
+    Activity, Commit, GroupAssignee, GroupCommitResolution, Project, Release, TagValue
 )
 from sentry.tasks.clear_expired_resolutions import clear_expired_resolutions
 
@@ -16,23 +16,25 @@ def ensure_release_exists(instance, created, **kwargs):
     if instance.data and instance.data.get('release_id'):
         return
 
+    project = Project.objects.get(pk=instance.project_id)
+
     try:
         with transaction.atomic():
             release = Release.objects.create(
-                organization_id=instance.project.organization_id,
+                organization_id=project.organization_id,
                 version=instance.value,
                 date_added=instance.first_seen,
             )
     except IntegrityError:
         release = Release.objects.get(
-            organization_id=instance.project.organization_id,
+            organization_id=project.organization_id,
             version=instance.value,
         )
         release.update(date_added=instance.first_seen)
     else:
         instance.update(data={'release_id': release.id})
 
-    release.add_project(instance.project)
+    release.add_project(project)
 
 
 def resolve_group_resolutions(instance, created, **kwargs):