Merge pull request #115 from ZhengHe-MD/dev/zhenghe3119/remove-cache-…

…wrapper

cache: remove wrapper, add incr to redisext

cache/constants.go

@@ -43,9 +43,3 @@ func (c ConfigerType) String() string {
 }
 
 const DefaultRouteGroup = "default"
-
-// NOTE: 减小 key 所占空间
-const (
-	WrapperTypeCache    = "c"
-	WrapperTypeRedisExt = "e"
-)

cache/redis/instance.go

@@ -22,11 +22,10 @@ const (
 type InstanceConf struct {
 	Group     string
 	Namespace string
-	Wrapper   string
 }
 
 func (m *InstanceConf) String() string {
-	return fmt.Sprintf("group:%s namespace:%s wrapper:%s", m.Group, m.Namespace, m.Wrapper)
+	return fmt.Sprintf("group:%s namespace:%s", m.Group, m.Namespace)
 }
 
 func instanceConfFromString(s string) (conf *InstanceConf, err error) {
@@ -38,7 +37,6 @@ func instanceConfFromString(s string) (conf *InstanceConf, err error) {
 	conf = &InstanceConf{
 		Group:     items[0],
 		Namespace: items[1],
-		Wrapper:   items[2],
 	}
 	return conf, nil
 }
@@ -58,7 +56,6 @@ func (m *InstanceManager) buildKey(conf *InstanceConf) string {
 	return strings.Join([]string{
 		conf.Group,
 		conf.Namespace,
-		conf.Wrapper,
 	}, keySep)
 }
 
@@ -67,7 +64,7 @@ func (m *InstanceManager) add(key string, client *Client) {
 }
 
 func (m *InstanceManager) newInstance(ctx context.Context, conf *InstanceConf) (*Client, error) {
-	return NewClient(ctx, conf.Namespace, conf.Wrapper)
+	return NewClient(ctx, conf.Namespace)
 }
 
 func (m *InstanceManager) GetInstance(ctx context.Context, conf *InstanceConf) (*Client, error) {

cache/redis/redis.go

@@ -17,10 +17,9 @@ var RedisNil = fmt.Sprintf("redis: nil")
 type Client struct {
 	client    *redis.Client
 	namespace string
-	wrapper   string
 }
 
-func NewClient(ctx context.Context, namespace string, wrapper string) (*Client, error) {
+func NewClient(ctx context.Context, namespace string) (*Client, error) {
 	fun := "NewClient -->"
 
 	config, err := DefaultConfiger.GetConfig(ctx, namespace)
@@ -45,14 +44,12 @@ func NewClient(ctx context.Context, namespace string, wrapper string) (*Client,
 	return &Client{
 		client:    client,
 		namespace: namespace,
-		wrapper:   wrapper,
 	}, err
 }
 
 func (m *Client) fixKey(key string) string {
 	return strings.Join([]string{
 		m.namespace,
-		m.wrapper,
 		key,
 	}, ".")
 }

cache/redisext/redisext.go

@@ -54,7 +54,7 @@ func fromRedisZSlice(rzs []redis2.Z) (zs []Z) {
 }
 
 type ZRangeBy struct {
-	Min, Max string
+	Min, Max      string
 	Offset, Count int64
 }
 
@@ -83,7 +83,6 @@ func (m *RedisExt) getInstanceConf(ctx context.Context) *redis.InstanceConf {
 	return &redis.InstanceConf{
 		Group:     scontext.GetControlRouteGroupWithDefault(ctx, cache.DefaultRouteGroup),
 		Namespace: m.namespace,
-		Wrapper:   cache.WrapperTypeRedisExt,
 	}
 }
 
@@ -103,6 +102,14 @@ func (m *RedisExt) Set(ctx context.Context, key string, val interface{}, exp tim
 	return
 }
 
+func (m *RedisExt) Incr(ctx context.Context, key string, val interface{}) (n int64, err error) {
+	client, err := m.getRedisInstance(ctx)
+	if err == nil {
+		n, err = client.Incr(ctx, m.prefixKey(key)).Result()
+	}
+	return
+}
+
 func (m *RedisExt) SetNX(ctx context.Context, key string, val interface{}, exp time.Duration) (b bool, err error) {
 	client, err := m.getRedisInstance(ctx)
 	if err == nil {

cache/redisext/redisext_test.go

@@ -2,7 +2,6 @@ package redisext
 
 import (
 	"context"
-	"github.com/shawnfeng/sutil/cache"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
@@ -16,7 +15,6 @@ func TestRedisExt_ZAdd(t *testing.T) {
 	ctx := context.Background()
 
 	re := NewRedisExt("base/report", "test")
-	_ = SetConfiger(ctx, cache.ConfigerTypeApollo)
 
 	members := []Z{
 		{1, "one"},
@@ -40,7 +38,6 @@ func TestRedisExt_ZRange(t *testing.T) {
 	ctx := context.Background()
 
 	re := NewRedisExt("base/report", "test")
-	_ = SetConfiger(ctx, cache.ConfigerTypeApollo)
 
 	// prepare
 	members := []Z{
@@ -83,7 +80,6 @@ func TestRedisExt_ZRange(t *testing.T) {
 func TestRedisExt_ZRank(t *testing.T) {
 	ctx := context.Background()
 	re := NewRedisExt("base/report", "test")
-	_ = SetConfiger(ctx, cache.ConfigerTypeApollo)
 
 	// prepare
 	members := []Z{
@@ -122,7 +118,6 @@ func TestRedisExt_ZRank(t *testing.T) {
 func TestRedisExt_ZCount(t *testing.T) {
 	ctx := context.Background()
 	re := NewRedisExt("base/report", "test")
-	_ = SetConfiger(ctx, cache.ConfigerTypeApollo)
 
 	// prepare
 	members := []Z{
@@ -149,7 +144,6 @@ func TestRedisExt_ZCount(t *testing.T) {
 func TestRedisExt_ZScore(t *testing.T) {
 	ctx := context.Background()
 	re := NewRedisExt("base/report", "test")
-	_ = SetConfiger(ctx, cache.ConfigerTypeApollo)
 
 	// prepare
 	members := []Z{
@@ -184,7 +178,6 @@ func TestRedisExt_ZScore(t *testing.T) {
 func TestRedisExt_Expire(t *testing.T) {
 	ctx := context.Background()
 	re := NewRedisExt("base/report", "test")
-	_ = SetConfiger(ctx, cache.ConfigerTypeApollo)
 
 	// prepare
 	members := []Z{

cache/value/value.go

@@ -44,7 +44,6 @@ func (m *Cache) getInstanceConf(ctx context.Context) *redis.InstanceConf {
 	return &redis.InstanceConf{
 		Group:     scontext.GetControlRouteGroupWithDefault(ctx, cache.DefaultRouteGroup),
 		Namespace: m.namespace,
-		Wrapper:   cache.WrapperTypeCache,
 	}
 }
 

cache/value/value_test.go

@@ -2,7 +2,6 @@ package value
 
 import (
 	"context"
-	"github.com/shawnfeng/sutil/cache"
 	"github.com/shawnfeng/sutil/trace"
 
 	//"fmt"
@@ -15,7 +14,7 @@ type Test struct {
 	Id int64
 }
 
-func load(key interface{}) (value interface{}, err error) {
+func load(ctx context.Context, key interface{}) (value interface{}, err error) {
 
 	//return nil, fmt.Errorf("not found")
 	return &Test{
@@ -28,7 +27,6 @@ func TestGet(t *testing.T) {
 	_ = trace.InitDefaultTracer("cache.test")
 
 	c := NewCache("base/report", "test", 60*time.Second, load)
-	_ = SetConfiger(ctx, cache.ConfigerTypeApollo)
 	WatchUpdate(ctx)
 
 	var test Test