Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
741b2310ec | |||
1e8a44b088 | |||
2245314c2f | |||
db770c3fe7 |
4
go.mod
4
go.mod
@@ -1,10 +1,10 @@
|
|||||||
module go.unistack.org/micro-store-redis/v4
|
module go.unistack.org/micro-store-redis/v3
|
||||||
|
|
||||||
go 1.20
|
go 1.20
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/redis/go-redis/v9 v9.2.1
|
github.com/redis/go-redis/v9 v9.2.1
|
||||||
go.unistack.org/micro/v4 v4.0.7
|
go.unistack.org/micro/v3 v3.10.62
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
4
go.sum
4
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/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 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
|
||||||
github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
|
github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
|
||||||
go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
|
go.unistack.org/micro/v3 v3.10.62 h1:PCwLSt3W53UGosH/5qU3kU0iJxK8jlKOm9p4v/Zti5o=
|
||||||
go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
|
go.unistack.org/micro/v3 v3.10.62/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
|
||||||
|
10
options.go
10
options.go
@@ -2,17 +2,17 @@ package redis
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/redis/go-redis/v9"
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v3/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
type configKey struct{}
|
type configKey struct{}
|
||||||
|
|
||||||
func Config(c *redis.Options) options.Option {
|
func Config(c *redis.Options) store.Option {
|
||||||
return options.ContextOption(configKey{}, c)
|
return store.SetOption(configKey{}, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
type clusterConfigKey struct{}
|
type clusterConfigKey struct{}
|
||||||
|
|
||||||
func ClusterConfig(c *redis.ClusterOptions) options.Option {
|
func ClusterConfig(c *redis.ClusterOptions) store.Option {
|
||||||
return options.ContextOption(clusterConfigKey{}, c)
|
return store.SetOption(clusterConfigKey{}, c)
|
||||||
}
|
}
|
||||||
|
508
redis.go
508
redis.go
@@ -7,14 +7,46 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/redis/go-redis/v9"
|
redis "github.com/redis/go-redis/v9"
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v3/semconv"
|
||||||
"go.unistack.org/micro/v4/store"
|
"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,
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
type Store struct {
|
type Store struct {
|
||||||
opts store.Options
|
opts store.Options
|
||||||
cli redisClient
|
cli redisClient
|
||||||
|
pool pool.Pool[strings.Builder]
|
||||||
}
|
}
|
||||||
|
|
||||||
type redisClient interface {
|
type redisClient interface {
|
||||||
@@ -35,7 +67,7 @@ func (r *Store) Connect(ctx context.Context) error {
|
|||||||
return r.cli.Ping(ctx).Err()
|
return r.cli.Ping(ctx).Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Init(opts ...options.Option) error {
|
func (r *Store) Init(opts ...store.Option) error {
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
o(&r.opts)
|
o(&r.opts)
|
||||||
}
|
}
|
||||||
@@ -43,94 +75,143 @@ func (r *Store) Init(opts ...options.Option) error {
|
|||||||
return r.configure()
|
return r.configure()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *Store) Redis() *redis.Client {
|
||||||
|
return r.cli.(*redis.Client)
|
||||||
|
}
|
||||||
|
|
||||||
func (r *Store) Disconnect(ctx context.Context) error {
|
func (r *Store) Disconnect(ctx context.Context) error {
|
||||||
return r.cli.Close()
|
return r.cli.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Exists(ctx context.Context, key string, opts ...options.Option) error {
|
func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
|
||||||
if r.opts.Timeout > 0 {
|
options := store.NewExistsOptions(opts...)
|
||||||
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
|
}
|
||||||
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewExistsOptions(opts...)
|
|
||||||
if len(options.Namespace) == 0 {
|
rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
|
||||||
options.Namespace = r.opts.Namespace
|
ctx, sp := r.opts.Tracer.Start(ctx, "cache exists "+rkey)
|
||||||
}
|
defer sp.Finish()
|
||||||
if options.Namespace != "" {
|
|
||||||
key = fmt.Sprintf("%s%s", r.opts.Namespace, key)
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
}
|
ts := time.Now()
|
||||||
val, err := r.cli.Exists(ctx, key).Result()
|
val, err := r.cli.Exists(ctx, rkey).Result()
|
||||||
if err != 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 || (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()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if val == 0 {
|
|
||||||
return store.ErrNotFound
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
|
func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
var cancel context.CancelFunc
|
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
|
||||||
defer cancel()
|
|
||||||
}
|
|
||||||
options := store.NewReadOptions(opts...)
|
options := store.NewReadOptions(opts...)
|
||||||
if len(options.Namespace) == 0 {
|
|
||||||
options.Namespace = r.opts.Namespace
|
timeout := r.opts.Timeout
|
||||||
}
|
if options.Timeout > 0 {
|
||||||
if options.Namespace != "" {
|
timeout = options.Timeout
|
||||||
key = fmt.Sprintf("%s%s", options.Namespace, key)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
buf, err := r.cli.Get(ctx, key).Bytes()
|
if timeout > 0 {
|
||||||
if err != nil && err == redis.Nil {
|
var cancel context.CancelFunc
|
||||||
|
ctx, cancel = context.WithTimeout(ctx, 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()
|
||||||
|
buf, err := r.cli.Get(ctx, rkey).Bytes()
|
||||||
|
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()
|
||||||
return store.ErrNotFound
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
|
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if buf == nil {
|
|
||||||
return store.ErrNotFound
|
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())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return r.opts.Codec.Unmarshal(buf, val)
|
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...options.Option) error {
|
func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
|
||||||
if len(keys) == 1 {
|
options := store.NewReadOptions(opts...)
|
||||||
vt := reflect.ValueOf(vals)
|
|
||||||
if vt.Kind() == reflect.Ptr {
|
timeout := r.opts.Timeout
|
||||||
vt = reflect.Indirect(vt)
|
if options.Timeout > 0 {
|
||||||
return r.Read(ctx, keys[0], vt.Index(0).Interface(), opts...)
|
timeout = options.Timeout
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewReadOptions(opts...)
|
|
||||||
rkeys := make([]string, 0, len(keys))
|
if r.opts.Namespace != "" || options.Namespace != "" {
|
||||||
if len(options.Namespace) == 0 {
|
for idx, key := range keys {
|
||||||
options.Namespace = r.opts.Namespace
|
keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
|
||||||
}
|
|
||||||
for _, key := range keys {
|
|
||||||
if options.Namespace != "" {
|
|
||||||
rkeys = append(rkeys, fmt.Sprintf("%s%s", options.Namespace, key))
|
|
||||||
} else {
|
|
||||||
rkeys = append(rkeys, key)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rvals, err := r.cli.MGet(ctx, rkeys...).Result()
|
ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache mread %v", keys))
|
||||||
if err != nil && err == redis.Nil {
|
defer sp.Finish()
|
||||||
|
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
|
ts := time.Now()
|
||||||
|
rvals, err := r.cli.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()
|
||||||
return store.ErrNotFound
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
|
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if len(rvals) == 0 {
|
|
||||||
return store.ErrNotFound
|
|
||||||
}
|
|
||||||
|
|
||||||
vv := reflect.ValueOf(vals)
|
vv := reflect.ValueOf(vals)
|
||||||
vt := reflect.TypeOf(vals)
|
vt := reflect.TypeOf(vals)
|
||||||
@@ -160,77 +241,127 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
|
|||||||
// special case for raw data
|
// special case for raw data
|
||||||
if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
|
if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
|
||||||
itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
|
itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
|
||||||
} else {
|
itm.SetBytes(buf)
|
||||||
itm.Set(reflect.New(vt.Elem()))
|
continue
|
||||||
|
} else if vt.Kind() == reflect.String {
|
||||||
|
itm.SetString(string(buf))
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
itm.Set(reflect.New(vt.Elem()))
|
||||||
if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
|
if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
|
||||||
|
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
vv.Set(nvv)
|
vv.Set(nvv)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) MDelete(ctx context.Context, keys []string, opts ...options.Option) error {
|
func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
|
||||||
if len(keys) == 1 {
|
options := store.NewDeleteOptions(opts...)
|
||||||
return r.Delete(ctx, keys[0], opts...)
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
}
|
}
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewDeleteOptions(opts...)
|
|
||||||
if len(options.Namespace) == 0 {
|
if r.opts.Namespace != "" || options.Namespace != "" {
|
||||||
options.Namespace = r.opts.Namespace
|
for idx, key := range keys {
|
||||||
|
keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if options.Namespace == "" {
|
|
||||||
return r.cli.Del(ctx, keys...).Err()
|
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()
|
||||||
|
err := 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 ...options.Option) error {
|
func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
|
||||||
if r.opts.Timeout > 0 {
|
options := store.NewDeleteOptions(opts...)
|
||||||
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
|
}
|
||||||
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewDeleteOptions(opts...)
|
|
||||||
if len(options.Namespace) == 0 {
|
ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache delete %v", key))
|
||||||
options.Namespace = r.opts.Namespace
|
defer sp.Finish()
|
||||||
|
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
|
ts := time.Now()
|
||||||
|
err := r.cli.Del(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).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 == "" {
|
|
||||||
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 ...options.Option) error {
|
func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...store.WriteOption) 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...)
|
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)
|
kvs := make([]string, 0, len(keys)*2)
|
||||||
|
|
||||||
if len(options.Namespace) == 0 {
|
|
||||||
options.Namespace = r.opts.Namespace
|
|
||||||
}
|
|
||||||
|
|
||||||
for idx, key := range keys {
|
for idx, key := range keys {
|
||||||
if options.Namespace != "" {
|
kvs = append(kvs, r.getKey(r.opts.Namespace, options.Namespace, key))
|
||||||
kvs = append(kvs, fmt.Sprintf("%s%s", options.Namespace, key))
|
|
||||||
} else {
|
|
||||||
kvs = append(kvs, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
switch vt := vals[idx].(type) {
|
switch vt := vals[idx].(type) {
|
||||||
case string:
|
case string:
|
||||||
@@ -240,24 +371,48 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
|
|||||||
default:
|
default:
|
||||||
buf, err := r.opts.Codec.Marshal(vt)
|
buf, err := r.opts.Codec.Marshal(vt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
kvs = append(kvs, string(buf))
|
kvs = append(kvs, string(buf))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
|
ts := time.Now()
|
||||||
|
|
||||||
cmds, err := r.cli.Pipelined(ctx, func(pipe redis.Pipeliner) error {
|
cmds, err := r.cli.Pipelined(ctx, func(pipe redis.Pipeliner) error {
|
||||||
for idx := 0; idx < len(kvs); idx += 2 {
|
for idx := 0; idx < len(kvs); idx += 2 {
|
||||||
pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result()
|
if _, err := pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
if err != 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 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
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, cmd := range cmds {
|
for _, cmd := range cmds {
|
||||||
if err = cmd.Err(); err != nil {
|
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
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -265,17 +420,23 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
|
func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
|
||||||
if r.opts.Timeout > 0 {
|
options := store.NewWriteOptions(opts...)
|
||||||
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
|
}
|
||||||
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
|
|
||||||
options := store.NewWriteOptions(opts...)
|
rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
|
||||||
if len(options.Namespace) == 0 {
|
ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache write %v", rkey))
|
||||||
options.Namespace = r.opts.Namespace
|
defer sp.Finish()
|
||||||
}
|
|
||||||
|
|
||||||
var buf []byte
|
var buf []byte
|
||||||
switch vt := val.(type) {
|
switch vt := val.(type) {
|
||||||
@@ -287,46 +448,89 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
|
|||||||
var err error
|
var err error
|
||||||
buf, err = r.opts.Codec.Marshal(val)
|
buf, err = r.opts.Codec.Marshal(val)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if options.Namespace != "" {
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
key = fmt.Sprintf("%s%s", options.Namespace, key)
|
ts := time.Now()
|
||||||
|
err := r.cli.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
|
||||||
}
|
}
|
||||||
|
|
||||||
return r.cli.Set(ctx, key, buf, options.TTL).Err()
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) List(ctx context.Context, opts ...options.Option) ([]string, error) {
|
func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
|
||||||
options := store.NewListOptions(opts...)
|
options := store.NewListOptions(opts...)
|
||||||
if len(options.Namespace) == 0 {
|
if len(options.Namespace) == 0 {
|
||||||
options.Namespace = r.opts.Namespace
|
options.Namespace = r.opts.Namespace
|
||||||
}
|
}
|
||||||
|
|
||||||
rkey := fmt.Sprintf("%s%s*", options.Namespace, options.Prefix)
|
rkey := r.getKey(options.Namespace, "", options.Prefix+"*")
|
||||||
if options.Suffix != "" {
|
if options.Suffix != "" {
|
||||||
rkey += options.Suffix
|
rkey += options.Suffix
|
||||||
}
|
}
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
|
}
|
||||||
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
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
|
// TODO: add support for prefix/suffix/limit
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
|
ts := time.Now()
|
||||||
keys, err := r.cli.Keys(ctx, rkey).Result()
|
keys, err := r.cli.Keys(ctx, rkey).Result()
|
||||||
if err != 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()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if options.Namespace == "" {
|
|
||||||
|
prefix := r.opts.Namespace
|
||||||
|
if options.Namespace != "" {
|
||||||
|
prefix = options.Namespace
|
||||||
|
}
|
||||||
|
if prefix == "" {
|
||||||
return keys, nil
|
return keys, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
nkeys := make([]string, 0, len(keys))
|
for idx, key := range keys {
|
||||||
for _, key := range keys {
|
keys[idx] = strings.TrimPrefix(key, prefix)
|
||||||
nkeys = append(nkeys, strings.TrimPrefix(key, options.Namespace))
|
|
||||||
}
|
}
|
||||||
return nkeys, nil
|
|
||||||
|
return keys, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Options() store.Options {
|
func (r *Store) Options() store.Options {
|
||||||
@@ -341,7 +545,7 @@ func (r *Store) String() string {
|
|||||||
return "redis"
|
return "redis"
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewStore(opts ...options.Option) *Store {
|
func NewStore(opts ...store.Option) *Store {
|
||||||
return &Store{opts: store.NewOptions(opts...)}
|
return &Store{opts: store.NewOptions(opts...)}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -350,7 +554,7 @@ func (r *Store) configure() error {
|
|||||||
var redisClusterOptions *redis.ClusterOptions
|
var redisClusterOptions *redis.ClusterOptions
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
nodes := r.opts.Address
|
nodes := r.opts.Addrs
|
||||||
|
|
||||||
if len(nodes) == 0 {
|
if len(nodes) == 0 {
|
||||||
nodes = []string{"redis://127.0.0.1:6379"}
|
nodes = []string{"redis://127.0.0.1:6379"}
|
||||||
@@ -387,36 +591,14 @@ func (r *Store) configure() error {
|
|||||||
if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
|
if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
|
||||||
redisOptions, err = redis.ParseURL(nodes[0])
|
redisOptions, err = redis.ParseURL(nodes[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Backwards compatibility
|
redisOptions = DefaultOptions
|
||||||
redisOptions = &redis.Options{
|
redisOptions.Addr = r.opts.Addrs[0]
|
||||||
Addr: nodes[0],
|
redisOptions.TLSConfig = r.opts.TLSConfig
|
||||||
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 {
|
} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
|
||||||
redisClusterOptions = &redis.ClusterOptions{
|
redisClusterOptions = DefaultClusterOptions
|
||||||
Addrs: nodes,
|
redisClusterOptions.Addrs = r.opts.Addrs
|
||||||
Username: "",
|
redisClusterOptions.TLSConfig = r.opts.TLSConfig
|
||||||
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,
|
|
||||||
TLSConfig: r.opts.TLSConfig,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if redisOptions != nil {
|
if redisOptions != nil {
|
||||||
@@ -427,3 +609,19 @@ func (r *Store) configure() error {
|
|||||||
|
|
||||||
return nil
|
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()
|
||||||
|
}
|
||||||
|
@@ -8,8 +8,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/redis/go-redis/v9"
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v3/store"
|
||||||
"go.unistack.org/micro/v4/store"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func Test_rkv_configure(t *testing.T) {
|
func Test_rkv_configure(t *testing.T) {
|
||||||
@@ -38,7 +37,7 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "legacy Url", fields: fields{options: store.Options{Address: []string{"127.0.0.1:6379"}}, Client: nil},
|
name: "legacy Url", fields: fields{options: store.Options{Addrs: []string{"127.0.0.1:6379"}}, Client: nil},
|
||||||
wantErr: false, want: wantValues{
|
wantErr: false, want: wantValues{
|
||||||
username: "",
|
username: "",
|
||||||
password: "",
|
password: "",
|
||||||
@@ -46,7 +45,7 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "New Url", fields: fields{options: store.Options{Address: []string{"redis://127.0.0.1:6379"}}, Client: nil},
|
name: "New Url", fields: fields{options: store.Options{Addrs: []string{"redis://127.0.0.1:6379"}}, Client: nil},
|
||||||
wantErr: false, want: wantValues{
|
wantErr: false, want: wantValues{
|
||||||
username: "",
|
username: "",
|
||||||
password: "",
|
password: "",
|
||||||
@@ -54,7 +53,7 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Url with Pwd", fields: fields{options: store.Options{Address: []string{"redis://:password@redis:6379"}}, Client: nil},
|
name: "Url with Pwd", fields: fields{options: store.Options{Addrs: []string{"redis://:password@redis:6379"}}, Client: nil},
|
||||||
wantErr: false, want: wantValues{
|
wantErr: false, want: wantValues{
|
||||||
username: "",
|
username: "",
|
||||||
password: "password",
|
password: "password",
|
||||||
@@ -62,7 +61,7 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Url with username and Pwd", fields: fields{options: store.Options{Address: []string{"redis://username:password@redis:6379"}}, Client: nil},
|
name: "Url with username and Pwd", fields: fields{options: store.Options{Addrs: []string{"redis://username:password@redis:6379"}}, Client: nil},
|
||||||
wantErr: false, want: wantValues{
|
wantErr: false, want: wantValues{
|
||||||
username: "username",
|
username: "username",
|
||||||
password: "password",
|
password: "password",
|
||||||
@@ -72,11 +71,11 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
r := &Store{
|
rc := &Store{
|
||||||
opts: tt.fields.options,
|
opts: tt.fields.options,
|
||||||
cli: tt.fields.Client,
|
cli: tt.fields.Client,
|
||||||
}
|
}
|
||||||
err := r.configure()
|
err := rc.configure()
|
||||||
if (err != nil) != tt.wantErr {
|
if (err != nil) != tt.wantErr {
|
||||||
t.Errorf("configure() error = %v, wantErr %v", err, tt.wantErr)
|
t.Errorf("configure() error = %v, wantErr %v", err, tt.wantErr)
|
||||||
return
|
return
|
||||||
@@ -91,7 +90,7 @@ func Test_Store(t *testing.T) {
|
|||||||
if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
|
if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
|
||||||
t.Skip()
|
t.Skip()
|
||||||
}
|
}
|
||||||
r := NewStore(options.Address(os.Getenv("STORE_NODES")))
|
r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
|
||||||
|
|
||||||
if err := r.Init(); err != nil {
|
if err := r.Init(); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@@ -131,7 +130,7 @@ func Test_MRead(t *testing.T) {
|
|||||||
if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
|
if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
|
||||||
t.Skip()
|
t.Skip()
|
||||||
}
|
}
|
||||||
r := NewStore(options.Address(os.Getenv("STORE_NODES")))
|
r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
|
||||||
|
|
||||||
if err = r.Init(); err != nil {
|
if err = r.Init(); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
Reference in New Issue
Block a user