Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-29 12:16:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Skip handling of push actions for outlier events (#10780)

Browse Source 
Outlier events don't ever have push actions associated with them, so we
can skip some expensive queries during event persistence.
This commit is contained in:
Erik Johnston 2021-09-08 15:18:35 +01:00 committed by GitHub
parent 0288e6033b
commit 74f01e11c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/10780.misc Normal file
View File

@ -0,0 +1 @@
Minor speed ups when joining large rooms over federation.

21
synapse/storage/databases/main/events.py
View File

@ -1990,6 +1990,15 @@ class PersistEventsStore:
events_and_context.
"""
# Only non outlier events will have push actions associated with them,
# so let's filter them out. (This makes joining large rooms faster, as
# these queries took seconds to process all the state events).
non_outlier_events = [
event
for event, _ in events_and_contexts
if not event.internal_metadata.is_outlier()
]
sql = """
INSERT INTO event_push_actions (
room_id, event_id, user_id, actions, stream_ordering,
@ -2000,7 +2009,7 @@ class PersistEventsStore:
WHERE event_id = ?
"""
if events_and_contexts:
if non_outlier_events:
txn.execute_batch(
sql,
(
@ -2010,12 +2019,12 @@ class PersistEventsStore:
event.depth,
event.event_id,
)
for event, _ in events_and_contexts
for event in non_outlier_events
),
)
room_to_event_ids: Dict[str, List[str]] = {}
for e, _ in events_and_contexts:
for e in non_outlier_events:
room_to_event_ids.setdefault(e.room_id, []).append(e.event_id)
for room_id, event_ids in room_to_event_ids.items():
@ -2040,7 +2049,11 @@ class PersistEventsStore:
# persisted.
txn.execute_batch(
"DELETE FROM event_push_actions_staging WHERE event_id = ?",
((event.event_id,) for event, _ in all_events_and_contexts),
(
(event.event_id,)
for event, _ in all_events_and_contexts
if not event.internal_metadata.is_outlier()
),
)
def _remove_push_actions_for_event_id_txn(self, txn, room_id, event_id):

1
tests/storage/test_event_push_actions.py
View File

@ -69,6 +69,7 @@ class EventPushActionsStoreTestCase(HomeserverTestCase):
event.room_id = room_id
event.event_id = "$test:example.com"
event.internal_metadata.stream_ordering = stream
event.internal_metadata.is_outlier.return_value = False
event.depth = stream
self.get_success(