diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-05 10:11:23 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-05 10:11:23 +0000 |
commit | 7adfc4249cdfd46bd4bf39a080db238e99b5aba3 (patch) | |
tree | 5258281661e7be23c05ca27895a0526e98492574 /spec | |
parent | 6b85ea558383b89412f79dc17be8b274ad42205f (diff) | |
parent | 2bb94ff7f915bdc09275085a075e202f92241811 (diff) | |
download | gitlab-ce-7adfc4249cdfd46bd4bf39a080db238e99b5aba3.tar.gz |
Merge branch 'sh-fix-pipeline-jobs-nplus-one' into 'master'
Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pipeline_id/jobs
See merge request gitlab-org/gitlab-ce!19353
Diffstat (limited to 'spec')
-rw-r--r-- | spec/requests/api/jobs_spec.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb index 45082e644ca..50d6f4b4d99 100644 --- a/spec/requests/api/jobs_spec.rb +++ b/spec/requests/api/jobs_spec.rb @@ -177,6 +177,18 @@ describe API::Jobs do json_response.each { |job| expect(job['pipeline']['id']).to eq(pipeline.id) } end end + + it 'avoids N+1 queries' do + control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do + get api("/projects/#{project.id}/pipelines/#{pipeline.id}/jobs", api_user), query + end.count + + 3.times { create(:ci_build, :artifacts, pipeline: pipeline) } + + expect do + get api("/projects/#{project.id}/pipelines/#{pipeline.id}/jobs", api_user), query + end.not_to exceed_all_query_limit(control_count) + end end context 'unauthorized user' do |