mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-26 11:36:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add sanity checks and fix wrong variable usage

Browse source
This commit is contained in:
Eric Eastwood 2024-08-20 17:24:43 -05:00
parent 45c89ec625
commit 3eb77c3a2a
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
synapse/storage/controllers/persist_events.py
View file

@ -847,12 +847,19 @@ class EventsPersistenceStorageController:
missing_membership_event_ids
)
)
# There shouldn't be any missing events
assert (
remaining_event_id_to_sender_map.keys()
== missing_membership_event_ids
), missing_membership_event_ids.difference(
remaining_event_id_to_sender_map.keys()
)
event_id_to_sender_map.update(remaining_event_id_to_sender_map)
membership_infos_to_insert_membership_snapshots = [
{
"user_id": user_id,
"sender": event_id_to_sender_map[event_id],
"sender": event_id_to_sender_map[membership_event_id],
"membership_event_id": membership_event_id,
}
for membership_event_id, user_id in membership_event_id_to_user_id_map.items()
@ -943,7 +950,7 @@ class EventsPersistenceStorageController:
if event:
current_state_map[state_key] = event
else:
missing_event_ids.add(membership_event_id)
missing_event_ids.add(event_id)
# Otherwise, we need to find a couple events that we were reset to.
if missing_event_ids:
@ -951,7 +958,9 @@ class EventsPersistenceStorageController:
current_state_ids_map.values()
)
# There shouldn't be any missing events
assert remaining_events.keys() == missing_event_ids
assert (
remaining_events.keys() == missing_event_ids
), missing_event_ids.difference(remaining_events.keys())
for event in remaining_events.values():
current_state_map[(event.type, event.state_key)] = event

3
synapse/storage/databases/main/events.py
View file

@ -1250,6 +1250,9 @@ class PersistEventsStore:
to_delete = delta_state.to_delete
to_insert = delta_state.to_insert
# Sanity check we're processing the same thing
assert room_id == sliding_sync_table_changes.room_id
# Figure out the changes of membership to invalidate the
# `get_rooms_for_user` cache.
# We find out which membership events we may have deleted