Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 0 deletions

diff --git a/db/post_migrate/20230130084718_drop_invalid_async_index_from_postgres_async_index.rb b/db/post_migrate/20230130084718_drop_invalid_async_index_from_postgres_async_index.rb
new file mode 100644
index 00000000000..ebe28eb4088
--- /dev/null
+++ b/db/post_migrate/20230130084718_drop_invalid_async_index_from_postgres_async_index.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class DropInvalidAsyncIndexFromPostgresAsyncIndex < Gitlab::Database::Migration[2.1]
+  # rollback 20230117092947_add_tmp_index_to_ci_build_report_results.rb
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'tmp_index_ci_build_report_results_on_partition_id_and_id'
+  TABLE_NAME = 'ci_build_report_results'
+
+  def up
+    return unless Gitlab.com?
+
+    unprepare_async_index_by_name(TABLE_NAME, INDEX_NAME)
+  end
+
+  def down
+    return unless Gitlab.com?
+
+    prepare_async_index(TABLE_NAME, [:partition_id, :id], where: 'partition_id = 101', name: INDEX_NAME)
+  end
+end
diff --git a/db/schema_migrations/20230130084718 b/db/schema_migrations/20230130084718
new file mode 100644
index 00000000000..8ba8cf04105
--- /dev/null
+++ b/db/schema_migrations/20230130084718
@@ -0,0 +1 @@
+90e2078790aed27af30756977d40a9ae839ddadcf336c0d1d4da4ab56a26d7ec
\ No newline at end of file