MM-56987: Improve cache API (#26298)
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 ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
75e32051c4
Коммит
f9861b8666
3
server/platform/services/cache/cache.go
поставляемый
3
server/platform/services/cache/cache.go
поставляемый
@@ -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
поставляемый
9
server/platform/services/cache/lru_test.go
поставляемый
@@ -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
поставляемый
18
server/platform/services/cache/provider_test.go
поставляемый
@@ -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)
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user