Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20230414230535_add_external_identifiers_index_to_import_failures.rb.rb b/db/migrate/20230414230535_add_external_identifiers_index_to_import_failures.rb.rb
new file mode 100644
index 00000000000..5d9a35108f4
--- /dev/null
+++ b/db/migrate/20230414230535_add_external_identifiers_index_to_import_failures.rb.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddExternalIdentifiersIndexToImportFailures < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_import_failures_on_external_identifiers'
+
+  def up
+    add_concurrent_index :import_failures, :external_identifiers, name: INDEX_NAME,
+      where: "external_identifiers != '{}'"
+  end
+
+  def down
+    remove_concurrent_index_by_name :import_failures, INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20230414230535 b/db/schema_migrations/20230414230535
new file mode 100644
index 00000000000..388c5343f4b
--- /dev/null
+++ b/db/schema_migrations/20230414230535
@@ -0,0 +1 @@
+36c538abaeb4239d5cc0424ebe2ac2f01c427d4acdfaf849f181d066f658899e
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 8b0042bfbdf..2b6c2cb4196 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -30845,6 +30845,8 @@ CREATE INDEX index_import_export_uploads_on_updated_at ON import_export_uploads
 
 CREATE INDEX index_import_failures_on_correlation_id_value ON import_failures USING btree (correlation_id_value);
 
+CREATE INDEX index_import_failures_on_external_identifiers ON import_failures USING btree (external_identifiers) WHERE (external_identifiers <> '{}'::jsonb);
+
 CREATE INDEX index_import_failures_on_group_id_not_null ON import_failures USING btree (group_id) WHERE (group_id IS NOT NULL);
 
 CREATE INDEX index_import_failures_on_project_id_and_correlation_id_value ON import_failures USING btree (project_id, correlation_id_value) WHERE (retry_count = 0);