Fix N+1 query when displaying events

When displaying events we would load the target of those events, then
render the entire data using our Markdown pipeline. This pipeline would
eventually request the author of every target, leading to an additional
query being executed for every target to get the author.

To fix this we now eager load the author of the event's target. In my
local environment this reduces the number of queries to display a
project's Atom feed from 40 to 24 queries.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878 for more
information.
This commit is contained in:
Yorick Peterse 2017-12-07 14:51:45 +01:00
parent 9429e8ac60
commit c52a36e859
No known key found for this signature in database
GPG key ID: EDD30D2BEB691AC9
2 changed files with 6 additions and 1 deletions

View file

@ -72,7 +72,7 @@ class Event < ActiveRecord::Base
# We're using preload for "push_event_payload" as otherwise the association
# is not always available (depending on the query being built).
includes(:author, :project, project: :namespace)
.preload(:target, :push_event_payload)
.preload(:push_event_payload, target: :author)
end
scope :for_milestone_id, ->(milestone_id) { where(target_type: "Milestone", target_id: milestone_id) }

View file

@ -0,0 +1,5 @@
---
title: Fix N+1 query when displaying events
merge_request:
author:
type: performance