diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 15:09:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 15:09:00 +0300 |
commit | 88a0824944720b6edaaef56376713541b9a02118 (patch) | |
tree | f5fcc4f9755f249779cda9a8f02902d734af6e7e /db | |
parent | 7d19df2d34a9803d9f077c16315ba919b7ae2aa2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200109030418_add_sorting_index_to_packages.rb | 21 | ||||
-rw-r--r-- | db/migrate/20200109233938_remove_project_id_index_from_packages.rb | 17 | ||||
-rw-r--r-- | db/schema.rb | 4 |
3 files changed, 41 insertions, 1 deletions
diff --git a/db/migrate/20200109030418_add_sorting_index_to_packages.rb b/db/migrate/20200109030418_add_sorting_index_to_packages.rb new file mode 100644 index 00000000000..989f3de3c04 --- /dev/null +++ b/db/migrate/20200109030418_add_sorting_index_to_packages.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class AddSortingIndexToPackages < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_index :packages_packages, [:project_id, :created_at] + add_concurrent_index :packages_packages, [:project_id, :version] + add_concurrent_index :packages_packages, [:project_id, :package_type] + end + + def down + remove_concurrent_index :packages_packages, [:project_id, :created_at] + remove_concurrent_index :packages_packages, [:project_id, :version] + remove_concurrent_index :packages_packages, [:project_id, :package_type] + end +end diff --git a/db/migrate/20200109233938_remove_project_id_index_from_packages.rb b/db/migrate/20200109233938_remove_project_id_index_from_packages.rb new file mode 100644 index 00000000000..e806c5d5a18 --- /dev/null +++ b/db/migrate/20200109233938_remove_project_id_index_from_packages.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class RemoveProjectIdIndexFromPackages < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + remove_concurrent_index :packages_packages, [:project_id] + end + + def down + add_concurrent_index :packages_packages, [:project_id] + end +end diff --git a/db/schema.rb b/db/schema.rb index 662115945cf..e7a1ace68f4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2977,8 +2977,10 @@ ActiveRecord::Schema.define(version: 2020_01_30_161817) do t.string "version" t.integer "package_type", limit: 2, null: false t.index ["name"], name: "index_packages_packages_on_name_trigram", opclass: :gin_trgm_ops, using: :gin + t.index ["project_id", "created_at"], name: "index_packages_packages_on_project_id_and_created_at" t.index ["project_id", "name", "version", "package_type"], name: "idx_packages_packages_on_project_id_name_version_package_type" - t.index ["project_id"], name: "index_packages_packages_on_project_id" + t.index ["project_id", "package_type"], name: "index_packages_packages_on_project_id_and_package_type" + t.index ["project_id", "version"], name: "index_packages_packages_on_project_id_and_version" end create_table "packages_tags", force: :cascade do |t| |