diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 14:00:21 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 14:00:21 +0000 |
commit | 54a575f1bbba44573ab92dc58a4242f1ee734c5d (patch) | |
tree | 0ee2afe8228f184f7ad28e74d86bff2c5965c4ae /db | |
parent | c63af942e5baf7849a94fa99da8494bcba28e3f8 (diff) | |
parent | 36838a843e99f551c971ec7062327e114c8f0188 (diff) | |
download | gitlab-ce-54a575f1bbba44573ab92dc58a4242f1ee734c5d.tar.gz |
Merge branch '3867-port-to-ce' into 'master'
Port of gitlab-ee!3867 to CE
See merge request gitlab-org/gitlab-ce!16775
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20180119135717_add_uploader_index_to_uploads.rb | 20 | ||||
-rw-r--r-- | db/schema.rb | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/db/migrate/20180119135717_add_uploader_index_to_uploads.rb b/db/migrate/20180119135717_add_uploader_index_to_uploads.rb new file mode 100644 index 00000000000..a678c3d049f --- /dev/null +++ b/db/migrate/20180119135717_add_uploader_index_to_uploads.rb @@ -0,0 +1,20 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddUploaderIndexToUploads < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + remove_concurrent_index :uploads, :path + add_concurrent_index :uploads, [:uploader, :path], using: :btree + end + + def down + remove_concurrent_index :uploads, [:uploader, :path] + add_concurrent_index :uploads, :path, using: :btree + end +end diff --git a/db/schema.rb b/db/schema.rb index 0d97b6f9ddd..01a2df13dd3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1755,7 +1755,7 @@ ActiveRecord::Schema.define(version: 20180201145907) do add_index "uploads", ["checksum"], name: "index_uploads_on_checksum", using: :btree add_index "uploads", ["model_id", "model_type"], name: "index_uploads_on_model_id_and_model_type", using: :btree - add_index "uploads", ["path"], name: "index_uploads_on_path", using: :btree + add_index "uploads", ["uploader", "path"], name: "index_uploads_on_uploader_and_path", using: :btree create_table "user_agent_details", force: :cascade do |t| t.string "user_agent", null: false |