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

Add index on both Award Emoji user and name

See merge request !5061
This commit is contained in:
Yorick Peterse 2016-07-05 10:22:39 +00:00
commit c85092ac47
3 changed files with 14 additions and 1 deletions

View File

@ -43,6 +43,7 @@ v 8.9.5 (unreleased)
- Fix assigning shared runners as admins. !4961
- Show "locked" label for locked runners on runners admin. !4961
- Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
- Add index on the user and emoji name on AwardEmoji table !5061
- Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1
- Fix import button disabled when import process fail due to the namespace already been taken.
- Security: Update RedCloth to 4.3.2 (Takuya Noguchi)

View File

@ -0,0 +1,11 @@
# 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

View File

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160628085157) do
ActiveRecord::Schema.define(version: 20160703180340) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -112,6 +112,7 @@ ActiveRecord::Schema.define(version: 20160628085157) do
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", ["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
create_table "broadcast_messages", force: :cascade do |t|