Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 34 insertions, 0 deletions

diff --git a/db/post_migrate/20230523131914_recreate_index_on_vulnerability_reads.rb b/db/post_migrate/20230523131914_recreate_index_on_vulnerability_reads.rb
new file mode 100644
index 00000000000..13f30b5ef6e
--- /dev/null
+++ b/db/post_migrate/20230523131914_recreate_index_on_vulnerability_reads.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class RecreateIndexOnVulnerabilityReads < Gitlab::Database::Migration[2.1]
+  OLD_INDEX_NAME = "index_vulnerability_reads_common_finder_query"
+  NEW_INDEX_NAME = "index_vulnerability_reads_common_finder_query_2"
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index(
+      :vulnerability_reads,
+      %i[project_id state report_type severity vulnerability_id dismissal_reason],
+      name: NEW_INDEX_NAME,
+      order: { vulnerability_id: :desc }
+    )
+    remove_concurrent_index_by_name(
+      :vulnerability_reads,
+      OLD_INDEX_NAME
+    )
+  end
+
+  def down
+    add_concurrent_index(
+      :vulnerability_reads,
+      %i[project_id state report_type severity vulnerability_id],
+      name: OLD_INDEX_NAME,
+      order: { vulnerability_id: :desc }
+    )
+    remove_concurrent_index_by_name(
+      :vulnerability_reads,
+      NEW_INDEX_NAME
+    )
+  end
+end