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

Further optimise queries

Browse source
This commit is contained in:
Kamil Trzcinski 2017-04-06 15:21:25 +02:00
parent 62919a17e1
commit 93f9e71b0d
No known key found for this signature in database
GPG key ID: 4505F5C7E12C6A5A
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/serializers/pipeline_serializer.rb
View file

@ -13,16 +13,18 @@ class PipelineSerializer < BaseSerializer
def represent(resource, opts = {}) def represent(resource, opts = {})
if resource.is_a?(ActiveRecord::Relation) if resource.is_a?(ActiveRecord::Relation)
resource = resource.includes(:pending_builds, project_includes = [ { namespace: :route }, :route ]
resource = resource.includes(
:retryable_builds, :retryable_builds,
:cancelable_statuses, :cancelable_statuses,
:manual_actions, :trigger_requests
:artifacts, )
:trigger_requests) resource = resource.includes(
resource = resource.includes(pending_builds: :project) project: project_includes,
resource = resource.includes(project: :namespace) pending_builds: [:project],
resource = resource.includes(manual_actions: { project: :namespace }) manual_actions: { project: project_includes },
resource = resource.includes(artifacts: { project: :namespace }) artifacts: { project: project_includes }
)
end end
if paginated? if paginated?

2
spec/serializers/pipeline_serializer_spec.rb
View file

@ -112,7 +112,7 @@ describe PipelineSerializer do
it "verifies number of queries" do it "verifies number of queries" do
recorded = ActiveRecord::QueryRecorder.new { subject } recorded = ActiveRecord::QueryRecorder.new { subject }
expect(recorded.count).to be_within(10).of(230) expect(recorded.count).to be_within(10).of(93)
expect(recorded.cached_count).to be_within(5).of(5) expect(recorded.cached_count).to be_within(5).of(5)
end end