Merge branch...

Merge branch 'add_index_sbom_occurrences_on_project_id_component_version_id_and_input_file_path' into 'master' 

Add index on sbom_occurrences table to match component_version_id

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



Merged-by: Krasimir Angelov <kangelov@gitlab.com>
Approved-by: Krasimir Angelov <kangelov@gitlab.com>
Co-authored-by: Zamir Martins Filho <zfilho@gitlab.com>

db/post_migrate/20240123120413_index_sbom_occurrences_on_project_id_component_version_id_and_input_file_path.rb

+# frozen_string_literal: true
+
+class IndexSbomOccurrencesOnProjectIdComponentVersionIdAndInputFilePath < Gitlab::Database::Migration[2.2]
+  INDEX_NAME = 'idx_sbom_occurr_on_project_component_version_input_file_path'
+  DROPPED_INDEX_NAME = 'index_sbom_occurrences_for_input_file_path_search'
+  disable_ddl_transaction!
+  milestone '16.9'
+
+  def up
+    remove_concurrent_index_by_name :sbom_occurrences, DROPPED_INDEX_NAME
+    add_concurrent_index :sbom_occurrences, %i[project_id component_version_id input_file_path], name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :sbom_occurrences, INDEX_NAME
+    add_concurrent_index :sbom_occurrences, %i[project_id component_id input_file_path], name: DROPPED_INDEX_NAME
+  end
+end

db/schema_migrations/20240123120413

+9b55d0889ab76a1bf64696bc1d356a99366912e1f5c3c689fd8a52d2134f7644
\ No newline at end of file

db/structure.sql

@@ -32463,6 +32463,8 @@ CREATE INDEX idx_repository_states_on_wiki_failure_partial ON project_repository
 CREATE INDEX idx_repository_states_outdated_checksums ON project_repository_states USING btree (project_id) WHERE (((repository_verification_checksum IS NULL) AND (last_repository_verification_failure IS NULL)) OR ((wiki_verification_checksum IS NULL) AND (last_wiki_verification_failure IS NULL)));
+CREATE INDEX idx_sbom_occurr_on_project_component_version_input_file_path ON sbom_occurrences USING btree (project_id, component_version_id, input_file_path);
+
 CREATE INDEX idx_sbom_occurrences_on_project_id_and_source_id ON sbom_occurrences USING btree (project_id, source_id);
 CREATE UNIQUE INDEX idx_sbom_source_packages_on_name_and_purl_type ON sbom_source_packages USING btree (name, purl_type);
@@ -35325,8 +35327,6 @@ CREATE UNIQUE INDEX index_sbom_components_on_component_type_name_and_purl_type O
 CREATE INDEX index_sbom_occurr_on_project_id_and_component_version_id_and_id ON sbom_occurrences USING btree (project_id, component_version_id, id);
-CREATE INDEX index_sbom_occurrences_for_input_file_path_search ON sbom_occurrences USING btree (project_id, component_id, input_file_path);
-
 CREATE INDEX index_sbom_occurrences_on_component_id_and_id ON sbom_occurrences USING btree (component_id, id);
 CREATE INDEX index_sbom_occurrences_on_component_version_id ON sbom_occurrences USING btree (component_version_id);

spec/support/helpers/database/duplicate_indexes.yml

@@ -135,8 +135,6 @@ sbom_component_versions:
   index_sbom_component_versions_on_component_id_and_version:
     - index_sbom_component_versions_on_component_id
 sbom_occurrences:
-  index_sbom_occurrences_for_input_file_path_search:
-    - index_sbom_occurrences_on_project_id_component_id
   index_sbom_occurrences_on_project_id_and_component_id_and_id:
     - index_sbom_occurrences_on_project_id_component_id
 search_namespace_index_assignments: