unistack-org/micro-store-redis
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

add mwrite func #109

Merged
vtolstov merged 79 commits from mwrite into master 2023-10-21 00:58:09 +03:00
Conversation 0 Commits 79 Files Changed 10 +31 -29
5 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b90361e48a - Show all commits

4
go.mod
View File

@ -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.28
go.unistack.org/micro/v4 v4.0.7
)
require (

4
go.sum
View File

@ -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.28 h1:/87lGekrmi0/66pioy+Nh8lVUBBYnVqKoHiNYX5OmMI=
go.unistack.org/micro/v3 v3.10.28/go.mod h1:eUgtvbtiiz6te93m0ZdmoecbitWwjdBmmr84srmEIKA=
go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=

10
options.go
View File

@ -2,17 +2,17 @@ package redis
import (
"github.com/redis/go-redis/v9"
"go.unistack.org/micro/v3/store"
"go.unistack.org/micro/v4/options"
)
type configKey struct{}
func Config(c *redis.Options) store.Option {
return store.SetOption(configKey{}, c)
func Config(c *redis.Options) options.Option {
return options.ContextOption(configKey{}, c)
}
type clusterConfigKey struct{}
func ClusterConfig(c *redis.ClusterOptions) store.Option {
return store.SetOption(clusterConfigKey{}, c)
func ClusterConfig(c *redis.ClusterOptions) options.Option {
return options.ContextOption(clusterConfigKey{}, c)
}

25
redis.go
View File

@ -8,7 +8,8 @@ import (
"time"
"github.com/redis/go-redis/v9"
"go.unistack.org/micro/v3/store"
"go.unistack.org/micro/v4/options"
"go.unistack.org/micro/v4/store"
)
type Store struct {
@ -34,7 +35,7 @@ func (r *Store) Connect(ctx context.Context) error {
return r.cli.Ping(ctx).Err()
}
func (r *Store) Init(opts ...store.Option) error {
func (r *Store) Init(opts ...options.Option) error {
for _, o := range opts {
o(&r.opts)
}
@ -46,7 +47,7 @@ func (r *Store) Disconnect(ctx context.Context) error {
return r.cli.Close()
}
func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
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, r.opts.Timeout)
@ -69,7 +70,7 @@ func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOpti
return nil
}
func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
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, r.opts.Timeout)
@ -95,7 +96,7 @@ func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...s
return r.opts.Codec.Unmarshal(buf, val)
}
func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
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 {
@ -170,7 +171,7 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
return nil
}
func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
func (r *Store) MDelete(ctx context.Context, keys []string, opts ...options.Option) error {
if len(keys) == 1 {
return r.Delete(ctx, keys[0], opts...)
}
@ -192,7 +193,7 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
return r.cli.Del(ctx, keys...).Err()
}
func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
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, r.opts.Timeout)
@ -208,7 +209,7 @@ func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOpti
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...)
}
@ -264,7 +265,7 @@ 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 {
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, r.opts.Timeout)
@ -297,7 +298,7 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
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
@ -340,7 +341,7 @@ 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...)}
}
@ -349,7 +350,7 @@ func (r *Store) configure() error {
var redisClusterOptions *redis.ClusterOptions
var err error
nodes := r.opts.Addrs
nodes := r.opts.Address
if len(nodes) == 0 {
nodes = []string{"redis://127.0.0.1:6379"}

17
redis_test.go
View File

@ -8,7 +8,8 @@ import (
"time"
"github.com/redis/go-redis/v9"
"go.unistack.org/micro/v3/store"
"go.unistack.org/micro/v4/options"
"go.unistack.org/micro/v4/store"
)
func Test_rkv_configure(t *testing.T) {
@ -37,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: "",
@ -45,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: "",
@ -53,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",
@ -61,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",
@ -71,7 +72,7 @@ func Test_rkv_configure(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
r := &rkv{
r := &Store{
opts: tt.fields.options,
cli: tt.fields.Client,
}
@ -90,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)
@ -130,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)