Merge branch...

Merge branch 'schmil-remove-index_vulnerability_occurrences_on_primary_identifier_id' into 'master' 

Remove index_vulnerability_occurrences_on_primary_identifier_id

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157283



Merged-by: Marius Bobin <mbobin@gitlab.com>
Approved-by: Marius Bobin <mbobin@gitlab.com>
Reviewed-by: Marius Bobin <mbobin@gitlab.com>
Co-authored-by: Schmil Monderer <smonderer@gitlab.com>

db/post_migrate/20240722074340_remove_index_vulnerability_occurrences_on_primary_identifier_id.rb

+# frozen_string_literal: true
+
+class RemoveIndexVulnerabilityOccurrencesOnPrimaryIdentifierId < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+  milestone '17.3'
+
+  INDEX_NAME = 'index_vulnerability_occurrences_on_primary_identifier_id'
+  TABLE_NAME = :vulnerability_occurrences
+
+  def up
+    # This index was replaced with index_vulnerability_occurrences_prim_iden_id_and_vuln_id
+    # see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156266
+    remove_concurrent_index_by_name TABLE_NAME, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index TABLE_NAME, [:primary_identifier_id], name: INDEX_NAME
+  end
+end

db/schema_migrations/20240722074340

+73c084ef094d22432cae785c2b5a43b93d398fdfb405bd918673a0e17e86ad74
\ No newline at end of file

db/structure.sql

@@ -29749,8 +29749,6 @@ CREATE INDEX index_vulnerability_occurrences_on_location_k8s_agent_id ON vulnera
 CREATE INDEX index_vulnerability_occurrences_on_location_k8s_cluster_id ON vulnerability_occurrences USING gin ((((location -> 'kubernetes_resource'::text) -> 'cluster_id'::text))) WHERE (report_type = 7);
-CREATE INDEX index_vulnerability_occurrences_on_primary_identifier_id ON vulnerability_occurrences USING btree (primary_identifier_id);
-
 CREATE INDEX index_vulnerability_occurrences_on_scanner_id ON vulnerability_occurrences USING btree (scanner_id);
 CREATE UNIQUE INDEX index_vulnerability_occurrences_on_uuid_1 ON vulnerability_occurrences USING btree (uuid);

spec/support/helpers/database/duplicate_indexes.yml

@@ -120,9 +120,6 @@ vulnerability_finding_signatures:
 vulnerability_flags:
   index_vulnerability_flags_on_unique_columns:
   - index_vulnerability_flags_on_vulnerability_occurrence_id
-vulnerability_occurrences:
-  index_vulnerability_occurrences_prim_iden_id_and_vuln_id:
-  - index_vulnerability_occurrences_on_primary_identifier_id
 work_item_hierarchy_restrictions:
   index_work_item_hierarchy_restrictions_on_parent_and_child:
   - index_work_item_hierarchy_restrictions_on_parent_type_id