cache list key

Author: yumaojun03

cache/cache.go

@@ -3,6 +3,8 @@ package cache
 import (
 	"context"
 	"time"
+
+	"github.com/infraboard/mcube/http/request"
 )
 
 var (
@@ -24,7 +26,7 @@ func SetGlobal(c Cache) {
 
 // Cache provides the interface for cache implementations.
 type Cache interface {
-	Keys(pattern string) []string
+	ListKey(*ListKeyRequest) (*ListKeyResponse, error)
 	// SetTTL set default ttl
 	SetDefaultTTL(ttl time.Duration)
 	// set cached value with key and expire time.
@@ -48,3 +50,36 @@ type Cache interface {
 	// 携带上下文
 	WithContext(ctx context.Context) Cache
 }
+
+// NewListKeyRequest todo
+func NewListKeyRequest(pattern string, ps uint, pn uint) *ListKeyRequest {
+	return &ListKeyRequest{
+		pattern:     pattern,
+		PageRequest: request.NewPageRequest(ps, pn),
+	}
+}
+
+// ListKeyRequest todo
+type ListKeyRequest struct {
+	pattern string
+	*request.PageRequest
+}
+
+// Pattern tood
+func (req *ListKeyRequest) Pattern() string {
+	return req.pattern
+}
+
+// NewListKeyResponse todo
+func NewListKeyResponse(keys []string, total uint64) *ListKeyResponse {
+	return &ListKeyResponse{
+		Keys:  keys,
+		Total: total,
+	}
+}
+
+// ListKeyResponse todo
+type ListKeyResponse struct {
+	Keys  []string
+	Total uint64
+}

cache/memory/gocache.go

@@ -103,16 +103,16 @@ func (c *Cache) Close() error {
 	return nil
 }
 
-// Keys todo
-func (c *Cache) Keys(pattern string) []string {
+// ListKey todo
+func (c *Cache) ListKey(req *cache.ListKeyRequest) (*cache.ListKeyResponse, error) {
 	ks := []string{}
 	for _, k := range c.gc.Keys(true) {
 		if v, ok := k.(string); ok {
 			ks = append(ks, v)
 		}
 	}
 
-	return ks
+	return cache.NewListKeyResponse(ks, uint64(len(ks))), nil
 }
 
 // WithContext 携带上下文

cache/memory/gocache_test.go

@@ -79,8 +79,9 @@ func testKeysOK(a *adapterSuit) func(t *testing.T) {
 	return func(t *testing.T) {
 		should := require.New(t)
 
-		ks := a.adapter.Keys("*")
-		should.Equal([]string{a.testKey}, ks)
+		ks, err := a.adapter.ListKey(cache.NewListKeyRequest("*", 10, 1))
+		should.NoError(err)
+		should.Equal([]string{a.testKey}, ks.Keys)
 	}
 }
 

cache/redis/redis.go

@@ -3,6 +3,7 @@ package redis
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/go-redis/redis"
@@ -101,9 +102,14 @@ func (c *Cache) ClearAll() error {
 	return c.client.FlushDB().Err()
 }
 
-// Keys todo
-func (c *Cache) Keys(pattern string) []string {
-	return c.client.Keys(pattern).Val()
+// ListKey todo
+func (c *Cache) ListKey(req *cache.ListKeyRequest) (*cache.ListKeyResponse, error) {
+	fmt.Println(uint64(req.Offset()), req.Pattern(), int64(req.PageSize))
+	ks, total, err := c.client.Scan(uint64(req.Offset()), req.Pattern(), int64(req.PageSize)).Result()
+	if err != nil {
+		return nil, err
+	}
+	return cache.NewListKeyResponse(ks, total), nil
 }
 
 // Decr todo

cache/redis/redis_test.go

@@ -100,7 +100,8 @@ func testKeysOK(a *adapterSuit) func(t *testing.T) {
 	return func(t *testing.T) {
 		should := require.New(t)
 
-		ks := a.adapter.Keys("testkey*")
-		should.Equal([]string{a.testKey}, ks)
+		ks, err := a.adapter.ListKey(cache.NewListKeyRequest("testkey*", 3, 1))
+		should.NoError(err)
+		should.Equal([]string{a.testKey}, ks.Keys)
 	}
 }