mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename methods

Browse source
This commit is contained in:
Till Faelligen 2022-04-12 14:07:02 +02:00
parent 032aeb8b98
commit f0ccdeb109
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/caching/cache_lazy_load_members.go
View file

@ -3,8 +3,6 @@ package caching
import ( import (
"fmt" "fmt"
"time" "time"
"github.com/matrix-org/gomatrixserverlib"
) )
const ( const (
@ -34,16 +32,13 @@ func NewLazyLoadCache() (*LazyLoadCache, error) {
return &LazyLoadCache{cache}, err return &LazyLoadCache{cache}, err
} }
func (c *LazyLoadCache) StoreLazyLoadedMembers(reqUser, deviceID, roomID, userID string, event *gomatrixserverlib.HeaderedEvent) { func (c *LazyLoadCache) StoreLazyLoadedUser(reqUser, deviceID, roomID, userID string) {
cacheKey := fmt.Sprintf("%s/%s/%s/%s", reqUser, deviceID, roomID, userID) cacheKey := fmt.Sprintf("%s/%s/%s/%s", reqUser, deviceID, roomID, userID)
c.Set(cacheKey, event) c.Set(cacheKey, true)
} }
func (c *LazyLoadCache) GetLazyLoadedMembers(reqUser, deviceID, roomID, userID string) (*gomatrixserverlib.HeaderedEvent, bool) { func (c *LazyLoadCache) IsLazyLoadedUserCached(reqUser, deviceID, roomID, userID string) bool {
cacheKey := fmt.Sprintf("%s/%s/%s/%s", reqUser, deviceID, roomID, userID) cacheKey := fmt.Sprintf("%s/%s/%s/%s", reqUser, deviceID, roomID, userID)
val, ok := c.Get(cacheKey) _, ok := c.Get(cacheKey)
if !ok { return ok
return nil, ok
}
return val.(*gomatrixserverlib.HeaderedEvent), ok
} }

6
syncapi/streams/stream_pdu.go
View file

@ -459,7 +459,7 @@ func (p *PDUStreamProvider) lazyLoadMembers(
continue continue
} }
// membership is not yet cached, add it to the list // membership is not yet cached, add it to the list
if _, ok := cache.GetLazyLoadedMembers(device.UserID, device.ID, roomID, event.Sender()); !ok { if !cache.IsLazyLoadedUserCached(device.UserID, device.ID, roomID, event.Sender()) {
timelineUsers[event.Sender()] = struct{}{} timelineUsers[event.Sender()] = struct{}{}
} }
} }
@ -471,7 +471,7 @@ func (p *PDUStreamProvider) lazyLoadMembers(
if _, ok := timelineUsers[event.Sender()]; ok { if _, ok := timelineUsers[event.Sender()]; ok {
newStateEvents = append(newStateEvents, event) newStateEvents = append(newStateEvents, event)
if !stateFilter.IncludeRedundantMembers { if !stateFilter.IncludeRedundantMembers {
cache.StoreLazyLoadedMembers(device.UserID, device.ID, roomID, event.Sender(), event) cache.StoreLazyLoadedUser(device.UserID, device.ID, roomID, event.Sender())
} }
delete(timelineUsers, event.Sender()) delete(timelineUsers, event.Sender())
} }
@ -495,7 +495,7 @@ func (p *PDUStreamProvider) lazyLoadMembers(
} }
// cache the membership events // cache the membership events
for _, membership := range memberships { for _, membership := range memberships {
cache.StoreLazyLoadedMembers(device.UserID, device.ID, roomID, membership.Sender(), membership) cache.StoreLazyLoadedUser(device.UserID, device.ID, roomID, membership.Sender())
} }
stateEvents = append(newStateEvents, memberships...) stateEvents = append(newStateEvents, memberships...)
return stateEvents, nil return stateEvents, nil