Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 0 deletions

diff --git a/db/migrate/20201117153333_add_index_on_package_size_and_project_id_to_project_statistics.rb b/db/migrate/20201117153333_add_index_on_package_size_and_project_id_to_project_statistics.rb
new file mode 100644
index 00000000000..efb5cf14d3c
--- /dev/null
+++ b/db/migrate/20201117153333_add_index_on_package_size_and_project_id_to_project_statistics.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddIndexOnPackageSizeAndProjectIdToProjectStatistics < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_project_statistics_on_packages_size_and_project_id'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :project_statistics, [:packages_size, :project_id],
+      name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :project_statistics, INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20201117153333 b/db/schema_migrations/20201117153333
new file mode 100644
index 00000000000..ee496f91777
--- /dev/null
+++ b/db/schema_migrations/20201117153333
@@ -0,0 +1 @@
+008f3a69d23abbd513336c5a48b2448e470a9413920beeb6a1684d0c6840d6a4
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 5cb98ddbd19..a579f2aacd7 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -21779,6 +21779,8 @@ CREATE UNIQUE INDEX index_project_settings_on_push_rule_id ON project_settings U
 
 CREATE INDEX index_project_statistics_on_namespace_id ON project_statistics USING btree (namespace_id);
 
+CREATE INDEX index_project_statistics_on_packages_size_and_project_id ON project_statistics USING btree (packages_size, project_id);
+
 CREATE UNIQUE INDEX index_project_statistics_on_project_id ON project_statistics USING btree (project_id);
 
 CREATE INDEX index_project_statistics_on_repository_size_and_project_id ON project_statistics USING btree (repository_size, project_id);