diff --git a/db/docs/approval_project_rules_protected_branches.yml b/db/docs/approval_project_rules_protected_branches.yml
index b1382866d444aa9db8abef0c2f29484e900624dc..6ab81dbe594da2eeea9d41e8543a66a2beb41a02 100644
--- a/db/docs/approval_project_rules_protected_branches.yml
+++ b/db/docs/approval_project_rules_protected_branches.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
table: approval_project_rules
sharding_key: project_id
belongs_to: approval_project_rule
+desired_sharding_key_migration_job_name: BackfillApprovalProjectRulesProtectedBranchesProjectId
diff --git a/db/docs/batched_background_migrations/backfill_approval_project_rules_protected_branches_project_id.yml b/db/docs/batched_background_migrations/backfill_approval_project_rules_protected_branches_project_id.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d1e4eabfc85b260b3564b8ee5fda1573ae606664
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_approval_project_rules_protected_branches_project_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillApprovalProjectRulesProtectedBranchesProjectId
+description: Backfills sharding key `approval_project_rules_protected_branches.project_id` from `approval_project_rules`.
+feature_category: source_code_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167648
+milestone: '17.5'
+queued_migration_version: 20240930160027
+finalize_after: '2024-10-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/migrate/20240930160023_add_project_id_to_approval_project_rules_protected_branches.rb b/db/migrate/20240930160023_add_project_id_to_approval_project_rules_protected_branches.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f7cc859a0b749abd8a4a08c9902fe137e9f1792e
--- /dev/null
+++ b/db/migrate/20240930160023_add_project_id_to_approval_project_rules_protected_branches.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToApprovalProjectRulesProtectedBranches < Gitlab::Database::Migration[2.2]
+ milestone '17.5'
+
+ def change
+ add_column :approval_project_rules_protected_branches, :project_id, :bigint
+ end
+end
diff --git a/db/post_migrate/20240930160024_index_approval_project_rules_protected_branches_on_project_id.rb b/db/post_migrate/20240930160024_index_approval_project_rules_protected_branches_on_project_id.rb
new file mode 100644
index 0000000000000000000000000000000000000000..b73e17c3650365dc4254399615d633ee01fed135
--- /dev/null
+++ b/db/post_migrate/20240930160024_index_approval_project_rules_protected_branches_on_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexApprovalProjectRulesProtectedBranchesOnProjectId < Gitlab::Database::Migration[2.2]
+ milestone '17.5'
+ disable_ddl_transaction!
+
+ INDEX_NAME = 'index_approval_project_rules_protected_branches_on_project_id'
+
+ def up
+ add_concurrent_index :approval_project_rules_protected_branches, :project_id, name: INDEX_NAME
+ end
+
+ def down
+ remove_concurrent_index_by_name :approval_project_rules_protected_branches, INDEX_NAME
+ end
+end
diff --git a/db/post_migrate/20240930160025_add_approval_project_rules_protected_branches_project_id_fk.rb b/db/post_migrate/20240930160025_add_approval_project_rules_protected_branches_project_id_fk.rb
new file mode 100644
index 0000000000000000000000000000000000000000..94d516238f2e7cba589a81fa07c0930f64e84d05
--- /dev/null
+++ b/db/post_migrate/20240930160025_add_approval_project_rules_protected_branches_project_id_fk.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddApprovalProjectRulesProtectedBranchesProjectIdFk < Gitlab::Database::Migration[2.2]
+ milestone '17.5'
+ disable_ddl_transaction!
+
+ def up
+ add_concurrent_foreign_key :approval_project_rules_protected_branches, :projects, column: :project_id,
+ on_delete: :cascade
+ end
+
+ def down
+ with_lock_retries do
+ remove_foreign_key :approval_project_rules_protected_branches, column: :project_id
+ end
+ end
+end
diff --git a/db/post_migrate/20240930160026_add_approval_project_rules_protected_branches_project_id_trigger.rb b/db/post_migrate/20240930160026_add_approval_project_rules_protected_branches_project_id_trigger.rb
new file mode 100644
index 0000000000000000000000000000000000000000..091491087b3f66674f6d9fde2db27a34acae2670
--- /dev/null
+++ b/db/post_migrate/20240930160026_add_approval_project_rules_protected_branches_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddApprovalProjectRulesProtectedBranchesProjectIdTrigger < Gitlab::Database::Migration[2.2]
+ milestone '17.5'
+
+ def up
+ install_sharding_key_assignment_trigger(
+ table: :approval_project_rules_protected_branches,
+ sharding_key: :project_id,
+ parent_table: :approval_project_rules,
+ parent_sharding_key: :project_id,
+ foreign_key: :approval_project_rule_id
+ )
+ end
+
+ def down
+ remove_sharding_key_assignment_trigger(
+ table: :approval_project_rules_protected_branches,
+ sharding_key: :project_id,
+ parent_table: :approval_project_rules,
+ parent_sharding_key: :project_id,
+ foreign_key: :approval_project_rule_id
+ )
+ end
+end
diff --git a/db/post_migrate/20240930160027_queue_backfill_approval_project_rules_protected_branches_project_id.rb b/db/post_migrate/20240930160027_queue_backfill_approval_project_rules_protected_branches_project_id.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f12f7b836e3099a979d1c3ab9244ff505b4159fc
--- /dev/null
+++ b/db/post_migrate/20240930160027_queue_backfill_approval_project_rules_protected_branches_project_id.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class QueueBackfillApprovalProjectRulesProtectedBranchesProjectId < Gitlab::Database::Migration[2.2]
+ milestone '17.5'
+ restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+ MIGRATION = "BackfillApprovalProjectRulesProtectedBranchesProjectId"
+ DELAY_INTERVAL = 2.minutes
+ BATCH_SIZE = 1000
+ SUB_BATCH_SIZE = 100
+
+ def up
+ queue_batched_background_migration(
+ MIGRATION,
+ :approval_project_rules_protected_branches,
+ :approval_project_rule_id,
+ :project_id,
+ :approval_project_rules,
+ :project_id,
+ :approval_project_rule_id,
+ job_interval: DELAY_INTERVAL,
+ batch_size: BATCH_SIZE,
+ batch_class_name: 'LooseIndexScanBatchingStrategy',
+ sub_batch_size: SUB_BATCH_SIZE
+ )
+ end
+
+ def down
+ delete_batched_background_migration(
+ MIGRATION,
+ :approval_project_rules_protected_branches,
+ :approval_project_rule_id,
+ [
+ :project_id,
+ :approval_project_rules,
+ :project_id,
+ :approval_project_rule_id
+ ]
+ )
+ end
+end
diff --git a/db/schema_migrations/20240930160023 b/db/schema_migrations/20240930160023
new file mode 100644
index 0000000000000000000000000000000000000000..935a1bd81fe6780db51a512d988de2aa31206f66
--- /dev/null
+++ b/db/schema_migrations/20240930160023
@@ -0,0 +1 @@
+e4246085fc454e022e500fdb3b5dbb5d3c78a71fe5107d41d615e945a80f31e5
\ No newline at end of file
diff --git a/db/schema_migrations/20240930160024 b/db/schema_migrations/20240930160024
new file mode 100644
index 0000000000000000000000000000000000000000..4222bfd06e3f0e6fd5ce668d3952d9005458d317
--- /dev/null
+++ b/db/schema_migrations/20240930160024
@@ -0,0 +1 @@
+d0525a4ec76c7847e59531e5fb6d5137b2121e1dd06ade1680b283bfcf28c53d
\ No newline at end of file
diff --git a/db/schema_migrations/20240930160025 b/db/schema_migrations/20240930160025
new file mode 100644
index 0000000000000000000000000000000000000000..9bbb7ee80afdac2fb1dcf35985952504373c6e71
--- /dev/null
+++ b/db/schema_migrations/20240930160025
@@ -0,0 +1 @@
+fd42f51e9904d94a6870d24f9ca017b0047b183f92cf1481268667a17e2477f9
\ No newline at end of file
diff --git a/db/schema_migrations/20240930160026 b/db/schema_migrations/20240930160026
new file mode 100644
index 0000000000000000000000000000000000000000..2b2887b90b1cd0a0c162b8ae5b445b4117d69bd6
--- /dev/null
+++ b/db/schema_migrations/20240930160026
@@ -0,0 +1 @@
+d53da99c66293fa9e53fdef556f3134d490fe66e7bc7bed08093bea9f686f691
\ No newline at end of file
diff --git a/db/schema_migrations/20240930160027 b/db/schema_migrations/20240930160027
new file mode 100644
index 0000000000000000000000000000000000000000..62be59b163e567c88bc4af1b247daac3928ca334
--- /dev/null
+++ b/db/schema_migrations/20240930160027
@@ -0,0 +1 @@
+6f49ec85bcf41062ff0c9165444a74a8119ab500392221bc6e8f0a75d3566c45
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 5bb9afa1fe264210d902f3271416f9932ed6929f..09224cf3eaaaac6bf94f8b2fe2053bb7923eb7d5 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -841,6 +841,22 @@ RETURN NEW;
END
$$;
+CREATE FUNCTION trigger_0a29d4d42b62() RETURNS trigger
+ LANGUAGE plpgsql
+ AS $$
+BEGIN
+IF NEW."project_id" IS NULL THEN
+ SELECT "project_id"
+ INTO NEW."project_id"
+ FROM "approval_project_rules"
+ WHERE "approval_project_rules"."id" = NEW."approval_project_rule_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
CREATE FUNCTION trigger_0da002390fdc() RETURNS trigger
LANGUAGE plpgsql
AS $$
@@ -6636,7 +6652,8 @@ ALTER SEQUENCE approval_project_rules_id_seq OWNED BY approval_project_rules.id;
CREATE TABLE approval_project_rules_protected_branches (
approval_project_rule_id bigint NOT NULL,
- protected_branch_id bigint NOT NULL
+ protected_branch_id bigint NOT NULL,
+ project_id bigint
);
CREATE TABLE approval_project_rules_users (
@@ -27517,6 +27534,8 @@ CREATE INDEX index_approval_project_rules_on_project_id ON approval_project_rule
CREATE INDEX index_approval_project_rules_on_rule_type ON approval_project_rules USING btree (rule_type);
+CREATE INDEX index_approval_project_rules_protected_branches_on_project_id ON approval_project_rules_protected_branches USING btree (project_id);
+
CREATE INDEX index_approval_project_rules_protected_branches_pb_id ON approval_project_rules_protected_branches USING btree (protected_branch_id);
CREATE INDEX index_approval_project_rules_report_type ON approval_project_rules USING btree (report_type);
@@ -33321,6 +33340,8 @@ CREATE TRIGGER trigger_05ce163deddf BEFORE INSERT OR UPDATE ON status_check_resp
CREATE TRIGGER trigger_0a1b0adcf686 BEFORE INSERT OR UPDATE ON packages_debian_project_components FOR EACH ROW EXECUTE FUNCTION trigger_0a1b0adcf686();
+CREATE TRIGGER trigger_0a29d4d42b62 BEFORE INSERT OR UPDATE ON approval_project_rules_protected_branches FOR EACH ROW EXECUTE FUNCTION trigger_0a29d4d42b62();
+
CREATE TRIGGER trigger_0da002390fdc BEFORE INSERT OR UPDATE ON operations_feature_flags_issues FOR EACH ROW EXECUTE FUNCTION trigger_0da002390fdc();
CREATE TRIGGER trigger_0e13f214e504 BEFORE INSERT OR UPDATE ON merge_request_assignment_events FOR EACH ROW EXECUTE FUNCTION trigger_0e13f214e504();
@@ -34937,6 +34958,9 @@ ALTER TABLE ONLY user_preferences
ALTER TABLE ONLY packages_debian_group_components
ADD CONSTRAINT fk_e63e8ee3b1 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+ALTER TABLE ONLY approval_project_rules_protected_branches
+ ADD CONSTRAINT fk_e6ee913fc2 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
ALTER TABLE ONLY merge_requests
ADD CONSTRAINT fk_e719a85f8a FOREIGN KEY (author_id) REFERENCES users(id) ON DELETE SET NULL;
diff --git a/lib/gitlab/background_migration/backfill_approval_project_rules_protected_branches_project_id.rb b/lib/gitlab/background_migration/backfill_approval_project_rules_protected_branches_project_id.rb
new file mode 100644
index 0000000000000000000000000000000000000000..01dddc6c374e51ad3cc032b84b42c370bf5281e9
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_approval_project_rules_protected_branches_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+ module BackgroundMigration
+ class BackfillApprovalProjectRulesProtectedBranchesProjectId < BackfillDesiredShardingKeyJob
+ operation_name :backfill_approval_project_rules_protected_branches_project_id
+ feature_category :source_code_management
+ end
+ end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_approval_project_rules_protected_branches_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_approval_project_rules_protected_branches_project_id_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5bd1023f15657c4ae3166f14eef7461b1c1ea496
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_approval_project_rules_protected_branches_project_id_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillApprovalProjectRulesProtectedBranchesProjectId,
+ feature_category: :source_code_management,
+ schema: 20240930160023 do
+ include_examples 'desired sharding key backfill job' do
+ let(:batch_table) { :approval_project_rules_protected_branches }
+ let(:batch_column) { :approval_project_rule_id }
+ let(:backfill_column) { :project_id }
+ let(:backfill_via_table) { :approval_project_rules }
+ let(:backfill_via_column) { :project_id }
+ let(:backfill_via_foreign_key) { :approval_project_rule_id }
+ end
+end
diff --git a/spec/migrations/20240930160027_queue_backfill_approval_project_rules_protected_branches_project_id_spec.rb b/spec/migrations/20240930160027_queue_backfill_approval_project_rules_protected_branches_project_id_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..353bacfafa9f27788150b588bbd467610d328e6a
--- /dev/null
+++ b/spec/migrations/20240930160027_queue_backfill_approval_project_rules_protected_branches_project_id_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillApprovalProjectRulesProtectedBranchesProjectId, feature_category: :source_code_management do
+ let!(:batched_migration) { described_class::MIGRATION }
+
+ it 'schedules a new batched migration' do
+ reversible_migration do |migration|
+ migration.before -> {
+ expect(batched_migration).not_to have_scheduled_batched_migration
+ }
+
+ migration.after -> {
+ expect(batched_migration).to have_scheduled_batched_migration(
+ table_name: :approval_project_rules_protected_branches,
+ column_name: :approval_project_rule_id,
+ interval: described_class::DELAY_INTERVAL,
+ batch_size: described_class::BATCH_SIZE,
+ batch_class_name: 'LooseIndexScanBatchingStrategy',
+ sub_batch_size: described_class::SUB_BATCH_SIZE,
+ gitlab_schema: :gitlab_main_cell,
+ job_arguments: [
+ :project_id,
+ :approval_project_rules,
+ :project_id,
+ :approval_project_rule_id
+ ]
+ )
+ }
+ end
+ end
+end