Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Add DB indices to speed up purging rooms (#16457)
Browse files Browse the repository at this point in the history
  • Loading branch information
David Robertson authored Oct 10, 2023
1 parent 8902b30 commit 28fd28e
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelog.d/16457.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improve the performance of purging rooms, particularly encrypted rooms.
7 changes: 7 additions & 0 deletions synapse/storage/databases/main/account_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ def __init__(
"AccountDataAndTagsChangeCache", account_max
)

self.db_pool.updates.register_background_index_update(
update_name="room_account_data_index_room_id",
index_name="room_account_data_room_id",
table="room_account_data",
columns=("room_id",),
)

self.db_pool.updates.register_background_update_handler(
"delete_account_data_for_deactivated_users",
self._delete_account_data_for_deactivated_users,
Expand Down
7 changes: 7 additions & 0 deletions synapse/storage/databases/main/e2e_room_keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ def __init__(
):
super().__init__(database, db_conn, hs)

self.db_pool.updates.register_background_index_update(
update_name="e2e_room_keys_index_room_id",
index_name="e2e_room_keys_room_id",
table="e2e_room_keys",
columns=("room_id",),
)

self.db_pool.updates.register_background_update_handler(
"delete_e2e_backup_keys_for_deactivated_users",
self._delete_e2e_backup_keys_for_deactivated_users,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* Copyright 2023 The Matrix.org Foundation C.I.C
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

INSERT INTO background_updates (ordering, update_name, progress_json) VALUES
(8204, 'e2e_room_keys_index_room_id', '{}');

INSERT INTO background_updates (ordering, update_name, progress_json) VALUES
(8204, 'room_account_data_index_room_id', '{}');

0 comments on commit 28fd28e

Please sign in to comment.