Skip to content

ref: Change EventTag writes to write in bulk #6551

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
mattrobenolt merged 1 commit into from
Nov 15, 2017
Merged

ref: Change EventTag writes to write in bulk #6551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/sentry/tagstore/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class TagStorage(Service):
'get_or_create_group_tag_key',
'create_group_tag_value',
'get_or_create_group_tag_value',
'create_event_tag',
'create_event_tags',

'get_tag_key',
'get_tag_keys',
Expand Down Expand Up @@ -176,9 +176,9 @@ def get_or_create_group_tag_value(self, project_id, group_id,
"""
raise NotImplementedError

def create_event_tag(self, project_id, group_id, event_id, key_id, value_id):
def create_event_tags(self, project_id, group_id, event_id, tags):
"""
>>> create_event_tag(1, 2, 3, 4, 5)
>>> create_event_tags(1, 2, 3, [(4, 5)])
"""
raise NotImplementedError

Expand Down
22 changes: 14 additions & 8 deletions src/sentry/tagstore/legacy/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,23 @@ def get_or_create_group_tag_value(self, project_id, group_id,
return GroupTagValue.objects.get_or_create(
project_id=project_id, group_id=group_id, key=key, value=value, **kwargs)

def create_event_tag(self, project_id, group_id, event_id, key_id, value_id):
def create_event_tags(self, project_id, group_id, event_id, tags):
try:
# don't let a duplicate break the outer transaction
with transaction.atomic():
EventTag.objects.create(
project_id=project_id,
group_id=group_id,
event_id=event_id,
key_id=key_id,
value_id=value_id,
)
# Tags are bulk inserted because this is an all-or-nothing situation.
# Either the whole transaction works, or it doesn't. There's no value
# in a partial success where we'd need to replay half of the rows.
EventTag.objects.bulk_create([
EventTag(
project_id=project_id,
group_id=group_id,
event_id=event_id,
key_id=key_id,
value_id=value_id,
)
for key_id, value_id in tags
])
except IntegrityError:
pass

Expand Down
15 changes: 8 additions & 7 deletions src/sentry/tasks/post_process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,15 @@ def index_event_tags(organization_id, project_id, event_id, tags,
'project': project_id,
})

tag_ids = []
for key, value in tags:
tagkey, _ = tagstore.get_or_create_tag_key(project_id, environment_id, key)
tagvalue, _ = tagstore.get_or_create_tag_value(project_id, environment_id, key, value)
tag_ids.append((tagkey.id, tagvalue.id))

tagstore.create_event_tag(
project_id=project_id,
group_id=group_id,
event_id=event_id,
key_id=tagkey.id,
value_id=tagvalue.id,
)
tagstore.create_event_tags(
project_id=project_id,
group_id=group_id,
event_id=event_id,
tags=tag_ids,
)
22 changes: 9 additions & 13 deletions tests/sentry/api/endpoints/test_group_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,26 +57,22 @@ def test_tags(self):
key='bar',
value='buz')

tagstore.create_event_tag(
tagstore.create_event_tags(
project_id=group.project_id,
group_id=group.id,
event_id=event_1.id,
key_id=tagkey_1.id,
value_id=tagvalue_1.id,
tags=[
(tagkey_1.id, tagvalue_1.id),
(tagkey_2.id, tagvalue_3.id),
],
)
tagstore.create_event_tag(
tagstore.create_event_tags(
project_id=group.project_id,
group_id=group.id,
event_id=event_2.id,
key_id=tagkey_2.id,
value_id=tagvalue_2.id,
)
tagstore.create_event_tag(
project_id=group.project_id,
group_id=group.id,
event_id=event_1.id,
key_id=tagkey_2.id,
value_id=tagvalue_3.id,
tags=[
(tagkey_2.id, tagvalue_2.id),
],
)

url = '/api/0/issues/{}/events/'.format(group.id)
Expand Down
7 changes: 4 additions & 3 deletions tests/sentry/deletions/test_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ def test_simple(self):
event_id='a' * 32,
group_id=group.id,
)
tagstore.create_event_tag(
tagstore.create_event_tags(
event_id=event.id,
group_id=group.id,
project_id=project.id,
key_id=1,
value_id=1,
tags=[
(1, 1),
],
)
GroupAssignee.objects.create(
group=group,
Expand Down
14 changes: 8 additions & 6 deletions tests/sentry/deletions/test_tagkey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ def test_simple(self):
tagstore.create_group_tag_value(
key=key, value=value, group_id=group.id, project_id=project.id, environment_id=self.environment.id
)
tagstore.create_event_tag(
key_id=tk.id,
tagstore.create_event_tags(
group_id=group.id,
value_id=1,
project_id=project.id,
event_id=1,
tags=[
(tk.id, 1),
]
)

project2 = self.create_project(team=team, name='test2')
Expand All @@ -49,12 +50,13 @@ def test_simple(self):
tagstore.create_group_tag_value(
key=key, value=value, group_id=group2.id, project_id=project2.id, environment_id=self.environment.id
)
tagstore.create_event_tag(
key_id=tk2.id,
tagstore.create_event_tags(
group_id=group2.id,
value_id=1,
project_id=project.id,
event_id=1,
tags=[
(tk2.id, 1),
],
)

deletion = ScheduledDeletion.schedule(tk, days=0)
Expand Down
21 changes: 12 additions & 9 deletions tests/sentry/tasks/test_deletion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,13 @@ def test_simple(self):
tagstore.create_group_tag_value(
key=key, value=value, group_id=group.id, project_id=project.id, environment_id=self.environment.id
)
tagstore.create_event_tag(
key_id=tk.id,
tagstore.create_event_tags(
group_id=group.id,
value_id=1,
project_id=project.id,
event_id=1,
tags=[
(tk.id, 1),
],
)

project2 = self.create_project(team=team, name='test2')
Expand All @@ -228,12 +229,13 @@ def test_simple(self):
tagstore.create_group_tag_value(
key=key, value=value, group_id=group2.id, project_id=project2.id, environment_id=self.environment.id
)
tagstore.create_event_tag(
key_id=tk2.id,
tagstore.create_event_tags(
group_id=group2.id,
value_id=1,
project_id=project.id,
event_id=1,
tags=[
(tk2.id, 1)
],
)

with self.tasks():
Expand Down Expand Up @@ -280,12 +282,13 @@ def test_simple(self):
event_id='a' * 32,
group_id=group.id,
)
tagstore.create_event_tag(
tagstore.create_event_tags(
event_id=event.id,
group_id=group.id,
project_id=project.id,
key_id=1,
value_id=1,
tags=[
(1, 1),
],
)
GroupAssignee.objects.create(
group=group,
Expand Down