summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-12-05 16:07:42 +0000
committerDavid Robertson <davidr@element.io>2023-12-05 16:10:48 +0000
commit44377f5ac05ff4e95f440f5704805b87a37e3327 (patch)
tree4bceb3f51cf2ea6ad9420b4ff1457384ef0724fc /synapse
parentAmend changelog typo (diff)
downloadsynapse-44377f5ac05ff4e95f440f5704805b87a37e3327.tar.xz
Revert postgres logical replication deltaas v1.98.0rc1
This reverts two commits:

    0bb8e418a41c6f583ca9d705b400e37e2308a534
    "Fix postgres schema after dropping old tables (#16730)"

and

    51e4e35653f98c3f61222fbdbdb1dcb8864f7fca
    "Add a Postgres `REPLICA IDENTITY` to tables that do not have an implicit one. This should allow use of Postgres logical replication. (take  2, now with no added deadlocks!) (#16658)"

and also amends the changelog.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/schema/common/delta/83/10_replica_identity_applied_module_schemas.sql.postgres1
-rw-r--r--synapse/storage/schema/common/delta/83/10_replica_identity_applied_schema_deltas.sql.postgres1
-rw-r--r--synapse/storage/schema/common/delta/83/10_replica_identity_background_updates.sql.postgres1
-rw-r--r--synapse/storage/schema/common/delta/83/10_replica_identity_schema_compat_version.sql.postgres1
-rw-r--r--synapse/storage/schema/common/delta/83/10_replica_identity_schema_version.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_README.md13
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_account_data.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_application_services_txns.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_appservice_room_list.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_appservice_stream_position.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_blocked_rooms.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_cache_invalidation_stream_by_instance.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_current_state_delta_stream.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_current_state_events.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_deleted_pushers.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_auth_providers.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_federation_inbox.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_federation_outbox.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_inbox.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_changes_converted_stream_position.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_changes_in_room.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_outbound_last_success.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_outbound_pokes.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_cache.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_extremeties.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_resync.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_stream.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_devices.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_e2e_cross_signing_keys.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_e2e_cross_signing_signatures.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_e2e_device_keys_json.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_e2e_fallback_keys_json.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_e2e_one_time_keys_json.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_e2e_room_keys.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_e2e_room_keys_versions.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_erased_users.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_auth.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_auth_chain_links.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_backward_extremities.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_edges.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_forward_extremities.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_json.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_push_actions.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_push_actions_staging.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary_last_receipt_stream_id.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary_stream_ordering.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_relations.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_search.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_to_state_groups.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_event_txn_id_device_id.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_events.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_federation_inbound_events_staging.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_federation_stream_position.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_ignored_users.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_local_current_membership.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository_thumbnails.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository_url_cache.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_monthly_active_users.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_partial_state_events.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_partial_state_rooms_servers.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_presence_stream.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_profiles.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_push_rules_stream.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_ratelimit_override.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_receipts_graph.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_receipts_linearized.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_received_transactions.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_redactions.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_registration_tokens.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_rejections.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_remote_media_cache.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_remote_media_cache_thumbnails.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_account_data.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_alias_servers.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_aliases.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_depth.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_forgetter_stream_pos.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_memberships.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_stats_earliest_token.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_stats_state.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_tags.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_room_tags_revisions.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_server_keys_json.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_server_signature_keys.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_sessions.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_state_events.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_stats_incremental_position.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_stream_ordering_to_exterm.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_stream_positions.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_threads.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_threepid_guest_access_tokens.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_timeline_gaps.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions_credentials.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions_ips.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_daily_visits.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_directory.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_directory_search.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_directory_stream_pos.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_external_ids.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_filters.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_ips.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_signature_stream.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_threepid_id_server.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_user_threepids.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_users.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_users_in_public_rooms.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_users_pending_deactivation.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_users_who_share_private_rooms.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_worker_locks.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_worker_read_write_locks.sql.postgres1
-rw-r--r--synapse/storage/schema/main/delta/83/10_replica_identity_worker_read_write_locks_mode.sql.postgres1
-rw-r--r--synapse/storage/schema/state/delta/83/10_replica_identity_state_group_edges.sql.postgres1
-rw-r--r--synapse/storage/schema/state/delta/83/10_replica_identity_state_groups_state.sql.postgres1
116 files changed, 0 insertions, 128 deletions
diff --git a/synapse/storage/schema/common/delta/83/10_replica_identity_applied_module_schemas.sql.postgres b/synapse/storage/schema/common/delta/83/10_replica_identity_applied_module_schemas.sql.postgres
deleted file mode 100644
index 57c35b6430..0000000000
--- a/synapse/storage/schema/common/delta/83/10_replica_identity_applied_module_schemas.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE applied_module_schemas REPLICA IDENTITY USING INDEX applied_module_schemas_module_name_file_key;
diff --git a/synapse/storage/schema/common/delta/83/10_replica_identity_applied_schema_deltas.sql.postgres b/synapse/storage/schema/common/delta/83/10_replica_identity_applied_schema_deltas.sql.postgres
deleted file mode 100644
index 1426f9a9e4..0000000000
--- a/synapse/storage/schema/common/delta/83/10_replica_identity_applied_schema_deltas.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE applied_schema_deltas REPLICA IDENTITY USING INDEX applied_schema_deltas_version_file_key;
diff --git a/synapse/storage/schema/common/delta/83/10_replica_identity_background_updates.sql.postgres b/synapse/storage/schema/common/delta/83/10_replica_identity_background_updates.sql.postgres
deleted file mode 100644
index f04937b3db..0000000000
--- a/synapse/storage/schema/common/delta/83/10_replica_identity_background_updates.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE background_updates REPLICA IDENTITY USING INDEX background_updates_uniqueness;
diff --git a/synapse/storage/schema/common/delta/83/10_replica_identity_schema_compat_version.sql.postgres b/synapse/storage/schema/common/delta/83/10_replica_identity_schema_compat_version.sql.postgres
deleted file mode 100644
index e3a6f7ca4f..0000000000
--- a/synapse/storage/schema/common/delta/83/10_replica_identity_schema_compat_version.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE schema_compat_version REPLICA IDENTITY USING INDEX schema_compat_version_lock_key;
diff --git a/synapse/storage/schema/common/delta/83/10_replica_identity_schema_version.sql.postgres b/synapse/storage/schema/common/delta/83/10_replica_identity_schema_version.sql.postgres
deleted file mode 100644
index c10efe0563..0000000000
--- a/synapse/storage/schema/common/delta/83/10_replica_identity_schema_version.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE schema_version REPLICA IDENTITY USING INDEX schema_version_lock_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_README.md b/synapse/storage/schema/main/delta/83/10_replica_identity_README.md
deleted file mode 100644
index fd7bdfc7ad..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-The `10_replica_identity_xxx.sql.postgres` series of schema deltas adds replica identities for tables that do not have one implicitly as a result of having a primary key.
-
-This is needed to use logical replication with Synapse (at least without `UPDATE` and `DELETE` statements failing!).
-
-Where possible, we use an existing `UNIQUE` index on `NOT NULL` columns as the replica identity. Otherwise, we have to fall back to using the full row as a replica identity.
-
-Unfortunately, by running all the `ALTER TABLE` statements in one schema delta per database, it was too likely to hit a deadlock as it would only take
-one other transaction from a running Synapse worker to access the tables out of order and trigger a deadlock.
-
-By having each statement in its own delta file, each one is run in its own transaction and only needs to take a very brief (instant) lock on the table but no other tables,
-so there should be no chance of deadlock.
-
-Like many schema deltas we already apply to Synapse, it is probably blocked by an ongoing `pg_dump`.
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_account_data.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_account_data.sql.postgres
deleted file mode 100644
index 1bf720e80e..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_account_data.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE account_data REPLICA IDENTITY USING INDEX account_data_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_application_services_txns.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_application_services_txns.sql.postgres
deleted file mode 100644
index 4ec052ebeb..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_application_services_txns.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE application_services_txns REPLICA IDENTITY USING INDEX application_services_txns_as_id_txn_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_appservice_room_list.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_appservice_room_list.sql.postgres
deleted file mode 100644
index 232a628ca2..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_appservice_room_list.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE appservice_room_list REPLICA IDENTITY USING INDEX appservice_room_list_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_appservice_stream_position.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_appservice_stream_position.sql.postgres
deleted file mode 100644
index e870a68723..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_appservice_stream_position.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE appservice_stream_position REPLICA IDENTITY USING INDEX appservice_stream_position_lock_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_blocked_rooms.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_blocked_rooms.sql.postgres
deleted file mode 100644
index e3fce4045f..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_blocked_rooms.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE blocked_rooms REPLICA IDENTITY USING INDEX blocked_rooms_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_cache_invalidation_stream_by_instance.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_cache_invalidation_stream_by_instance.sql.postgres
deleted file mode 100644
index 4fd87faaf6..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_cache_invalidation_stream_by_instance.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE cache_invalidation_stream_by_instance REPLICA IDENTITY USING INDEX cache_invalidation_stream_by_instance_id;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_current_state_delta_stream.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_current_state_delta_stream.sql.postgres
deleted file mode 100644
index b618286e8a..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_current_state_delta_stream.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE current_state_delta_stream REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_current_state_events.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_current_state_events.sql.postgres
deleted file mode 100644
index b058a9f06e..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_current_state_events.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE current_state_events REPLICA IDENTITY USING INDEX current_state_events_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_deleted_pushers.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_deleted_pushers.sql.postgres
deleted file mode 100644
index 0b4fcc5ae1..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_deleted_pushers.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE deleted_pushers REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_auth_providers.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_auth_providers.sql.postgres
deleted file mode 100644
index 8e02438b47..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_auth_providers.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_auth_providers REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_federation_inbox.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_federation_inbox.sql.postgres
deleted file mode 100644
index 547e485f00..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_federation_inbox.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_federation_inbox REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_federation_outbox.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_federation_outbox.sql.postgres
deleted file mode 100644
index 809afe4dc5..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_federation_outbox.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_federation_outbox REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_inbox.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_inbox.sql.postgres
deleted file mode 100644
index 07652038a2..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_inbox.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_inbox REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_changes_converted_stream_position.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_changes_converted_stream_position.sql.postgres
deleted file mode 100644
index 8474b8c842..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_changes_converted_stream_position.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_lists_changes_converted_stream_position REPLICA IDENTITY USING INDEX device_lists_changes_converted_stream_position_lock_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_changes_in_room.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_changes_in_room.sql.postgres
deleted file mode 100644
index 712a54bc0f..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_changes_in_room.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_lists_changes_in_room REPLICA IDENTITY USING INDEX device_lists_changes_in_stream_id;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_outbound_last_success.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_outbound_last_success.sql.postgres
deleted file mode 100644
index 4357690e8d..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_outbound_last_success.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_lists_outbound_last_success REPLICA IDENTITY USING INDEX device_lists_outbound_last_success_unique_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_outbound_pokes.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_outbound_pokes.sql.postgres
deleted file mode 100644
index cc724877cf..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_outbound_pokes.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_lists_outbound_pokes REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_cache.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_cache.sql.postgres
deleted file mode 100644
index ea4351c654..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_cache.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_lists_remote_cache REPLICA IDENTITY USING INDEX device_lists_remote_cache_unique_id;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_extremeties.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_extremeties.sql.postgres
deleted file mode 100644
index 9dc3bec6fa..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_extremeties.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_lists_remote_extremeties REPLICA IDENTITY USING INDEX device_lists_remote_extremeties_unique_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_resync.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_resync.sql.postgres
deleted file mode 100644
index df3cecfb94..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_remote_resync.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_lists_remote_resync REPLICA IDENTITY USING INDEX device_lists_remote_resync_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_stream.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_stream.sql.postgres
deleted file mode 100644
index 30a7922613..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_device_lists_stream.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE device_lists_stream REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_devices.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_devices.sql.postgres
deleted file mode 100644
index 57d54a0dc0..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_devices.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE devices REPLICA IDENTITY USING INDEX device_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_cross_signing_keys.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_cross_signing_keys.sql.postgres
deleted file mode 100644
index f3f2693631..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_cross_signing_keys.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE e2e_cross_signing_keys REPLICA IDENTITY USING INDEX e2e_cross_signing_keys_stream_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_cross_signing_signatures.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_cross_signing_signatures.sql.postgres
deleted file mode 100644
index d2347b7153..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_cross_signing_signatures.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE e2e_cross_signing_signatures REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_device_keys_json.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_device_keys_json.sql.postgres
deleted file mode 100644
index 66dafdc8e1..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_device_keys_json.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE e2e_device_keys_json REPLICA IDENTITY USING INDEX e2e_device_keys_json_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_fallback_keys_json.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_fallback_keys_json.sql.postgres
deleted file mode 100644
index 8bb4dfc78b..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_fallback_keys_json.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE e2e_fallback_keys_json REPLICA IDENTITY USING INDEX e2e_fallback_keys_json_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_one_time_keys_json.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_one_time_keys_json.sql.postgres
deleted file mode 100644
index b6609cfdfb..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_one_time_keys_json.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE e2e_one_time_keys_json REPLICA IDENTITY USING INDEX e2e_one_time_keys_json_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_room_keys.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_room_keys.sql.postgres
deleted file mode 100644
index 9b98924165..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_room_keys.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE e2e_room_keys REPLICA IDENTITY USING INDEX e2e_room_keys_with_version_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_room_keys_versions.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_room_keys_versions.sql.postgres
deleted file mode 100644
index ac7aaba44d..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_e2e_room_keys_versions.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE e2e_room_keys_versions REPLICA IDENTITY USING INDEX e2e_room_keys_versions_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_erased_users.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_erased_users.sql.postgres
deleted file mode 100644
index c775f81333..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_erased_users.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE erased_users REPLICA IDENTITY USING INDEX erased_users_user;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_auth.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_auth.sql.postgres
deleted file mode 100644
index d8014d123b..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_auth.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_auth REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_auth_chain_links.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_auth_chain_links.sql.postgres
deleted file mode 100644
index c2f9c90d42..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_auth_chain_links.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_auth_chain_links REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_backward_extremities.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_backward_extremities.sql.postgres
deleted file mode 100644
index 751541a929..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_backward_extremities.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_backward_extremities REPLICA IDENTITY USING INDEX event_backward_extremities_event_id_room_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_edges.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_edges.sql.postgres
deleted file mode 100644
index 066ea763f1..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_edges.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_edges REPLICA IDENTITY USING INDEX event_edges_event_id_prev_event_id_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_forward_extremities.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_forward_extremities.sql.postgres
deleted file mode 100644
index d70d6fd55c..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_forward_extremities.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_forward_extremities REPLICA IDENTITY USING INDEX event_forward_extremities_event_id_room_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_json.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_json.sql.postgres
deleted file mode 100644
index b614b96422..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_json.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_json REPLICA IDENTITY USING INDEX event_json_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_actions.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_actions.sql.postgres
deleted file mode 100644
index 7a92620270..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_actions.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_push_actions REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_actions_staging.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_actions_staging.sql.postgres
deleted file mode 100644
index 292ed9787d..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_actions_staging.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_push_actions_staging REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary.sql.postgres
deleted file mode 100644
index 42a9b6b676..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_push_summary REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary_last_receipt_stream_id.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary_last_receipt_stream_id.sql.postgres
deleted file mode 100644
index 707e498a6e..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary_last_receipt_stream_id.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_push_summary_last_receipt_stream_id REPLICA IDENTITY USING INDEX event_push_summary_last_receipt_stream_id_lock_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary_stream_ordering.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary_stream_ordering.sql.postgres
deleted file mode 100644
index 1240e3e1b5..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_push_summary_stream_ordering.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_push_summary_stream_ordering REPLICA IDENTITY USING INDEX event_push_summary_stream_ordering_lock_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_relations.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_relations.sql.postgres
deleted file mode 100644
index 6b62a6bc20..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_relations.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_relations REPLICA IDENTITY USING INDEX event_relations_id;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_search.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_search.sql.postgres
deleted file mode 100644
index e8467fc3d3..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_search.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_search REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_to_state_groups.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_to_state_groups.sql.postgres
deleted file mode 100644
index 4206975c35..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_to_state_groups.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_to_state_groups REPLICA IDENTITY USING INDEX event_to_state_groups_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_event_txn_id_device_id.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_event_txn_id_device_id.sql.postgres
deleted file mode 100644
index 05fce1e6b0..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_event_txn_id_device_id.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE event_txn_id_device_id REPLICA IDENTITY USING INDEX event_txn_id_device_id_event_id;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_events.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_events.sql.postgres
deleted file mode 100644
index 9046b8eb08..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_events.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE events REPLICA IDENTITY USING INDEX events_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_federation_inbound_events_staging.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_federation_inbound_events_staging.sql.postgres
deleted file mode 100644
index d9d2f88f67..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_federation_inbound_events_staging.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE federation_inbound_events_staging REPLICA IDENTITY USING INDEX federation_inbound_events_staging_instance_event;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_federation_stream_position.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_federation_stream_position.sql.postgres
deleted file mode 100644
index 5f9df14d7d..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_federation_stream_position.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE federation_stream_position REPLICA IDENTITY USING INDEX federation_stream_position_instance;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_ignored_users.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_ignored_users.sql.postgres
deleted file mode 100644
index dd082b7f9e..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_ignored_users.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE ignored_users REPLICA IDENTITY USING INDEX ignored_users_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_local_current_membership.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_local_current_membership.sql.postgres
deleted file mode 100644
index f36bad701a..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_local_current_membership.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE local_current_membership REPLICA IDENTITY USING INDEX local_current_membership_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository.sql.postgres
deleted file mode 100644
index 78a5128af3..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE local_media_repository REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository_thumbnails.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository_thumbnails.sql.postgres
deleted file mode 100644
index 6cd53f8e15..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository_thumbnails.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE local_media_repository_thumbnails REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository_url_cache.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository_url_cache.sql.postgres
deleted file mode 100644
index a41590ce6b..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_local_media_repository_url_cache.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE local_media_repository_url_cache REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_monthly_active_users.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_monthly_active_users.sql.postgres
deleted file mode 100644
index 326fc279d3..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_monthly_active_users.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE monthly_active_users REPLICA IDENTITY USING INDEX monthly_active_users_users;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_partial_state_events.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_partial_state_events.sql.postgres
deleted file mode 100644
index c6acd84315..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_partial_state_events.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE partial_state_events REPLICA IDENTITY USING INDEX partial_state_events_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_partial_state_rooms_servers.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_partial_state_rooms_servers.sql.postgres
deleted file mode 100644
index c618660b5f..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_partial_state_rooms_servers.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE partial_state_rooms_servers REPLICA IDENTITY USING INDEX partial_state_rooms_servers_room_id_server_name_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_presence_stream.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_presence_stream.sql.postgres
deleted file mode 100644
index 4e5d8d7a68..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_presence_stream.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE presence_stream REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_profiles.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_profiles.sql.postgres
deleted file mode 100644
index bb25e7a67a..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_profiles.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE profiles REPLICA IDENTITY USING INDEX profiles_user_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_push_rules_stream.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_push_rules_stream.sql.postgres
deleted file mode 100644
index f305d9a73a..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_push_rules_stream.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE push_rules_stream REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_ratelimit_override.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_ratelimit_override.sql.postgres
deleted file mode 100644
index f10f359155..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_ratelimit_override.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE ratelimit_override REPLICA IDENTITY USING INDEX ratelimit_override_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_receipts_graph.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_receipts_graph.sql.postgres
deleted file mode 100644
index 954dd92667..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_receipts_graph.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE receipts_graph REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_receipts_linearized.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_receipts_linearized.sql.postgres
deleted file mode 100644
index 302d887531..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_receipts_linearized.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE receipts_linearized REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_received_transactions.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_received_transactions.sql.postgres
deleted file mode 100644
index 3b8c227717..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_received_transactions.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE received_transactions REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_redactions.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_redactions.sql.postgres
deleted file mode 100644
index ffa3444b95..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_redactions.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE redactions REPLICA IDENTITY USING INDEX redactions_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_registration_tokens.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_registration_tokens.sql.postgres
deleted file mode 100644
index 3fdb5bbd54..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_registration_tokens.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE registration_tokens REPLICA IDENTITY USING INDEX registration_tokens_token_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_rejections.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_rejections.sql.postgres
deleted file mode 100644
index c7a7218578..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_rejections.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE rejections REPLICA IDENTITY USING INDEX rejections_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_remote_media_cache.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_remote_media_cache.sql.postgres
deleted file mode 100644
index d0ecfe1a75..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_remote_media_cache.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE remote_media_cache REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_remote_media_cache_thumbnails.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_remote_media_cache_thumbnails.sql.postgres
deleted file mode 100644
index 9d7b63dfb4..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_remote_media_cache_thumbnails.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE remote_media_cache_thumbnails REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_account_data.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_account_data.sql.postgres
deleted file mode 100644
index 36e756f6b1..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_account_data.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_account_data REPLICA IDENTITY USING INDEX room_account_data_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_alias_servers.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_alias_servers.sql.postgres
deleted file mode 100644
index df550076ac..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_alias_servers.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_alias_servers REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_aliases.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_aliases.sql.postgres
deleted file mode 100644
index bfe8db5375..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_aliases.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_aliases REPLICA IDENTITY USING INDEX room_aliases_room_alias_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_depth.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_depth.sql.postgres
deleted file mode 100644
index 77c78ee4ab..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_depth.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_depth REPLICA IDENTITY USING INDEX room_depth_room_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_forgetter_stream_pos.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_forgetter_stream_pos.sql.postgres
deleted file mode 100644
index 51de67b549..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_forgetter_stream_pos.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_forgetter_stream_pos REPLICA IDENTITY USING INDEX room_forgetter_stream_pos_lock_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_memberships.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_memberships.sql.postgres
deleted file mode 100644
index 5819409058..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_memberships.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_memberships REPLICA IDENTITY USING INDEX room_memberships_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_stats_earliest_token.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_stats_earliest_token.sql.postgres
deleted file mode 100644
index bacd9587d2..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_stats_earliest_token.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_stats_earliest_token REPLICA IDENTITY USING INDEX room_stats_earliest_token_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_stats_state.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_stats_state.sql.postgres
deleted file mode 100644
index a64db05f44..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_stats_state.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_stats_state REPLICA IDENTITY USING INDEX room_stats_state_room;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_tags.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_tags.sql.postgres
deleted file mode 100644
index cc69704751..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_tags.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_tags REPLICA IDENTITY USING INDEX room_tag_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_room_tags_revisions.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_room_tags_revisions.sql.postgres
deleted file mode 100644
index d31063277c..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_room_tags_revisions.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE room_tags_revisions REPLICA IDENTITY USING INDEX room_tag_revisions_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_server_keys_json.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_server_keys_json.sql.postgres
deleted file mode 100644
index 9c0bfb5623..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_server_keys_json.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE server_keys_json REPLICA IDENTITY USING INDEX server_keys_json_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_server_signature_keys.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_server_signature_keys.sql.postgres
deleted file mode 100644
index 1b3d5e68e5..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_server_signature_keys.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE server_signature_keys REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_sessions.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_sessions.sql.postgres
deleted file mode 100644
index eb8d621795..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_sessions.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE sessions REPLICA IDENTITY USING INDEX sessions_session_type_session_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_state_events.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_state_events.sql.postgres
deleted file mode 100644
index 7e23c8a054..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_state_events.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE state_events REPLICA IDENTITY USING INDEX state_events_event_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_stats_incremental_position.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_stats_incremental_position.sql.postgres
deleted file mode 100644
index a4a700a3a4..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_stats_incremental_position.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE stats_incremental_position REPLICA IDENTITY USING INDEX stats_incremental_position_lock_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_stream_ordering_to_exterm.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_stream_ordering_to_exterm.sql.postgres
deleted file mode 100644
index a700741896..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_stream_ordering_to_exterm.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE stream_ordering_to_exterm REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_stream_positions.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_stream_positions.sql.postgres
deleted file mode 100644
index 83ff1c3825..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_stream_positions.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE stream_positions REPLICA IDENTITY USING INDEX stream_positions_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_threads.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_threads.sql.postgres
deleted file mode 100644
index a3891e4208..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_threads.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE threads REPLICA IDENTITY USING INDEX threads_uniqueness;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_threepid_guest_access_tokens.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_threepid_guest_access_tokens.sql.postgres
deleted file mode 100644
index df31cf4f1d..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_threepid_guest_access_tokens.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE threepid_guest_access_tokens REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_timeline_gaps.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_timeline_gaps.sql.postgres
deleted file mode 100644
index 8fb41226c1..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_timeline_gaps.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE timeline_gaps REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions.sql.postgres
deleted file mode 100644
index 5d2af97f72..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE ui_auth_sessions REPLICA IDENTITY USING INDEX ui_auth_sessions_session_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions_credentials.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions_credentials.sql.postgres
deleted file mode 100644
index efb2359faa..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions_credentials.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE ui_auth_sessions_credentials REPLICA IDENTITY USING INDEX ui_auth_sessions_credentials_session_id_stage_type_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions_ips.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions_ips.sql.postgres
deleted file mode 100644
index a4b86eaf07..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_ui_auth_sessions_ips.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE ui_auth_sessions_ips REPLICA IDENTITY USING INDEX ui_auth_sessions_ips_session_id_ip_user_agent_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_daily_visits.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_daily_visits.sql.postgres
deleted file mode 100644
index bb22ec5335..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_daily_visits.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_daily_visits REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory.sql.postgres
deleted file mode 100644
index 947f8c5c0f..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_directory REPLICA IDENTITY USING INDEX user_directory_user_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory_search.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory_search.sql.postgres
deleted file mode 100644
index d421779944..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory_search.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_directory_search REPLICA IDENTITY USING INDEX user_directory_search_user_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory_stream_pos.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory_stream_pos.sql.postgres
deleted file mode 100644
index 59201750b0..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_directory_stream_pos.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_directory_stream_pos REPLICA IDENTITY USING INDEX user_directory_stream_pos_lock_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_external_ids.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_external_ids.sql.postgres
deleted file mode 100644
index 219ee16dde..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_external_ids.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_external_ids REPLICA IDENTITY USING INDEX user_external_ids_auth_provider_external_id_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_filters.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_filters.sql.postgres
deleted file mode 100644
index 5d3e0ae475..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_filters.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_filters REPLICA IDENTITY FULL; -- sadly the `CHECK` constraint is not enough here
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_ips.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_ips.sql.postgres
deleted file mode 100644
index 5a1d8770d0..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_ips.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_ips REPLICA IDENTITY USING INDEX user_ips_user_token_ip_unique_index;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_signature_stream.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_signature_stream.sql.postgres
deleted file mode 100644
index 8bc27df00a..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_signature_stream.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_signature_stream REPLICA IDENTITY USING INDEX user_signature_stream_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_threepid_id_server.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_threepid_id_server.sql.postgres
deleted file mode 100644
index a0ba8e6773..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_threepid_id_server.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_threepid_id_server REPLICA IDENTITY USING INDEX user_threepid_id_server_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_user_threepids.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_user_threepids.sql.postgres
deleted file mode 100644
index 9c70c9011e..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_user_threepids.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE user_threepids REPLICA IDENTITY USING INDEX medium_address;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_users.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_users.sql.postgres
deleted file mode 100644
index 725e6cdc76..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_users.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE users REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_users_in_public_rooms.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_users_in_public_rooms.sql.postgres
deleted file mode 100644
index 86988a5550..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_users_in_public_rooms.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE users_in_public_rooms REPLICA IDENTITY USING INDEX users_in_public_rooms_u_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_users_pending_deactivation.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_users_pending_deactivation.sql.postgres
deleted file mode 100644
index 7e72946d14..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_users_pending_deactivation.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE users_pending_deactivation REPLICA IDENTITY FULL;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_users_who_share_private_rooms.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_users_who_share_private_rooms.sql.postgres
deleted file mode 100644
index 6c7213920a..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_users_who_share_private_rooms.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE users_who_share_private_rooms REPLICA IDENTITY USING INDEX users_who_share_private_rooms_u_idx;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_worker_locks.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_worker_locks.sql.postgres
deleted file mode 100644
index 1bba45e05c..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_worker_locks.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE worker_locks REPLICA IDENTITY USING INDEX worker_locks_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_worker_read_write_locks.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_worker_read_write_locks.sql.postgres
deleted file mode 100644
index b9d35eb4f6..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_worker_read_write_locks.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE worker_read_write_locks REPLICA IDENTITY USING INDEX worker_read_write_locks_key;
diff --git a/synapse/storage/schema/main/delta/83/10_replica_identity_worker_read_write_locks_mode.sql.postgres b/synapse/storage/schema/main/delta/83/10_replica_identity_worker_read_write_locks_mode.sql.postgres
deleted file mode 100644
index 5871c98dee..0000000000
--- a/synapse/storage/schema/main/delta/83/10_replica_identity_worker_read_write_locks_mode.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE worker_read_write_locks_mode REPLICA IDENTITY USING INDEX worker_read_write_locks_mode_key;
diff --git a/synapse/storage/schema/state/delta/83/10_replica_identity_state_group_edges.sql.postgres b/synapse/storage/schema/state/delta/83/10_replica_identity_state_group_edges.sql.postgres
deleted file mode 100644
index aa8fc2514c..0000000000
--- a/synapse/storage/schema/state/delta/83/10_replica_identity_state_group_edges.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE state_group_edges REPLICA IDENTITY USING INDEX state_group_edges_unique_idx;
diff --git a/synapse/storage/schema/state/delta/83/10_replica_identity_state_groups_state.sql.postgres b/synapse/storage/schema/state/delta/83/10_replica_identity_state_groups_state.sql.postgres
deleted file mode 100644
index 4386031977..0000000000
--- a/synapse/storage/schema/state/delta/83/10_replica_identity_state_groups_state.sql.postgres
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE state_groups_state REPLICA IDENTITY FULL;