Commit 3dee2366 authored by Yorick Peterse's avatar Yorick Peterse Committed by Robert Speicher

Merge branch 'index-on-emoji-name-and-user' into 'master'

Add index on both Award Emoji user and name

See merge request !5061
(cherry picked from commit c85092ac)
parent e0733819
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.9.5 v 8.9.5
- Add index on both Award Emoji user and name. !5061
- Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq. !5056 - Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq. !5056
- Re-enable import button when import process fails due to namespace already being taken. !5053 - Re-enable import button when import process fails due to namespace already being taken. !5053
- Fix snippets comments not displayed. !5045 - Fix snippets comments not displayed. !5045
......
# rubocop:disable all
# Migration type: online without errors
class AddIndexOnAwardEmojiUserAndName < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
disable_ddl_transaction!
def change
add_concurrent_index(:award_emoji, [:user_id, :name])
end
end
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160620115026) do ActiveRecord::Schema.define(version: 20160703180340) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
...@@ -111,6 +111,7 @@ ActiveRecord::Schema.define(version: 20160620115026) do ...@@ -111,6 +111,7 @@ ActiveRecord::Schema.define(version: 20160620115026) do
end end
add_index "award_emoji", ["awardable_type", "awardable_id"], name: "index_award_emoji_on_awardable_type_and_awardable_id", using: :btree add_index "award_emoji", ["awardable_type", "awardable_id"], name: "index_award_emoji_on_awardable_type_and_awardable_id", using: :btree
add_index "award_emoji", ["user_id", "name"], name: "index_award_emoji_on_user_id_and_name", using: :btree
add_index "award_emoji", ["user_id"], name: "index_award_emoji_on_user_id", using: :btree add_index "award_emoji", ["user_id"], name: "index_award_emoji_on_user_id", using: :btree
create_table "broadcast_messages", force: :cascade do |t| create_table "broadcast_messages", force: :cascade do |t|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment