fixup lint

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
Replace RedisCluster to RedisUniversalClient (#114 )
2024-12-15 22:09:59 +03:00 · 2024-10-04 00:20:23 +03:00 · 2023-12-12 13:53:00 +03:00 · 2023-12-12 13:52:37 +03:00 · 2023-10-21 00:58:08 +03:00 · 2023-10-21 00:57:12 +03:00
5 changed files with 183 additions and 489 deletions
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,10 @@
-module go.unistack.org/micro-store-redis/v3
+module go.unistack.org/micro-store-redis/v4

 go 1.20

 require (
 	github.com/redis/go-redis/v9 v9.2.1
-	go.unistack.org/micro/v3 v3.10.62
+	go.unistack.org/micro/v4 v4.0.7
 )

 require (
--- a/go.sum
+++ b/go.sum
@@ -8,5 +8,5 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
 github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
-go.unistack.org/micro/v3 v3.10.62 h1:PCwLSt3W53UGosH/5qU3kU0iJxK8jlKOm9p4v/Zti5o=
-go.unistack.org/micro/v3 v3.10.62/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
+go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
--- a/options.go
+++ b/options.go
@@ -2,17 +2,11 @@ package redis

 import (
 	"github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/store"
+	"go.unistack.org/micro/v4/options"
 )

-type configKey struct{}
+type universalConfigKey struct{}

-func Config(c *redis.Options) store.Option {
-	return store.SetOption(configKey{}, c)
-}
-
-type clusterConfigKey struct{}
-
-func ClusterConfig(c *redis.ClusterOptions) store.Option {
-	return store.SetOption(clusterConfigKey{}, c)
+func UniversalConfig(c *redis.UniversalOptions) options.Option {
+	return options.ContextOption(universalConfigKey{}, c)
 }
--- a/redis.go
+++ b/redis.go
@@ -7,236 +7,116 @@ import (
 	"strings"
 	"time"

-	redis "github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v3/store"
-	"go.unistack.org/micro/v3/tracer"
-	pool "go.unistack.org/micro/v3/util/xpool"
-)
-
-var (
-	DefaultPathSeparator = "/"
-
-	DefaultClusterOptions = &redis.ClusterOptions{
-		Username:        "",
-		Password:        "", // no password set
-		MaxRetries:      2,
-		MaxRetryBackoff: 256 * time.Millisecond,
-		DialTimeout:     1 * time.Second,
-		ReadTimeout:     1 * time.Second,
-		WriteTimeout:    1 * time.Second,
-		PoolTimeout:     1 * time.Second,
-		MinIdleConns:    10,
-	}
-
-	DefaultOptions = &redis.Options{
-		Username:        "",
-		Password:        "", // no password set
-		DB:              0,  // use default DB
-		MaxRetries:      2,
-		MaxRetryBackoff: 256 * time.Millisecond,
-		DialTimeout:     1 * time.Second,
-		ReadTimeout:     1 * time.Second,
-		WriteTimeout:    1 * time.Second,
-		PoolTimeout:     1 * time.Second,
-		MinIdleConns:    10,
-	}
+	"github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/store"
 )

 type Store struct {
 	opts store.Options
-	cli  *wrappedClient
-	pool pool.Pool[*strings.Builder]
-}
-
-type wrappedClient struct {
-	*redis.Client
-	*redis.ClusterClient
+	cli  redis.UniversalClient
 }

 func (r *Store) Connect(ctx context.Context) error {
-	if r.cli.Client != nil {
-		return r.cli.Client.Ping(ctx).Err()
-	}
-	return r.cli.ClusterClient.Ping(ctx).Err()
+	return r.cli.Ping(ctx).Err()
 }

-func (r *Store) Init(opts ...store.Option) error {
-	for _, o := range opts {
-		o(&r.opts)
-	}
-
-	return r.configure()
+func (r *Store) Init(opts ...options.Option) error {
+	return r.configure(opts...)
 }

-func (r *Store) Client() *redis.Client {
-	if r.cli.Client != nil {
-		return r.cli.Client
-	}
-	return nil
-}
-
-func (r *Store) ClusterClient() *redis.ClusterClient {
-	if r.cli.ClusterClient != nil {
-		return r.cli.ClusterClient
-	}
-	return nil
+func (r *Store) Redis() redis.UniversalClient {
+	return r.cli
 }

 func (r *Store) Disconnect(ctx context.Context) error {
-	if r.cli.Client != nil {
-		return r.cli.Client.Close()
-	}
-	return r.cli.ClusterClient.Close()
+	return r.cli.Close()
 }

-func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
-	options := store.NewExistsOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+func (r *Store) Exists(ctx context.Context, key string, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
-	ctx, sp := r.opts.Tracer.Start(ctx, "cache exists "+rkey)
-	defer sp.Finish()
-
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var err error
-	var val int64
-	if r.cli.Client != nil {
-		val, err = r.cli.Client.Exists(ctx, rkey).Result()
-	} else {
-		val, err = r.cli.ClusterClient.Exists(ctx, rkey).Result()
+	options := store.NewExistsOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
 	}
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == redis.Nil || (err == nil && val == 0) {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", r.opts.Namespace, key)
+	}
+	val, err := r.cli.Exists(ctx, key).Result()
+	if err != nil {
 		return err
 	}
-
+	if val == 0 {
+		return store.ErrNotFound
+	}
 	return nil
 }

-func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
-	options := store.NewReadOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
-	ctx, sp := r.opts.Tracer.Start(ctx, "cache read "+rkey)
-	defer sp.Finish()
-
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var buf []byte
-	var err error
-	if r.cli.Client != nil {
-		buf, err = r.cli.Client.Get(ctx, rkey).Bytes()
-	} else {
-		buf, err = r.cli.ClusterClient.Get(ctx, rkey).Bytes()
+	options := store.NewReadOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
 	}
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == redis.Nil || (err == nil && buf == nil) {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", options.Namespace, key)
+	}
+
+	buf, err := r.cli.Get(ctx, key).Bytes()
+	if err != nil && err == redis.Nil {
 		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
-
-	switch b := val.(type) {
-	case *[]byte:
-		*b = buf
-	case *string:
-		*b = string(buf)
-	default:
-		if err = r.opts.Codec.Unmarshal(buf, val); err != nil {
-			sp.SetStatus(tracer.SpanStatusError, err.Error())
-		}
+	if buf == nil {
+		return store.ErrNotFound
 	}
-
-	return err
+	return r.opts.Codec.Unmarshal(buf, val)
 }

-func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
-	options := store.NewReadOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
+func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...options.Option) error {
+	if len(keys) == 1 {
+		vt := reflect.ValueOf(vals)
+		if vt.Kind() == reflect.Ptr {
+			vt = reflect.Indirect(vt)
+			return r.Read(ctx, keys[0], vt.Index(0).Interface(), opts...)
+		}
 	}
-
-	if timeout > 0 {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	if r.opts.Namespace != "" || options.Namespace != "" {
-		for idx, key := range keys {
-			keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
+	options := store.NewReadOptions(opts...)
+	rkeys := make([]string, 0, len(keys))
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	for _, key := range keys {
+		if options.Namespace != "" {
+			rkeys = append(rkeys, fmt.Sprintf("%s%s", options.Namespace, key))
+		} else {
+			rkeys = append(rkeys, key)
 		}
 	}

-	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache mread %v", keys))
-	defer sp.Finish()
-
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var rvals []interface{}
-	var err error
-	if r.cli.Client != nil {
-		rvals, err = r.cli.Client.MGet(ctx, keys...).Result()
-	} else {
-		rvals, err = r.cli.ClusterClient.MGet(ctx, keys...).Result()
-	}
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == redis.Nil || (len(rvals) == 0) {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
+	rvals, err := r.cli.MGet(ctx, rkeys...).Result()
+	if err != nil && err == redis.Nil {
 		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
+	if len(rvals) == 0 {
+		return store.ErrNotFound
+	}

 	vv := reflect.ValueOf(vals)
 	vt := reflect.TypeOf(vals)
@@ -266,137 +146,77 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
 		// special case for raw data
 		if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
 			itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
-			itm.SetBytes(buf)
-			continue
-		} else if vt.Kind() == reflect.String {
-			itm.SetString(string(buf))
-			continue
+		} else {
+			itm.Set(reflect.New(vt.Elem()))
 		}
-
-		itm.Set(reflect.New(vt.Elem()))
 		if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
-			sp.SetStatus(tracer.SpanStatusError, err.Error())
 			return err
 		}
 	}
 	vv.Set(nvv)
-
 	return nil
 }

-func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
-	options := store.NewDeleteOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
+func (r *Store) MDelete(ctx context.Context, keys []string, opts ...options.Option) error {
+	if len(keys) == 1 {
+		return r.Delete(ctx, keys[0], opts...)
 	}
-
-	if timeout > 0 {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	if r.opts.Namespace != "" || options.Namespace != "" {
-		for idx, key := range keys {
-			keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
-		}
+	options := store.NewDeleteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
 	}
-
-	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache mdelete %v", keys))
-	defer sp.Finish()
-
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var err error
-	if r.cli.Client != nil {
-		err = r.cli.Client.Del(ctx, keys...).Err()
-	} else {
-		err = r.cli.ClusterClient.Del(ctx, keys...).Err()
+	if options.Namespace == "" {
+		return r.cli.Del(ctx, keys...).Err()
 	}
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == redis.Nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
-		return err
+	for idx := range keys {
+		keys[idx] = options.Namespace + keys[idx]
 	}
-
-	return nil
+	return r.cli.Del(ctx, keys...).Err()
 }

-func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
-	options := store.NewDeleteOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+func (r *Store) Delete(ctx context.Context, key string, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache delete %v", key))
-	defer sp.Finish()
-
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var err error
-	if r.cli.Client != nil {
-		err = r.cli.Client.Del(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).Err()
-	} else {
-		err = r.cli.ClusterClient.Del(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).Err()
+	options := store.NewDeleteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
 	}
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == redis.Nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
-		return err
+	if options.Namespace == "" {
+		return r.cli.Del(ctx, key).Err()
 	}
-
-	return nil
+	return r.cli.Del(ctx, fmt.Sprintf("%s%s", options.Namespace, key)).Err()
 }

-func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...store.WriteOption) error {
+func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...options.Option) error {
+	if len(keys) == 1 {
+		return r.Write(ctx, keys[0], vals[0], opts...)
+	}
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
 	options := store.NewWriteOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
-		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
-		defer cancel()
-	}
-
-	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache mwrite %v", keys))
-	defer sp.Finish()
-
 	kvs := make([]string, 0, len(keys)*2)

+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+
 	for idx, key := range keys {
-		kvs = append(kvs, r.getKey(r.opts.Namespace, options.Namespace, key))
+		if options.Namespace != "" {
+			kvs = append(kvs, fmt.Sprintf("%s%s", options.Namespace, key))
+		} else {
+			kvs = append(kvs, key)
+		}

 		switch vt := vals[idx].(type) {
 		case string:
@@ -406,57 +226,27 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 		default:
 			buf, err := r.opts.Codec.Marshal(vt)
 			if err != nil {
-				sp.SetStatus(tracer.SpanStatusError, err.Error())
 				return err
 			}
 			kvs = append(kvs, string(buf))
 		}
 	}

-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-
-	pipeliner := func(pipe redis.Pipeliner) error {
+	cmds, err := r.cli.Pipelined(ctx, func(pipe redis.Pipeliner) error {
+		var err error
 		for idx := 0; idx < len(kvs); idx += 2 {
-			if _, err := pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
+			if _, err = pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
 				return err
 			}
 		}
 		return nil
-	}
-
-	var err error
-	var cmds []redis.Cmder
-
-	if r.cli.Client != nil {
-		cmds, err = r.cli.Client.Pipelined(ctx, pipeliner)
-	} else {
-		cmds, err = r.cli.ClusterClient.Pipelined(ctx, pipeliner)
-	}
-
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == redis.Nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
+	})
+	if err != nil {
 		return err
 	}

 	for _, cmd := range cmds {
 		if err = cmd.Err(); err != nil {
-			if err == redis.Nil {
-				r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
-				return store.ErrNotFound
-			}
-			sp.SetStatus(tracer.SpanStatusError, err.Error())
-			r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
 			return err
 		}
 	}
@@ -464,23 +254,17 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 	return nil
 }

-func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
-	options := store.NewWriteOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}

-	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
-	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache write %v", rkey))
-	defer sp.Finish()
+	options := store.NewWriteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}

 	var buf []byte
 	switch vt := val.(type) {
@@ -492,108 +276,46 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 		var err error
 		buf, err = r.opts.Codec.Marshal(val)
 		if err != nil {
-			sp.SetStatus(tracer.SpanStatusError, err.Error())
 			return err
 		}
 	}

-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var err error
-	if r.cli.Client != nil {
-		err = r.cli.Client.Set(ctx, rkey, buf, options.TTL).Err()
-	} else {
-		err = r.cli.ClusterClient.Set(ctx, rkey, buf, options.TTL).Err()
-	}
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == redis.Nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
-		return err
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", options.Namespace, key)
 	}

-	return err
+	return r.cli.Set(ctx, key, buf, options.TTL).Err()
 }

-func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
+func (r *Store) List(ctx context.Context, opts ...options.Option) ([]string, error) {
 	options := store.NewListOptions(opts...)
 	if len(options.Namespace) == 0 {
 		options.Namespace = r.opts.Namespace
 	}

-	rkey := r.getKey(options.Namespace, "", options.Prefix+"*")
+	rkey := fmt.Sprintf("%s%s*", options.Namespace, options.Prefix)
 	if options.Suffix != "" {
 		rkey += options.Suffix
 	}
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache list %v", rkey))
-	defer sp.Finish()
-
 	// TODO: add support for prefix/suffix/limit
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var keys []string
-	var err error
-
-	if r.cli.Client != nil {
-		keys, err = r.cli.Client.Keys(ctx, rkey).Result()
-	} else {
-		err = r.cli.ClusterClient.ForEachMaster(ctx, func(nctx context.Context, cli *redis.Client) error {
-			nkeys, nerr := cli.Keys(nctx, rkey).Result()
-			if nerr != nil {
-				return nerr
-			}
-			keys = append(keys, nkeys...)
-			return nil
-		})
-	}
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == redis.Nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return nil, store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
+	keys, err := r.cli.Keys(ctx, rkey).Result()
+	if err != nil {
 		return nil, err
 	}
-
-	prefix := r.opts.Namespace
-	if options.Namespace != "" {
-		prefix = options.Namespace
-	}
-	if prefix == "" {
+	if options.Namespace == "" {
 		return keys, nil
 	}

-	for idx, key := range keys {
-		keys[idx] = strings.TrimPrefix(key, prefix)
+	nkeys := make([]string, 0, len(keys))
+	for _, key := range keys {
+		nkeys = append(nkeys, strings.TrimPrefix(key, options.Namespace))
 	}
-
-	return keys, nil
+	return nkeys, nil
 }

 func (r *Store) Options() store.Options {
@@ -608,84 +330,60 @@ func (r *Store) String() string {
 	return "redis"
 }

-func NewStore(opts ...store.Option) *Store {
+func NewStore(opts ...options.Option) *Store {
 	return &Store{opts: store.NewOptions(opts...)}
 }

-func (r *Store) configure() error {
-	var redisOptions *redis.Options
-	var redisClusterOptions *redis.ClusterOptions
-	var err error
-
-	nodes := r.opts.Addrs
-
-	if len(nodes) == 0 {
-		nodes = []string{"redis://127.0.0.1:6379"}
+func (r *Store) configure(opts ...options.Option) error {
+	if r.cli != nil && len(opts) == 0 {
+		return nil
 	}

-	if r.cli != nil && r.opts.Context == nil {
-		return nil
+	var redisUniversalOptions *redis.UniversalOptions
+	var err error
+
+	for _, o := range opts {
+		if err = o(r.opts); err != nil {
+			return err
+		}
 	}

 	if r.opts.Context != nil {
-		if c, ok := r.opts.Context.Value(configKey{}).(*redis.Options); ok {
-			redisOptions = c
+		if c, ok := r.opts.Context.Value(universalConfigKey{}).(*redis.UniversalOptions); ok {
+			redisUniversalOptions = c
 			if r.opts.TLSConfig != nil {
-				redisOptions.TLSConfig = r.opts.TLSConfig
-			}
-		}
-
-		if c, ok := r.opts.Context.Value(clusterConfigKey{}).(*redis.ClusterOptions); ok {
-			redisClusterOptions = c
-			if r.opts.TLSConfig != nil {
-				redisClusterOptions.TLSConfig = r.opts.TLSConfig
+				redisUniversalOptions.TLSConfig = r.opts.TLSConfig
 			}
 		}
 	}

-	if redisOptions != nil && redisClusterOptions != nil {
-		return fmt.Errorf("must specify only one option Config or ClusterConfig")
-	}
-
-	if redisOptions == nil && redisClusterOptions == nil && r.cli != nil {
+	if redisUniversalOptions == nil && r.cli != nil {
 		return nil
 	}

-	if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
-		redisOptions, err = redis.ParseURL(nodes[0])
-		if err != nil {
-			redisOptions = DefaultOptions
-			redisOptions.Addr = r.opts.Addrs[0]
-			redisOptions.TLSConfig = r.opts.TLSConfig
+	if redisUniversalOptions == nil {
+		redisUniversalOptions = &redis.UniversalOptions{
+			Username:        "",
+			Password:        "", // no password set
+			DB:              0,  // use default DB
+			MaxRetries:      2,
+			MaxRetryBackoff: 256 * time.Millisecond,
+			DialTimeout:     1 * time.Second,
+			ReadTimeout:     1 * time.Second,
+			WriteTimeout:    1 * time.Second,
+			PoolTimeout:     1 * time.Second,
+			MinIdleConns:    10,
+			TLSConfig:       r.opts.TLSConfig,
 		}
-	} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
-		redisClusterOptions = DefaultClusterOptions
-		redisClusterOptions.Addrs = r.opts.Addrs
-		redisClusterOptions.TLSConfig = r.opts.TLSConfig
 	}

-	if redisOptions != nil {
-		r.cli = &wrappedClient{Client: redis.NewClient(redisOptions)}
-	} else if redisClusterOptions != nil {
-		r.cli = &wrappedClient{ClusterClient: redis.NewClusterClient(redisClusterOptions)}
+	if len(r.opts.Address) > 0 {
+		redisUniversalOptions.Addrs = r.opts.Address
+	} else if len(redisUniversalOptions.Addrs) == 0 {
+		redisUniversalOptions.Addrs = []string{"redis://127.0.0.1:6379"}
 	}

-	r.pool = pool.NewPool(func() *strings.Builder { return &strings.Builder{} })
+	r.cli = redis.NewUniversalClient(redisUniversalOptions)
+
 	return nil
 }
-
-func (r *Store) getKey(mainNamespace string, opNamespace string, key string) string {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-	b.Reset()
-
-	if opNamespace == "" {
-		opNamespace = mainNamespace
-	}
-	if opNamespace != "" {
-		b.WriteString(opNamespace)
-		b.WriteString(DefaultPathSeparator)
-	}
-	b.WriteString(key)
-	return b.String()
-}
--- a/redis_test.go
+++ b/redis_test.go
@@ -7,13 +7,15 @@ import (
 	"testing"
 	"time"

-	"go.unistack.org/micro/v3/store"
+	"github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/store"
 )

 func Test_rkv_configure(t *testing.T) {
 	type fields struct {
 		options store.Options
-		Client  *wrappedClient
+		Client  *redis.Client
 	}
 	type wantValues struct {
 		username string
@@ -36,7 +38,7 @@ func Test_rkv_configure(t *testing.T) {
 			},
 		},
 		{
-			name: "legacy Url", fields: fields{options: store.Options{Addrs: []string{"127.0.0.1:6379"}}, Client: nil},
+			name: "legacy Url", fields: fields{options: store.Options{Address: []string{"127.0.0.1:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "",
@@ -44,7 +46,7 @@ func Test_rkv_configure(t *testing.T) {
 			},
 		},
 		{
-			name: "New Url", fields: fields{options: store.Options{Addrs: []string{"redis://127.0.0.1:6379"}}, Client: nil},
+			name: "New Url", fields: fields{options: store.Options{Address: []string{"redis://127.0.0.1:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "",
@@ -52,7 +54,7 @@ func Test_rkv_configure(t *testing.T) {
 			},
 		},
 		{
-			name: "Url with Pwd", fields: fields{options: store.Options{Addrs: []string{"redis://:password@redis:6379"}}, Client: nil},
+			name: "Url with Pwd", fields: fields{options: store.Options{Address: []string{"redis://:password@redis:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "password",
@@ -60,7 +62,7 @@ func Test_rkv_configure(t *testing.T) {
 			},
 		},
 		{
-			name: "Url with username and Pwd", fields: fields{options: store.Options{Addrs: []string{"redis://username:password@redis:6379"}}, Client: nil},
+			name: "Url with username and Pwd", fields: fields{options: store.Options{Address: []string{"redis://username:password@redis:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "username",
 				password: "password",
@@ -89,7 +91,7 @@ func Test_Store(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
 		t.Skip()
 	}
-	r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
+	r := NewStore(options.Address(os.Getenv("STORE_NODES")))

 	if err := r.Init(); err != nil {
 		t.Fatal(err)
@@ -129,7 +131,7 @@ func Test_MRead(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
 		t.Skip()
 	}
-	r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
+	r := NewStore(options.Address(os.Getenv("STORE_NODES")))

 	if err = r.Init(); err != nil {
 		t.Fatal(err)
Author	SHA1	Message	Date
Vasiliy Tolstov	21d40b8e69	fixup lint Some checks failed build / lint (push) Successful in 29s Details build / test (push) Failing after 37s Details codeql / analyze (go) (push) Failing after 7m23s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-12-15 22:09:59 +03:00
Александр Толстихин	c8d21b4ef4	Replace RedisCluster to RedisUniversalClient (#114 ) Some checks failed build / test (push) Failing after 12s Details build / lint (push) Failing after 15s Details codeql / analyze (go) (push) Failing after 14m50s Details 1. Replace redis.Client to redis.UniversalClient 2. Replace ClusterConfig to UniversalConfig closes #113 Co-authored-by: Aleksandr Tolstikhin <atolstikhin@mtsbank.ru> Co-authored-by: Vasiliy Tolstov <v.tolstov@unistack.org> Reviewed-on: #114 Reviewed-by: Василий Толстов <v.tolstov@unistack.org> Co-authored-by: Александр Толстихин <tolstihin1996@mail.ru> Co-committed-by: Александр Толстихин <tolstihin1996@mail.ru>	2024-10-04 00:20:23 +03:00
Vasiliy Tolstov	195c604a31	Merge pull request 'add ability to get *redis.Client' (#111 ) from redis into master Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m34s Details codeql / analyze (go) (push) Failing after 2m44s Details Reviewed-on: #111	2023-12-12 13:53:00 +03:00
Vasiliy Tolstov	b263b69031	add ability to get *redis.Client Some checks failed codeql / analyze (go) (pull_request) Failing after 2m41s Details prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m34s Details autoapprove / autoapprove (pull_request) Failing after 1m26s Details automerge / automerge (pull_request) Failing after 4s Details dependabot-automerge / automerge (pull_request) Has been skipped Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-12-12 13:52:37 +03:00
Vasiliy Tolstov	4459bfa1a0	Merge pull request 'add mwrite func' (#109 ) from mwrite into master Reviewed-on: #109	2023-10-21 00:58:08 +03:00
Vasiliy Tolstov	b90361e48a	add MWrite func Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-10-21 00:57:12 +03:00