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

Replace RedisCluster to RedisUniversalClient #114

Merged
vtolstov merged 2 commits from atolstikhin/micro-store-redis:universal_client_redis into master 2024-10-04 00:20:24 +03:00
Conversation 0 Commits 2 Files Changed 2 +18 -31
2 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8448680806 - Show all commits

6
options.go
View File

@ -11,8 +11,8 @@ func Config(c *redis.Options) options.Option {
return options.ContextOption(configKey{}, c)
}
type clusterConfigKey struct{}
type universalConfigKey struct{}
func ClusterConfig(c *redis.ClusterOptions) options.Option {
return options.ContextOption(clusterConfigKey{}, c)
func UniversalConfig(c *redis.UniversalOptions) options.Option {
return options.ContextOption(universalConfigKey{}, c)
}

43
redis.go
View File

@ -14,21 +14,7 @@ import (
type Store struct {
opts store.Options
cli redisClient
}
type redisClient interface {
Get(ctx context.Context, key string) *redis.StringCmd
Del(ctx context.Context, keys ...string) *redis.IntCmd
Set(ctx context.Context, key string, value interface{}, expiration time.Duration) *redis.StatusCmd
Keys(ctx context.Context, pattern string) *redis.StringSliceCmd
MGet(ctx context.Context, keys ...string) *redis.SliceCmd
MSet(ctx context.Context, kv ...interface{}) *redis.StatusCmd
Exists(ctx context.Context, keys ...string) *redis.IntCmd
Ping(ctx context.Context) *redis.StatusCmd
Pipeline() redis.Pipeliner
Pipelined(ctx context.Context, fn func(redis.Pipeliner) error) ([]redis.Cmder, error)
Close() error
cli redis.UniversalClient
}
func (r *Store) Connect(ctx context.Context) error {
@ -43,8 +29,8 @@ func (r *Store) Init(opts ...options.Option) error {
return r.configure()
}
func (r *Store) Redis() *redis.Client {
return r.cli.(*redis.Client)
func (r *Store) Redis() redis.UniversalClient {
return r.cli.(redis.UniversalClient)
}
func (r *Store) Disconnect(ctx context.Context) error {
@ -351,7 +337,7 @@ func NewStore(opts ...options.Option) *Store {
func (r *Store) configure() error {
var redisOptions *redis.Options
var redisClusterOptions *redis.ClusterOptions
var redisUniversalOptions *redis.UniversalOptions
var err error
nodes := r.opts.Address
@ -372,23 +358,23 @@ func (r *Store) configure() error {
}
}
if c, ok := r.opts.Context.Value(clusterConfigKey{}).(*redis.ClusterOptions); ok {
redisClusterOptions = c
if c, ok := r.opts.Context.Value(universalConfigKey{}).(*redis.UniversalOptions); ok {
redisUniversalOptions = c
if r.opts.TLSConfig != nil {
redisClusterOptions.TLSConfig = r.opts.TLSConfig
redisUniversalOptions.TLSConfig = r.opts.TLSConfig
}
}
}
if redisOptions != nil && redisClusterOptions != nil {
if redisOptions != nil && redisUniversalOptions != nil {
return fmt.Errorf("must specify only one option Config or ClusterConfig")
}
if redisOptions == nil && redisClusterOptions == nil && r.cli != nil {
if redisOptions == nil && redisUniversalOptions == nil && r.cli != nil {
return nil
}
if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
if redisOptions == nil && redisUniversalOptions == nil && len(nodes) == 1 {
redisOptions, err = redis.ParseURL(nodes[0])
if err != nil {
// Backwards compatibility
@ -407,11 +393,12 @@ func (r *Store) configure() error {
TLSConfig: r.opts.TLSConfig,
}
}
} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
redisClusterOptions = &redis.ClusterOptions{
} else if redisOptions == nil && redisUniversalOptions == nil && len(nodes) > 1 {
redisUniversalOptions = &redis.UniversalOptions{
Addrs: nodes,
Username: "",
Password: "", // no password set
DB: 0, // use default DB
MaxRetries: 2,
MaxRetryBackoff: 256 * time.Millisecond,
DialTimeout: 1 * time.Second,
@ -425,8 +412,8 @@ func (r *Store) configure() error {
if redisOptions != nil {
r.cli = redis.NewClient(redisOptions)
} else if redisClusterOptions != nil {
r.cli = redis.NewClusterClient(redisClusterOptions)
} else if redisUniversalOptions != nil {
r.cli = redis.NewUniversalClient(redisUniversalOptions)
}
return nil