go/sliding-sync
go/sliding-sync
1
0
Fork 0
mirror of https://github.com/matrix-org/sliding-sync.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

If no required_state is sent; don't pull out all room state

Browse Source
This commit is contained in:
Kegan Dougal 2023-01-13 19:12:36 +00:00
parent f6de179c0a
commit fbc49564c9
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/required_state_map.go
View File

@ -62,6 +62,13 @@ func (rsm *RequiredStateMap) Include(evType, stateKey string) bool {
return false return false
} }
func (rsm *RequiredStateMap) Empty() bool {
return !rsm.allState && !rsm.lazyLoading &&
len(rsm.eventTypeToStateKeys) == 0 &&
len(rsm.stateKeysForWildcardEventType) == 0 &&
len(rsm.eventTypesWithWildcardStateKeys) == 0
}
// work out what to ask the storage layer: if we have wildcard event types we need to pull all // work out what to ask the storage layer: if we have wildcard event types we need to pull all
// room state and cannot only pull out certain event types. If we have wildcard state keys we // room state and cannot only pull out certain event types. If we have wildcard state keys we
// need to use an empty list for state keys. // need to use an empty list for state keys.

3
sync3/caches/global.go
View File

@ -140,6 +140,9 @@ func (c *GlobalCache) LoadRoomState(ctx context.Context, roomIDs []string, loadP
if c.store == nil { if c.store == nil {
return nil return nil
} }
if requiredStateMap.Empty() {
return nil
}
resultMap := make(map[string][]json.RawMessage, len(roomIDs)) resultMap := make(map[string][]json.RawMessage, len(roomIDs))
roomIDToStateEvents, err := c.store.RoomStateAfterEventPosition(ctx, roomIDs, loadPosition, requiredStateMap.QueryStateMap()) roomIDToStateEvents, err := c.store.RoomStateAfterEventPosition(ctx, roomIDs, loadPosition, requiredStateMap.QueryStateMap())
if err != nil { if err != nil {

7
sync3/handler/connstate.go
View File

@ -405,7 +405,9 @@ func (s *ConnState) getInitialRoomData(ctx context.Context, roomSub sync3.RoomSu
} }
rsm := roomSub.RequiredStateMap(s.userID) rsm := roomSub.RequiredStateMap(s.userID)
roomIDToState := s.globalCache.LoadRoomState(ctx, roomIDs, s.loadPosition, rsm, roomToUsersInTimeline) roomIDToState := s.globalCache.LoadRoomState(ctx, roomIDs, s.loadPosition, rsm, roomToUsersInTimeline)
if roomIDToState == nil { // e.g no required_state
roomIDToState = make(map[string][]json.RawMessage)
}
for _, roomID := range roomIDs { for _, roomID := range roomIDs {
userRoomData, ok := roomIDToUserRoomData[roomID] userRoomData, ok := roomIDToUserRoomData[roomID]
if !ok { if !ok {
@ -423,6 +425,9 @@ func (s *ConnState) getInitialRoomData(ctx context.Context, roomSub sync3.RoomSu
var requiredState []json.RawMessage var requiredState []json.RawMessage
if !userRoomData.IsInvite { if !userRoomData.IsInvite {
requiredState = roomIDToState[roomID] requiredState = roomIDToState[roomID]
if requiredState == nil {
requiredState = make([]json.RawMessage, 0)
}
} }
prevBatch, _ := userRoomData.PrevBatch() prevBatch, _ := userRoomData.PrevBatch()
rooms[roomID] = sync3.Room{ rooms[roomID] = sync3.Room{