Merge pull request #2984 from getsentry/fix-merge

Handle GroupTagKey and GroupTagValue when merging issues

Conflicts:
	src/sentry/tasks/merge.py
	tests/sentry/tasks/test_merge.py

Author: mattrobenolt

src/sentry/tasks/merge.py

@@ -153,6 +153,7 @@ def _rehash_group_events(group, limit=100):
 
 def merge_objects(models, group, new_group, limit=1000,
                   logger=None):
+    from sentry.models import GroupTagKey, GroupTagValue
 
     has_more = False
     for model in models:
@@ -161,7 +162,6 @@ def merge_objects(models, group, new_group, limit=1000,
                         new_group)
         all_fields = model._meta.get_all_field_names()
         has_group = 'group' in all_fields
-        has_values_seen = 'values_seen' in all_fields
         if has_group:
             queryset = model.objects.filter(group=group)
         else:
@@ -184,20 +184,23 @@ def merge_objects(models, group, new_group, limit=1000,
 
             if delete:
                 # Before deleting, we want to merge in counts
-                if has_values_seen:
-                    try:
+                try:
+                    if model == GroupTagKey:
                         with transaction.atomic(using=router.db_for_write(model)):
-                            if has_group:
-                                model.objects.filter(
-                                    group=new_group,
-                                ).update(values_seen=F('values_seen') + obj.values_seen)
-                            else:
-                                model.objects.filter(
-                                    group_id=new_group.id,
-                                ).update(values_seen=F('values_seen') + obj.values_seen)
-                    except DataError:
-                        # it's possible to hit an out of range value for counters
-                        pass
+                            model.objects.filter(
+                                group=new_group,
+                                key=obj.key,
+                            ).update(values_seen=F('values_seen') + obj.values_seen)
+                    elif model == GroupTagValue:
+                        with transaction.atomic(using=router.db_for_write(model)):
+                            model.objects.filter(
+                                group=new_group,
+                                key=obj.key,
+                                value=obj.value,
+                            ).update(times_seen=F('times_seen') + obj.times_seen)
+                except DataError:
+                    # it's possible to hit an out of range value for counters
+                    pass
                 obj.delete()
             has_more = True
 

tests/sentry/tasks/test_merge.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from sentry.tasks.merge import merge_group, rehash_group_events
-from sentry.models import Event, Group, GroupRedirect, GroupTagKey
+from sentry.models import Event, Group, GroupRedirect, GroupTagKey, GroupTagValue
 from sentry.testutils import TestCase
 
 
@@ -62,16 +62,49 @@ def test_merge_updates_tag_values_seen(self):
                 key='sentry:user',
                 values_seen=1,
             )
+            GroupTagKey.objects.create(
+                project=project,
+                group=group,
+                key='foo',
+                values_seen=5,
+            )
+            GroupTagValue.objects.create(
+                project=project,
+                group=group,
+                key='key1',
+                times_seen=1,
+            )
+            GroupTagValue.objects.create(
+                project=project,
+                group=group,
+                key='key2',
+                times_seen=5,
+            )
 
         with self.tasks():
             merge_group(groups[0].id, groups[1].id)
 
         assert not Group.objects.filter(id=groups[0].id).exists()
         assert not GroupTagKey.objects.filter(group_id=groups[0].id).exists()
+        assert not GroupTagValue.objects.filter(group_id=groups[0].id).exists()
 
         assert GroupTagKey.objects.get(
-            group_id=groups[1].id, key='sentry:user',
+            group_id=groups[1].id,
+            key='sentry:user',
         ).values_seen == 2
+        assert GroupTagKey.objects.get(
+            group_id=groups[1].id,
+            key='foo',
+        ).values_seen == 10
+
+        assert GroupTagValue.objects.get(
+            group_id=groups[1].id,
+            key='key1',
+        ).times_seen == 2
+        assert GroupTagValue.objects.get(
+            group_id=groups[1].id,
+            key='key2',
+        ).times_seen == 10
 
 
 class RehashGroupEventsTest(TestCase):