IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-56987: Improve cache API (#26298)

Browse Source 
This is in preparation to make the codebase
ready to use Redis. In Redis, iterating all
the keys at once is an expensive operation.
It is recommended to work on batches of keys.

Remove the Len method as it was unused.

I tried to repurpose the Keys method to iterate
on keys rather than returning all keys at once, but
it has other complicacies because the code calls
other cache functions on those keys, so to handle
the LRU cache properly, it becomes slightly more
painful.

For now, we keep it like this and rather collect
all keys from Redis and then return.

https://mattermost.atlassian.net/browse/MM-56987

```release-note
NONE
```
This commit is contained in:
Agniva De Sarker 2024-03-01 09:46:09 +05:30 committed by GitHub
parent 75e32051c4
commit f9861b8666
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/channels/app/platform/session.go
View File

@ -45,13 +45,6 @@ func (ps *PlatformService) AddSessionToCache(session *model.Session) {
ps.sessionCache.SetWithExpiry(session.Token, session, time.Duration(int64(*ps.Config().ServiceSettings.SessionCacheInMinutes))*time.Minute)
}
func (ps *PlatformService) SessionCacheLength() int {
if l, err := ps.sessionCache.Len(); err == nil {
return l
}
return 0
}
func (ps *PlatformService) ClearUserSessionCacheLocal(userID string) {
if keys, err := ps.sessionCache.Keys(); err == nil {
var session *model.Session

8
server/channels/store/localcachelayer/terms_of_service_layer.go
View File

@ -47,11 +47,9 @@ func (s LocalCacheTermsOfServiceStore) Save(termsOfService *model.TermsOfService
func (s LocalCacheTermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfService, error) {
if allowFromCache {
if l, err := s.rootStore.termsOfServiceCache.Len(); err == nil && l != 0 {
var cacheItem *model.TermsOfService
if err := s.rootStore.doStandardReadCache(s.rootStore.termsOfServiceCache, LatestKey, &cacheItem); err == nil {
return cacheItem, nil
}
var cacheItem *model.TermsOfService
if err := s.rootStore.doStandardReadCache(s.rootStore.termsOfServiceCache, LatestKey, &cacheItem); err == nil {
return cacheItem, nil
}
}

3
server/platform/services/cache/cache.go vendored
View File

@ -40,9 +40,6 @@ type Cache interface {
// Keys returns a slice of the keys in the cache.
Keys() ([]string, error)
// Len returns the number of items in the cache.
Len() (int, error)
// GetInvalidateClusterEvent returns the cluster event configured when this cache was created.
GetInvalidateClusterEvent() model.ClusterEvent

9
server/platform/services/cache/lru_test.go vendored
View File

@ -26,8 +26,10 @@ func TestLRU(t *testing.T) {
err := l.Set(fmt.Sprintf("%d", i), i)
require.NoError(t, err)
}
size, err := l.Len()
require.NoError(t, err)
lru, ok := l.(*LRU)
require.True(t, ok)
size := lru.len
require.Equalf(t, size, 128, "bad len: %v", size)
keys, err := l.Keys()
@ -69,8 +71,7 @@ func TestLRU(t *testing.T) {
}
l.Purge()
size, err = l.Len()
require.NoError(t, err)
size = lru.len
require.Equalf(t, size, 0, "bad len: %v", size)
err = l.Get("200", &v)
require.Equal(t, err, ErrKeyNotFound, "should contain nothing")

18
server/platform/services/cache/provider_test.go vendored
View File

@ -28,9 +28,6 @@ func TestNewCache(t *testing.T) {
require.NoError(t, err)
err = c.Set("key3", "val3")
require.NoError(t, err)
l, err := c.Len()
require.NoError(t, err)
require.Equal(t, size, l)
})
t.Run("with only size option given", func(t *testing.T) {
@ -48,9 +45,6 @@ func TestNewCache(t *testing.T) {
require.NoError(t, err)
err = c.Set("key3", "val3")
require.NoError(t, err)
l, err := c.Len()
require.NoError(t, err)
require.Equal(t, size, l)
})
t.Run("with all options specified", func(t *testing.T) {
@ -75,9 +69,6 @@ func TestNewCache(t *testing.T) {
require.NoError(t, err)
err = c.SetWithDefaultExpiry("key3", "val3")
require.NoError(t, err)
l, err := c.Len()
require.NoError(t, err)
require.Equal(t, size, l)
time.Sleep(expiry + 1*time.Second)
@ -109,9 +100,6 @@ func TestNewCache_Striped(t *testing.T) {
require.NoError(t, err)
err = c.Set("key3", "val3")
require.NoError(t, err)
l, err := c.Len()
require.NoError(t, err)
require.Equal(t, size+1, l) // +10% from striping
})
t.Run("with only size option given", func(t *testing.T) {
@ -131,9 +119,6 @@ func TestNewCache_Striped(t *testing.T) {
require.NoError(t, err)
err = c.Set("key3", "val3")
require.NoError(t, err)
l, err := c.Len()
require.NoError(t, err)
require.Equal(t, size+1, l) // +10% rounded up from striped lru
})
t.Run("with all options specified", func(t *testing.T) {
@ -160,9 +145,6 @@ func TestNewCache_Striped(t *testing.T) {
require.NoError(t, err)
err = c.SetWithDefaultExpiry("key3", "val3")
require.NoError(t, err)
l, err := c.Len()
require.NoError(t, err)
require.Equal(t, size+1, l) // +10% from striping
time.Sleep(expiry + 1*time.Second)