diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-07-12 13:50:08 +0000 |
|---|---|---|
| committer | Jose <jvargas@gitlab.com> | 2018-07-12 18:31:14 -0500 |
| commit | dbfe3fcbdd1f0845d0178ecd9dca6a05cf82d15b (patch) | |
| tree | 9ae2cc9a69a3a0490d161038e7a791a46f44d64c | |
| parent | 0f7de5f205c2db236a1d85cef1d0028b1af3c573 (diff) | |
| download | gitlab-ce-11-1-stable-prepare-rc10.tar.gz | |
Merge branch 'fix-performance-problem-of-tags-query' into 'master'11-1-stable-prepare-rc10
Fix performance problem of tags query
Closes gitlab-com/infrastructure#4550
See merge request gitlab-org/gitlab-ce!20555
| -rw-r--r-- | changelogs/unreleased/fix-performance-problem-of-tags-query.yml | 5 | ||||
| -rw-r--r-- | lib/api/entities.rb | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/changelogs/unreleased/fix-performance-problem-of-tags-query.yml b/changelogs/unreleased/fix-performance-problem-of-tags-query.yml new file mode 100644 index 00000000000..4649775be9c --- /dev/null +++ b/changelogs/unreleased/fix-performance-problem-of-tags-query.yml @@ -0,0 +1,5 @@ +--- +title: Fix performance problem of accessing tag list for projects api endpoints +merge_request: +author: +type: performance diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 66b62d9ee2e..b256c33c631 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -135,10 +135,13 @@ module API expose :custom_attributes, using: 'API::Entities::CustomAttribute', if: :with_custom_attributes def self.preload_relation(projects_relation, options = {}) + # Preloading tags, should be done with using only `:tags`, + # as `:tags` are defined as: `has_many :tags, through: :taggings` + # N+1 is solved then by using `subject.tags.map(&:name)` + # MR describing the solution: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20555 projects_relation.preload(:project_feature, :route) - .preload(:import_state) - .preload(namespace: [:route, :owner], - tags: :taggings) + .preload(:import_state, :tags) + .preload(namespace: [:route, :owner]) end end @@ -212,11 +215,15 @@ module API expose :statistics, using: 'API::Entities::ProjectStatistics', if: :statistics def self.preload_relation(projects_relation, options = {}) + # Preloading tags, should be done with using only `:tags`, + # as `:tags` are defined as: `has_many :tags, through: :taggings` + # N+1 is solved then by using `subject.tags.map(&:name)` + # MR describing the solution: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20555 super(projects_relation).preload(:group) .preload(project_group_links: :group, fork_network: :root_project, forked_project_link: :forked_from_project, - forked_from_project: [:route, :forks, namespace: :route, tags: :taggings]) + forked_from_project: [:route, :forks, :tags, namespace: :route]) end def self.forks_counting_projects(projects_relation) |