IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

PERF: Fix N+1 queries on private messages route.

Browse Source
This commit is contained in:
Guo Xiang Tan 2020-09-11 15:18:23 +08:00
parent 44fba9463b
commit dbc630f45b
No known key found for this signature in database
GPG Key ID: FBD110179AAC1F20
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/serializers/topic_list_item_serializer.rb
View File

@ -88,7 +88,8 @@ class TopicListItemSerializer < ListableTopicSerializer
end end
def allowed_user_count def allowed_user_count
object.allowed_users.count # Don't use count as it will result in a query
object.allowed_users.length
end end
def include_allowed_user_count? def include_allowed_user_count?

12
lib/topic_query.rb
View File

@ -528,23 +528,19 @@ class TopicQuery
options = @options options = @options
options.reverse_merge!(per_page: per_page_setting) options.reverse_merge!(per_page: per_page_setting)
result = Topic.includes(:tags) result = Topic.includes(:tags, :allowed_users)
if type == :group if type == :group
result = result result = result.joins(
.includes(:allowed_users) "INNER JOIN topic_allowed_groups tag ON tag.topic_id = topics.id AND tag.group_id IN (SELECT id FROM groups WHERE LOWER(name) = '#{PG::Connection.escape_string(@options[:group_name].downcase)}')"
.joins("INNER JOIN topic_allowed_groups tag ON tag.topic_id = topics.id AND tag.group_id IN (SELECT id FROM groups WHERE LOWER(name) = '#{PG::Connection.escape_string(@options[:group_name].downcase)}')") )
unless user.admin? unless user.admin?
result = result.joins("INNER JOIN group_users gu ON gu.group_id = tag.group_id AND gu.user_id = #{user.id.to_i}") result = result.joins("INNER JOIN group_users gu ON gu.group_id = tag.group_id AND gu.user_id = #{user.id.to_i}")
end end
result
elsif type == :user elsif type == :user
result = result.includes(:allowed_users)
result = result.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = #{user.id.to_i})") result = result.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = #{user.id.to_i})")
elsif type == :all elsif type == :all
result = result.includes(:allowed_users)
result = result.where("topics.id IN ( result = result.where("topics.id IN (
SELECT topic_id SELECT topic_id
FROM topic_allowed_users FROM topic_allowed_users