kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve N+1 query issue with discussions

This commit is contained in:
Douwe Maan 2017-05-29 16:07:57 -05:00
parent 1ac12698c6
commit e53169c970
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/concerns/noteable.rb
View File

@ -43,7 +43,12 @@ module Noteable
end
def resolvable_discussions
@resolvable_discussions ||= discussion_notes.resolvable.discussions(self)
@resolvable_discussions ||=
if defined?(@discussions)
@discussions.select(&:resolvable?)
else
discussion_notes.resolvable.discussions(self)
end
end
def discussions_resolvable?

3
app/models/discussion.rb
View File

@ -21,7 +21,8 @@ class Discussion
end
def self.build_collection(notes, context_noteable = nil)
notes.group_by { |n| n.discussion_id(context_noteable) }.values.map { |notes| build(notes, context_noteable) }
grouped_notes = notes.includes(:noteable).group_by { |n| n.discussion_id(context_noteable) }
grouped_notes.values.map { |notes| build(notes, context_noteable) }
end
# Returns an alphanumeric discussion ID based on `build_discussion_id`

4
changelogs/unreleased/dm-discussions-n-plus-1.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Resolve N+1 query issue with discussions
merge_request:
author: