diff options
author | Andreas Brandl <abrandl@gitlab.com> | 2019-06-14 06:50:59 +0000 |
---|---|---|
committer | Andreas Brandl <abrandl@gitlab.com> | 2019-06-14 06:50:59 +0000 |
commit | 56c365bde8da581d2a3a8973bc60ed1b8f0e502e (patch) | |
tree | d02d0ecca0c400a05c4642082b367f7c42f815e0 | |
parent | 2ede009678dd42d62ffa1bf8844f9fc890aed502 (diff) | |
parent | 49ffcaed2e51111f967c1de2117b375c4704bf8d (diff) | |
download | gitlab-ce-56c365bde8da581d2a3a8973bc60ed1b8f0e502e.tar.gz |
Merge branch 'issue-62684' into 'master'
Issue 62684
See merge request gitlab-org/gitlab-ce!29430
-rw-r--r-- | changelogs/unreleased/62684-add-index-public-email-on-users.yml | 5 | ||||
-rw-r--r-- | db/migrate/20190607190856_add_index_to_users_public_emails.rb | 23 | ||||
-rw-r--r-- | db/schema.rb | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/changelogs/unreleased/62684-add-index-public-email-on-users.yml b/changelogs/unreleased/62684-add-index-public-email-on-users.yml new file mode 100644 index 00000000000..56b5f91da21 --- /dev/null +++ b/changelogs/unreleased/62684-add-index-public-email-on-users.yml @@ -0,0 +1,5 @@ +--- +title: Add index on public_email for users +merge_request: 29430 +author: +type: performance diff --git a/db/migrate/20190607190856_add_index_to_users_public_emails.rb b/db/migrate/20190607190856_add_index_to_users_public_emails.rb new file mode 100644 index 00000000000..81ec38b8b32 --- /dev/null +++ b/db/migrate/20190607190856_add_index_to_users_public_emails.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddIndexToUsersPublicEmails < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_index :users, [:public_email], + where: "public_email != ''" + end + + def down + remove_concurrent_index :users, [:public_email], + where: "public_email != ''" + end +end diff --git a/db/schema.rb b/db/schema.rb index 392edf89430..86a099d28b2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2388,6 +2388,7 @@ ActiveRecord::Schema.define(version: 20190611161641) do t.index ["incoming_email_token"], name: "index_users_on_incoming_email_token", using: :btree t.index ["name"], name: "index_users_on_name", using: :btree t.index ["name"], name: "index_users_on_name_trigram", using: :gin, opclasses: {"name"=>"gin_trgm_ops"} + t.index ["public_email"], name: "index_users_on_public_email", where: "((public_email)::text <> ''::text)", using: :btree t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree t.index ["state"], name: "index_users_on_state", using: :btree t.index ["username"], name: "index_users_on_username", using: :btree |