Add latest changes from gitlab-org/gitlab@master

5 files changed, 39 insertions, 2 deletions

diff --git a/db/migrate/20230601084041_add_merge_request_diff_llm_summaries_unique_index.rb b/db/migrate/20230601084041_add_merge_request_diff_llm_summaries_unique_index.rb
new file mode 100644
index 00000000000..6f8afb561e9
--- /dev/null
+++ b/db/migrate/20230601084041_add_merge_request_diff_llm_summaries_unique_index.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddMergeRequestDiffLlmSummariesUniqueIndex < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'unique_merge_request_diff_llm_summaries_on_mr_diff_id'
+  OLD_INDEX_NAME = 'index_merge_request_diff_llm_summaries_on_mr_diff_id'
+
+  def up
+    add_concurrent_index :merge_request_diff_llm_summaries, :merge_request_diff_id, name: INDEX_NAME, unique: true
+    remove_concurrent_index_by_name :merge_request_diff_llm_summaries, OLD_INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :merge_request_diff_llm_summaries, :merge_request_diff_id, name: OLD_INDEX_NAME
+    remove_concurrent_index_by_name :merge_request_diff_llm_summaries, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20230605093005_add_index_for_sbom_occurrences_on_project_id_source_id.rb b/db/post_migrate/20230605093005_add_index_for_sbom_occurrences_on_project_id_source_id.rb
new file mode 100644
index 00000000000..868cf276354
--- /dev/null
+++ b/db/post_migrate/20230605093005_add_index_for_sbom_occurrences_on_project_id_source_id.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddIndexForSbomOccurrencesOnProjectIdSourceId < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'idx_sbom_occurrences_on_project_id_and_source_id'
+
+  def up
+    add_concurrent_index :sbom_occurrences, [:project_id, :source_id], name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :sbom_occurrences, INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20230601084041 b/db/schema_migrations/20230601084041
new file mode 100644
index 00000000000..7eac90f4c33
--- /dev/null
+++ b/db/schema_migrations/20230601084041
@@ -0,0 +1 @@
+c64ff0998a0cd143f98c3b2461f71ddadafac5e3834c6980d658e390d1533dd9
\ No newline at end of file
diff --git a/db/schema_migrations/20230605093005 b/db/schema_migrations/20230605093005
new file mode 100644
index 00000000000..273961a1f40
--- /dev/null
+++ b/db/schema_migrations/20230605093005
@@ -0,0 +1 @@
+df354a2edec37d3b09bc9deebe895637f8a86c90ffb2569cefe6d791458a65ba
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 2c12ac39a8a..b0a528aa8c1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -29690,6 +29690,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_occurrences_on_project_id_and_source_id ON sbom_occurrences USING btree (project_id, source_id);
+
 CREATE UNIQUE INDEX idx_security_scans_on_build_and_scan_type ON security_scans USING btree (build_id, scan_type);
 
 CREATE INDEX idx_security_scans_on_scan_type ON security_scans USING btree (scan_type);
@@ -31410,8 +31412,6 @@ CREATE INDEX index_merge_request_diff_details_on_verification_state ON merge_req
 
 CREATE INDEX index_merge_request_diff_details_pending_verification ON merge_request_diff_details USING btree (verified_at NULLS FIRST) WHERE (verification_state = 0);
 
-CREATE INDEX index_merge_request_diff_llm_summaries_on_mr_diff_id ON merge_request_diff_llm_summaries USING btree (merge_request_diff_id);
-
 CREATE INDEX index_merge_request_diff_llm_summaries_on_user_id ON merge_request_diff_llm_summaries USING btree (user_id);
 
 CREATE INDEX index_merge_request_diffs_by_id_partial ON merge_request_diffs USING btree (id) WHERE ((files_count > 0) AND ((NOT stored_externally) OR (stored_externally IS NULL)));
@@ -33304,6 +33304,8 @@ CREATE UNIQUE INDEX unique_index_for_project_pages_unique_domain ON project_sett
 
 CREATE UNIQUE INDEX unique_index_on_system_note_metadata_id ON resource_link_events USING btree (system_note_metadata_id);
 
+CREATE UNIQUE INDEX unique_merge_request_diff_llm_summaries_on_mr_diff_id ON merge_request_diff_llm_summaries USING btree (merge_request_diff_id);
+
 CREATE UNIQUE INDEX unique_merge_request_metrics_by_merge_request_id ON merge_request_metrics USING btree (merge_request_id);
 
 CREATE UNIQUE INDEX unique_organizations_on_path ON organizations USING btree (path);