backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-18 08:11:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MSC3575: make known rooms global per connection rather than per list

Browse source
This commit is contained in:
Lambda 2025-08-10 19:00:34 +00:00
parent a72ff4f6e6
commit b4f6c88e57
2 changed files with 9 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/api/client_server/sync/msc3575.rs
View file

@ -39,16 +39,15 @@ impl TodoRoom {
&mut self, &mut self,
required_state: Vec<(StateEventType, String)>, required_state: Vec<(StateEventType, String)>,
timeline_limit: UInt, timeline_limit: UInt,
known_rooms: Option<&BTreeMap<OwnedRoomId, u64>>, known_rooms: &BTreeMap<OwnedRoomId, u64>,
room_id: &RoomId, room_id: &RoomId,
) { ) {
self.required_state_request.extend(required_state); self.required_state_request.extend(required_state);
self.timeline_limit = self.timeline_limit =
self.timeline_limit.max(u64::from(timeline_limit).min(100)); self.timeline_limit.max(u64::from(timeline_limit).min(100));
// 0 means unknown because it got out of date // 0 means unknown because it got out of date
self.roomsince = self.roomsince.min( self.roomsince =
known_rooms.and_then(|k| k.get(room_id)).copied().unwrap_or(0), self.roomsince.min(known_rooms.get(room_id).copied().unwrap_or(0));
);
} }
} }
impl Default for TodoRoom { impl Default for TodoRoom {
@ -362,7 +361,7 @@ pub(crate) async fn sync_events_v4_route(
todo_rooms.entry(room_id.clone()).or_default().update( todo_rooms.entry(room_id.clone()).or_default().update(
list.room_details.required_state.clone(), list.room_details.required_state.clone(),
list.room_details.timeline_limit.unwrap_or(uint!(10)), list.room_details.timeline_limit.unwrap_or(uint!(10)),
known_rooms.get(&list_id), &known_rooms,
room_id, room_id,
); );
} }
@ -375,16 +374,8 @@ pub(crate) async fn sync_events_v4_route(
.unwrap_or(UInt::MAX), .unwrap_or(UInt::MAX),
}, },
); );
services().users.update_sync_known_rooms(
connection_key.clone(),
list_id,
list_room_ids,
globalsince,
);
} }
let mut known_subscription_rooms = BTreeSet::new();
for (room_id, room) in &body.room_subscriptions { for (room_id, room) in &body.room_subscriptions {
if !services().rooms.metadata.exists(room_id)? { if !services().rooms.metadata.exists(room_id)? {
continue; continue;
@ -392,20 +383,14 @@ pub(crate) async fn sync_events_v4_route(
todo_rooms.entry(room_id.clone()).or_default().update( todo_rooms.entry(room_id.clone()).or_default().update(
room.required_state.clone(), room.required_state.clone(),
room.timeline_limit.unwrap_or(uint!(10)), room.timeline_limit.unwrap_or(uint!(10)),
known_rooms.get("subscriptions"), &known_rooms,
room_id, room_id,
); );
known_subscription_rooms.insert(room_id.clone());
}
for r in body.unsubscribe_rooms {
known_subscription_rooms.remove(&r);
} }
services().users.update_sync_known_rooms( services().users.update_sync_known_rooms(
connection_key.clone(), connection_key.clone(),
"subscriptions".to_owned(), todo_rooms.keys().cloned().collect(),
known_subscription_rooms,
globalsince, globalsince,
); );

15
src/service/users.rs
View file

@ -21,7 +21,7 @@ pub(crate) use data::Data;
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub(crate) struct SlidingSyncCache { pub(crate) struct SlidingSyncCache {
known_rooms: BTreeMap<String, BTreeMap<OwnedRoomId, u64>>, known_rooms: BTreeMap<OwnedRoomId, u64>,
} }
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
@ -69,7 +69,7 @@ impl Service {
pub(crate) fn get_rooms_in_connection( pub(crate) fn get_rooms_in_connection(
&self, &self,
connection_key: ConnectionKey, connection_key: ConnectionKey,
) -> BTreeMap<String, BTreeMap<OwnedRoomId, u64>> { ) -> BTreeMap<OwnedRoomId, u64> {
let cached = self.get_cache_entry(connection_key); let cached = self.get_cache_entry(connection_key);
let cached = cached.lock().unwrap(); let cached = cached.lock().unwrap();
@ -79,23 +79,14 @@ impl Service {
pub(crate) fn update_sync_known_rooms( pub(crate) fn update_sync_known_rooms(
&self, &self,
connection_key: ConnectionKey, connection_key: ConnectionKey,
list_id: String,
new_cached_rooms: BTreeSet<OwnedRoomId>, new_cached_rooms: BTreeSet<OwnedRoomId>,
globalsince: u64, globalsince: u64,
) { ) {
let cached = self.get_cache_entry(connection_key); let cached = self.get_cache_entry(connection_key);
let mut cached = cached.lock().unwrap(); let mut cached = cached.lock().unwrap();
for (roomid, lastsince) in
cached.known_rooms.entry(list_id.clone()).or_default().iter_mut()
{
if !new_cached_rooms.contains(roomid) {
*lastsince = 0;
}
}
let list = cached.known_rooms.entry(list_id).or_default();
for roomid in new_cached_rooms { for roomid in new_cached_rooms {
list.insert(roomid, globalsince); cached.known_rooms.insert(roomid, globalsince);
} }
} }