From c856f29b5dc3e11f7c42983c6b4564a9b08681f9 Mon Sep 17 00:00:00 2001
From: yguo <yguo@gitlab.com>
Date: Mon, 10 Jun 2019 09:44:55 -0400
Subject: Add index on public_emails for users table

Clean up issue-62684

Update issue-62684 changelog
---
 .../62684-add-index-public-email-on-users.yml      |  5 +++++
 ...90607190856_add_index_to_users_public_emails.rb | 22 ++++++++++++++++++++++
 db/schema.rb                                       |  3 ++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/62684-add-index-public-email-on-users.yml
 create mode 100644 db/migrate/20190607190856_add_index_to_users_public_emails.rb

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..1e5a16f6a39
--- /dev/null
+++ b/db/migrate/20190607190856_add_index_to_users_public_emails.rb
@@ -0,0 +1,22 @@
+# 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]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 22d0cddb7a0..78e399fc227 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190530154715) do
+ActiveRecord::Schema.define(version: 20190607190856) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -2383,6 +2383,7 @@ ActiveRecord::Schema.define(version: 20190530154715) 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
-- 
cgit v1.2.1