Add database indices to encrypted runner tokens

5 files changed, 25 insertions, 4 deletions

diff --git a/db/migrate/20181116141415_add_encrypted_runners_token_to_namespaces.rb b/db/migrate/20181116141415_add_encrypted_runners_token_to_namespaces.rb
index a5a6373dd38..b92b1b50218 100644
--- a/db/migrate/20181116141415_add_encrypted_runners_token_to_namespaces.rb
+++ b/db/migrate/20181116141415_add_encrypted_runners_token_to_namespaces.rb
@@ -7,6 +7,5 @@ class AddEncryptedRunnersTokenToNamespaces < ActiveRecord::Migration
 
   def change
     add_column :namespaces, :runners_token_encrypted, :string
-    # TODO index
   end
 end
diff --git a/db/migrate/20181116141504_add_encrypted_runners_token_to_projects.rb b/db/migrate/20181116141504_add_encrypted_runners_token_to_projects.rb
index 32401629478..53e475bd180 100644
--- a/db/migrate/20181116141504_add_encrypted_runners_token_to_projects.rb
+++ b/db/migrate/20181116141504_add_encrypted_runners_token_to_projects.rb
@@ -7,6 +7,5 @@ class AddEncryptedRunnersTokenToProjects < ActiveRecord::Migration
 
   def change
     add_column :projects, :runners_token_encrypted, :string
-    # TODO index
   end
 end
diff --git a/db/migrate/20181120151656_add_token_encrypted_to_ci_runners.rb b/db/migrate/20181120151656_add_token_encrypted_to_ci_runners.rb
index 8a9df4b44f8..40db6b399ab 100644
--- a/db/migrate/20181120151656_add_token_encrypted_to_ci_runners.rb
+++ b/db/migrate/20181120151656_add_token_encrypted_to_ci_runners.rb
@@ -7,6 +7,5 @@ class AddTokenEncryptedToCiRunners < ActiveRecord::Migration
 
   def change
     add_column :ci_runners, :token_encrypted, :string
-    # TODO index
   end
 end
diff --git a/db/migrate/20181121101802_add_encrypted_runner_tokens_indices.rb b/db/migrate/20181121101802_add_encrypted_runner_tokens_indices.rb
new file mode 100644
index 00000000000..a4da24501a3
--- /dev/null
+++ b/db/migrate/20181121101802_add_encrypted_runner_tokens_indices.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddEncryptedRunnerTokensIndices < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :namespaces, :runners_token_encrypted, unique: true
+    add_concurrent_index :projects, :runners_token_encrypted, unique: true
+    add_concurrent_index :ci_runners, :token_encrypted, unique: true
+  end
+
+  def down
+    remove_concurrent_index :ci_runners, :token_encrypted
+    remove_concurrent_index :projects, :runners_token_encrypted
+    remove_concurrent_index :namespaces, :runners_token_encrypted
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 41ad0e36849..b8875837471 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: 20181120151656) do
+ActiveRecord::Schema.define(version: 20181121101802) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -527,6 +527,7 @@ ActiveRecord::Schema.define(version: 20181120151656) do
     t.index ["locked"], name: "index_ci_runners_on_locked", using: :btree
     t.index ["runner_type"], name: "index_ci_runners_on_runner_type", using: :btree
     t.index ["token"], name: "index_ci_runners_on_token", using: :btree
+    t.index ["token_encrypted"], name: "index_ci_runners_on_token_encrypted", unique: true, using: :btree
   end
 
   create_table "ci_stages", force: :cascade do |t|
@@ -1334,6 +1335,7 @@ ActiveRecord::Schema.define(version: 20181120151656) do
     t.index ["path"], name: "index_namespaces_on_path_trigram", using: :gin, opclasses: {"path"=>"gin_trgm_ops"}
     t.index ["require_two_factor_authentication"], name: "index_namespaces_on_require_two_factor_authentication", using: :btree
     t.index ["runners_token"], name: "index_namespaces_on_runners_token", unique: true, using: :btree
+    t.index ["runners_token_encrypted"], name: "index_namespaces_on_runners_token_encrypted", unique: true, using: :btree
     t.index ["type"], name: "index_namespaces_on_type", using: :btree
   end
 
@@ -1669,6 +1671,7 @@ ActiveRecord::Schema.define(version: 20181120151656) do
     t.index ["repository_storage", "created_at"], name: "idx_project_repository_check_partial", where: "(last_repository_check_at IS NULL)", using: :btree
     t.index ["repository_storage"], name: "index_projects_on_repository_storage", using: :btree
     t.index ["runners_token"], name: "index_projects_on_runners_token", using: :btree
+    t.index ["runners_token_encrypted"], name: "index_projects_on_runners_token_encrypted", unique: true, using: :btree
     t.index ["star_count"], name: "index_projects_on_star_count", using: :btree
     t.index ["visibility_level"], name: "index_projects_on_visibility_level", using: :btree
   end