Reduce query count for snippet search

Recudes the number of queries within the snippet search from approx. 50
to approx. 14 by preloading the authors

Part of #27392
This commit is contained in:
Phil Hughes 2017-02-15 10:42:54 +00:00
parent 6038355f9e
commit 2a60f4dea8
4 changed files with 8 additions and 4 deletions

View File

@ -7,7 +7,7 @@
= snippet.title
by
= link_to user_snippets_path(snippet.author) do
= image_tag avatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
= image_tag avatar_icon(snippet.author), class: "avatar avatar-inline s16", alt: ''
= snippet.author_name
%span.light= time_ago_with_tooltip(snippet.created_at)
%h4.snippet-title

View File

@ -18,6 +18,6 @@
%span
by
= link_to user_snippets_path(snippet_title.author) do
= image_tag avatar_icon(snippet_title.author_email), class: "avatar avatar-inline s16", alt: ''
= image_tag avatar_icon(snippet_title.author), class: "avatar avatar-inline s16", alt: ''
= snippet_title.author_name
%span.light= time_ago_with_tooltip(snippet_title.created_at)

View File

@ -0,0 +1,4 @@
---
title: Reduced query count for snippet search
merge_request:
author:

View File

@ -31,11 +31,11 @@ module Gitlab
private
def snippet_titles
limit_snippets.search(query).order('updated_at DESC')
limit_snippets.search(query).order('updated_at DESC').includes(:author)
end
def snippet_blobs
limit_snippets.search_code(query).order('updated_at DESC')
limit_snippets.search_code(query).order('updated_at DESC').includes(:author)
end
def default_scope