diff --git a/Gemfile b/Gemfile index 5e91d1425..bea840041 100644 --- a/Gemfile +++ b/Gemfile @@ -59,6 +59,7 @@ gem 'redis', '~> 3.3', require: ['redis', 'redis/connection/hiredis'] gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' gem 'rqrcode', '~> 0.10' gem 'ruby-oembed', '~> 0.12', require: 'oembed' +gem 'ruby-progressbar', '~> 1.4' gem 'sanitize', '~> 4.4' gem 'sidekiq', '~> 5.0' gem 'sidekiq-scheduler', '~> 2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 72d323dcb..8af7872af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -623,6 +623,7 @@ DEPENDENCIES rspec-sidekiq (~> 3.0) rubocop ruby-oembed (~> 0.12) + ruby-progressbar (~> 1.4) sanitize (~> 4.4) scss_lint (~> 0.55) sidekiq (~> 5.0) @@ -645,4 +646,4 @@ RUBY VERSION ruby 2.4.2p198 BUNDLED WITH - 1.16.0 + 1.16.1 diff --git a/db/migrate/20171226094803_more_faster_index_on_notifications.rb b/db/migrate/20171226094803_more_faster_index_on_notifications.rb new file mode 100644 index 000000000..b2e53b82d --- /dev/null +++ b/db/migrate/20171226094803_more_faster_index_on_notifications.rb @@ -0,0 +1,7 @@ +class MoreFasterIndexOnNotifications < ActiveRecord::Migration[5.1] + def change + commit_db_transaction + add_index :notifications, [:account_id, :id], order: { id: :desc }, algorithm: :concurrently + remove_index :notifications, name: :index_notifications_on_id_and_account_id_and_activity_type + end +end diff --git a/db/schema.rb b/db/schema.rb index 9410cdab5..b480c9c46 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: 20171212195226) do +ActiveRecord::Schema.define(version: 20171226094803) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -268,8 +268,8 @@ ActiveRecord::Schema.define(version: 20171212195226) do t.bigint "account_id" t.bigint "from_account_id" t.index ["account_id", "activity_id", "activity_type"], name: "account_activity", unique: true + t.index ["account_id", "id"], name: "index_notifications_on_account_id_and_id", order: { id: :desc } t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type" - t.index ["id", "account_id", "activity_type"], name: "index_notifications_on_id_and_account_id_and_activity_type", order: { id: :desc } end create_table "oauth_access_grants", force: :cascade do |t|