1c481b7aac
Add an index to the `store` column on `uploads`. This makes counting local uploads faster. Also, there is no longer need to check for objects with `store = NULL`. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18557 --- ### Query plans Query: ```sql SELECT COUNT(*) FROM "uploads" WHERE ("uploads"."store" = ? OR "uploads"."store" IS NULL) ``` #### Without index ``` gitlabhq_production=# EXPLAIN ANALYZE SELECT uploads.* FROM uploads WHERE (uploads.store = 1 OR uploads.store IS NULL); QUERY PLAN --------------------------------------------------------------------------------------------------------------- Seq Scan on uploads (cost=0.00..601729.54 rows=578 width=272) (actual time=6.170..2308.256 rows=545 loops=1) Filter: ((store = 1) OR (store IS NULL)) Rows Removed by Filter: 4411957 Planning time: 38.652 ms Execution time: 2308.454 ms (5 rows) ``` #### Add index ``` gitlabhq_production=# create index uploads_tmp1 on uploads (store); CREATE INDEX ``` #### With index ``` gitlabhq_production=# EXPLAIN ANALYZE SELECT uploads.* FROM uploads WHERE (uploads.store = 1 OR uploads.store IS NULL); QUERY PLAN ------------------------------------------------------------------------------------------------------------------------------- Bitmap Heap Scan on uploads (cost=11.46..1238.88 rows=574 width=272) (actual time=0.155..0.577 rows=545 loops=1) Recheck Cond: ((store = 1) OR (store IS NULL)) Heap Blocks: exact=217 -> BitmapOr (cost=11.46..11.46 rows=574 width=0) (actual time=0.116..0.116 rows=0 loops=1) -> Bitmap Index Scan on uploads_tmp1 (cost=0.00..8.74 rows=574 width=0) (actual time=0.095..0.095 rows=545 loops=1) Index Cond: (store = 1) -> Bitmap Index Scan on uploads_tmp1 (cost=0.00..2.44 rows=1 width=0) (actual time=0.020..0.020 rows=0 loops=1) Index Cond: (store IS NULL) Planning time: 0.274 ms Execution time: 0.637 ms (10 rows) ``` Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6070
135 lines
3.2 KiB
Ruby
135 lines
3.2 KiB
Ruby
require 'rake_helper'
|
|
|
|
describe 'gitlab:uploads:migrate rake tasks' do
|
|
let(:model_class) { nil }
|
|
let(:uploader_class) { nil }
|
|
let(:mounted_as) { nil }
|
|
let(:batch_size) { 3 }
|
|
|
|
before do
|
|
stub_env('BATCH', batch_size.to_s)
|
|
stub_uploads_object_storage(uploader_class)
|
|
Rake.application.rake_require 'tasks/gitlab/uploads/migrate'
|
|
|
|
allow(ObjectStorage::MigrateUploadsWorker).to receive(:perform_async)
|
|
end
|
|
|
|
def run
|
|
args = [uploader_class.to_s, model_class.to_s, mounted_as].compact
|
|
run_rake_task("gitlab:uploads:migrate", *args)
|
|
end
|
|
|
|
shared_examples 'enqueue jobs in batch' do |batch:|
|
|
it do
|
|
expect(ObjectStorage::MigrateUploadsWorker)
|
|
.to receive(:perform_async).exactly(batch).times
|
|
.and_return("A fake job.")
|
|
|
|
run
|
|
end
|
|
end
|
|
|
|
context "for AvatarUploader" do
|
|
let(:uploader_class) { AvatarUploader }
|
|
let(:mounted_as) { :avatar }
|
|
|
|
context "for Project" do
|
|
let(:model_class) { Project }
|
|
let!(:projects) { create_list(:project, 10, :with_avatar) }
|
|
|
|
it_behaves_like 'enqueue jobs in batch', batch: 4
|
|
end
|
|
|
|
context "for Group" do
|
|
let(:model_class) { Group }
|
|
|
|
before do
|
|
create_list(:group, 10, :with_avatar)
|
|
end
|
|
|
|
it_behaves_like 'enqueue jobs in batch', batch: 4
|
|
end
|
|
|
|
context "for User" do
|
|
let(:model_class) { User }
|
|
|
|
before do
|
|
create_list(:user, 10, :with_avatar)
|
|
end
|
|
|
|
it_behaves_like 'enqueue jobs in batch', batch: 4
|
|
end
|
|
end
|
|
|
|
context "for AttachmentUploader" do
|
|
let(:uploader_class) { AttachmentUploader }
|
|
|
|
context "for Note" do
|
|
let(:model_class) { Note }
|
|
let(:mounted_as) { :attachment }
|
|
|
|
before do
|
|
create_list(:note, 10, :with_attachment)
|
|
end
|
|
|
|
it_behaves_like 'enqueue jobs in batch', batch: 4
|
|
end
|
|
|
|
context "for Appearance" do
|
|
let(:model_class) { Appearance }
|
|
let(:mounted_as) { :logo }
|
|
|
|
before do
|
|
create(:appearance, :with_logos)
|
|
end
|
|
|
|
%i(logo header_logo).each do |mount|
|
|
it_behaves_like 'enqueue jobs in batch', batch: 1 do
|
|
let(:mounted_as) { mount }
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
context "for FileUploader" do
|
|
let(:uploader_class) { FileUploader }
|
|
let(:model_class) { Project }
|
|
|
|
before do
|
|
create_list(:project, 10) do |model|
|
|
uploader_class.new(model)
|
|
.store!(fixture_file_upload('spec/fixtures/doc_sample.txt'))
|
|
end
|
|
end
|
|
|
|
it_behaves_like 'enqueue jobs in batch', batch: 4
|
|
end
|
|
|
|
context "for PersonalFileUploader" do
|
|
let(:uploader_class) { PersonalFileUploader }
|
|
let(:model_class) { PersonalSnippet }
|
|
|
|
before do
|
|
create_list(:personal_snippet, 10) do |model|
|
|
uploader_class.new(model)
|
|
.store!(fixture_file_upload('spec/fixtures/doc_sample.txt'))
|
|
end
|
|
end
|
|
|
|
it_behaves_like 'enqueue jobs in batch', batch: 4
|
|
end
|
|
|
|
context "for NamespaceFileUploader" do
|
|
let(:uploader_class) { NamespaceFileUploader }
|
|
let(:model_class) { Snippet }
|
|
|
|
before do
|
|
create_list(:snippet, 10) do |model|
|
|
uploader_class.new(model)
|
|
.store!(fixture_file_upload('spec/fixtures/doc_sample.txt'))
|
|
end
|
|
end
|
|
|
|
it_behaves_like 'enqueue jobs in batch', batch: 4
|
|
end
|
|
end
|