Merge branch 'revert-af53eab2' into 'master'

Revert !139630 into 'master'"

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Diogo Frazão <dfrazao@gitlab.com>

db/docs/deleted_tables/user_interacted_projects.yml → db/docs/user_interacted_projects.yml

@@ -16,5 +16,3 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
-removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139630
-removed_in_milestone: '16.10'

db/post_migrate/20240212200632_remove_foreign_keys_user_interacted_projects.rb

@@ -3,28 +3,11 @@
 class RemoveForeignKeysUserInteractedProjects < Gitlab::Database::Migration[2.2]
   milestone '16.10'
 
-  disable_ddl_transaction!
-
-  FOREIGN_KEY_NAME_USERS = "fk_0894651f08"
-  FOREIGN_KEY_NAME_PROJECTS = "fk_722ceba4f7"
-
   def up
-    with_lock_retries do
-      remove_foreign_key_if_exists(:user_interacted_projects, :users,
-        name: FOREIGN_KEY_NAME_USERS, reverse_lock_order: true)
-
-      remove_foreign_key_if_exists(:user_interacted_projects, :projects,
-        name: FOREIGN_KEY_NAME_PROJECTS, reverse_lock_order: true)
-    end
+    # No-op https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17622
   end
 
   def down
-    add_concurrent_foreign_key(:user_interacted_projects, :users,
-      name: FOREIGN_KEY_NAME_USERS, column: :user_id,
-      target_column: :id, on_delete: :cascade)
-
-    add_concurrent_foreign_key(:user_interacted_projects, :projects,
-      name: FOREIGN_KEY_NAME_PROJECTS, column: :project_id,
-      target_column: :id, on_delete: :cascade)
+    # No-op https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17622
   end
 end

db/post_migrate/20240212200947_drop_user_interacted_projects_table.rb

@@ -3,25 +3,11 @@
 class DropUserInteractedProjectsTable < Gitlab::Database::Migration[2.2]
   milestone '16.10'
 
-  disable_ddl_transaction!
-
-  TABLE_NAME = 'user_interacted_projects'
-  INDEX_NAME = 'index_user_interacted_projects_on_user_id'
-  PRIMARY_KEY_CONSTRAINT = 'user_interacted_projects_pkey'
-
   def up
-    drop_table :user_interacted_projects
+    # No-op https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17622
   end
 
   def down
-    unless table_exists?(:user_interacted_projects)
-      create_table :user_interacted_projects, id: false do |t|
-        t.integer :user_id, null: false
-        t.integer :project_id, null: false
-        t.index :user_id, name: INDEX_NAME
-      end
-    end
-
-    execute "ALTER TABLE #{TABLE_NAME} ADD CONSTRAINT #{PRIMARY_KEY_CONSTRAINT} PRIMARY KEY (project_id, user_id)"
+    # No-op https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17622
   end
 end

db/structure.sql

@@ -16626,6 +16626,11 @@ CREATE TABLE user_highest_roles (
     highest_access_level integer
 );
+CREATE TABLE user_interacted_projects (
+    user_id integer NOT NULL,
+    project_id integer NOT NULL
+);
+
 CREATE TABLE user_namespace_callouts (
     id bigint NOT NULL,
     user_id bigint NOT NULL,
@@ -22001,6 +22006,9 @@ ALTER TABLE ONLY user_group_callouts
 ALTER TABLE ONLY user_highest_roles
     ADD CONSTRAINT user_highest_roles_pkey PRIMARY KEY (user_id);
+ALTER TABLE ONLY user_interacted_projects
+    ADD CONSTRAINT user_interacted_projects_pkey PRIMARY KEY (project_id, user_id);
+
 ALTER TABLE ONLY user_namespace_callouts
     ADD CONSTRAINT user_namespace_callouts_pkey PRIMARY KEY (id);
@@ -26980,6 +26988,8 @@ CREATE INDEX index_user_group_callouts_on_group_id ON user_group_callouts USING
 CREATE INDEX index_user_highest_roles_on_user_id_and_highest_access_level ON user_highest_roles USING btree (user_id, highest_access_level);
+CREATE INDEX index_user_interacted_projects_on_user_id ON user_interacted_projects USING btree (user_id);
+
 CREATE INDEX index_user_namespace_callouts_on_namespace_id ON user_namespace_callouts USING btree (namespace_id);
 CREATE INDEX index_user_permission_export_uploads_on_user_id_and_status ON user_permission_export_uploads USING btree (user_id, status);
@@ -29228,6 +29238,9 @@ ALTER TABLE ONLY sbom_occurrences_vulnerabilities
 ALTER TABLE ONLY abuse_report_user_mentions
     ADD CONSTRAINT fk_088018ecd8 FOREIGN KEY (abuse_report_id) REFERENCES abuse_reports(id) ON DELETE CASCADE;
+ALTER TABLE ONLY user_interacted_projects
+    ADD CONSTRAINT fk_0894651f08 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY merge_request_assignment_events
     ADD CONSTRAINT fk_08f7602bfd FOREIGN KEY (merge_request_id) REFERENCES merge_requests(id) ON DELETE CASCADE;
@@ -29663,6 +29676,9 @@ ALTER TABLE ONLY protected_branch_push_access_levels
 ALTER TABLE ONLY integrations
     ADD CONSTRAINT fk_71cce407f9 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+ALTER TABLE ONLY user_interacted_projects
+    ADD CONSTRAINT fk_722ceba4f7 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY subscription_user_add_on_assignments
     ADD CONSTRAINT fk_724c2df9a8 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;