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

Closer types

Browse source
This commit is contained in:
Eric Eastwood 2024-08-20 11:55:24 -05:00
parent 6cc6bdbedf
commit 95d39db772
2 changed files with 57 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,8 @@ from synapse.storage.databases.main.events import (
DeltaState,
SlidingSyncTableChanges,
SlidingSyncStateInsertValues,
SlidingSyncSnapshotInsertValues,
SlidingSyncMembershipSnapshotSharedInsertValues,
SlidingSyncMembershipInfo,
)
from synapse.storage.databases.main.events_worker import EventRedactBehaviour
from synapse.storage.databases.main.events import (
@ -781,20 +782,31 @@ class EventsPersistenceStorageController:
to_delete = delta_state.to_delete
# This would only happen if someone was state reset out of the room
to_delete_membership_snapshots = {
(room_id, state_key)
to_delete_membership_snapshots = [
state_key
for event_type, state_key in to_delete
if event_type == EventTypes.Member and self.is_mine_id(state_key)
}
]
membership_snapshot_updates = {}
membership_infos: List[SlidingSyncMembershipInfo] = []
if to_insert:
membership_event_id_to_user_id_map: Dict[str, str] = {}
for state_key, event_id in to_insert.items():
if state_key[0] == EventTypes.Member and self.is_mine_id(state_key[1]):
membership_event_id_to_user_id_map[event_id] = state_key[1]
if len(membership_event_id_to_user_id_map) > 0:
event_id_to_sender_map = await _get_sender_for_event_ids(membership_event_id_to_user_id_map.keys())
membership_infos = [
SlidingSyncMembershipInfo(
user_id=user_id,
sender=event_id_to_sender_map[event_id],
membership_event_id=membership_event_id
)
for membership_event_id, user_id in membership_event_id_to_user_id_map.items()
]
if membership_infos:
current_state_ids_map = (
await self.main_store.get_partial_filtered_current_state_ids(
room_id,
@ -825,16 +837,16 @@ class EventsPersistenceStorageController:
current_state_map[key] = event
# Map of values to insert/update in the `sliding_sync_membership_snapshots` table
sliding_sync_insert_values = None
membership_snapshot_shared_insert_values = SlidingSyncMembershipSnapshotSharedInsertValues()
has_known_state = False
if current_state_map:
sliding_sync_insert_values = (
state_insert_values = (
self._get_sliding_sync_insert_values_from_state_map(
current_state_map
)
)
# We have current state to work from
has_known_state = True
membership_snapshot_shared_insert_values.has_known_state = True
else:
# We don't have any `current_state_events` anymore (previously
# cleared out because of `no_longer_in_room`). This can happen if
@ -861,9 +873,13 @@ class EventsPersistenceStorageController:
}
return SlidingSyncTableChanges(
room_id=room_id,
# For `sliding_sync_joined_rooms`
joined_room_updates=TODO,
to_delete_joined_rooms=TODO,
membership_snapshot_updates=membership_snapshot_updates,
# For `sliding_sync_membership_snapshots`
membership_snapshot_shared_insert_values=TODO,
to_insert_membership_snapshots=membership_infos,
to_delete_membership_snapshots=to_delete_membership_snapshots,
)

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

@ -127,29 +127,48 @@ class DeltaState:
@attr.s(slots=True, auto_attribs=True)
class SlidingSyncStateInsertValues:
"""
Insert values relevant for the `sliding_sync_joined_rooms` and
`sliding_sync_membership_snapshots` database tables.
"""
room_type: Optional[str]
is_encrypted: Optional[bool]
room_name: Optional[str]
@attr.s(slots=True, auto_attribs=True)
class SlidingSyncSnapshotInsertValues(SlidingSyncStateInsertValues):
membership_event_id: str
has_known_state: Optional[bool]
# TODO: `sender`
class SlidingSyncMembershipSnapshotSharedInsertValues(SlidingSyncStateInsertValues):
"""
Insert values for `sliding_sync_membership_snapshots` that we can share across
multiple memberships
"""
has_known_state: bool
# TODO: tombstone_successor_room_id: Optional[str]
@attr.s(slots=True, auto_attribs=True)
class SlidingSyncMembershipInfo(SlidingSyncStateInsertValues):
"""
Values unique to each membership
"""
user_id: str
sender: str
membership_event_id: str
@attr.s(slots=True, auto_attribs=True)
class SlidingSyncTableChanges:
room_id: str
# room_id -> dict to upsert into `sliding_sync_joined_rooms`
joined_room_updates: Dict[str, SlidingSyncStateInsertValues]
# room_ids to delete from `sliding_sync_joined_rooms`
to_delete_joined_rooms: StrCollection
# (room_id, user_id) -> dict to upsert into sliding_sync_membership_snapshots
membership_snapshot_updates: Dict[Tuple[str, str], SlidingSyncSnapshotInsertValues]
# List of (room_id, user_id) to delete from `sliding_sync_membership_snapshots`
to_delete_membership_snapshots: Set[Tuple[str, str]]
# Shared values to upsert into `sliding_sync_membership_snapshots` for each
# `to_insert_membership_snapshots`
membership_snapshot_shared_insert_values: SlidingSyncMembershipSnapshotSharedInsertValues
# List of membership to insert into `sliding_sync_membership_snapshots`
to_insert_membership_snapshots: List[SlidingSyncMembershipInfo]
# List of user_id to delete from `sliding_sync_membership_snapshots`
to_delete_membership_snapshots: List[str]
@attr.s(slots=True, auto_attribs=True)
@ -1251,10 +1270,12 @@ class PersistEventsStore:
if sliding_sync_table_changes.membership_snapshot_updates:
# TODO
[
getattr(x, attr_name)
for asdf in sliding_sync_table_changes.membership_snapshot_updates:
for attr_name in ["room_type", "is_encrypted", "room_name"]
]
[
getattr(x, attr_name)
]
# Update the `sliding_sync_membership_snapshots` table
#