mirror of
https://github.com/redis/go-redis.git
synced 2025-04-17 20:17:02 +03:00
* Add guidance on unstable RESP3 support for RediSearch commands to README (#3177) * Add UnstableResp3 to docs * Add RawVal and RawResult to wordlist * Explain more about SetVal * Add UnstableResp to wordlist * Eliminate redundant dial mutex causing unbounded connection queue contention (#3088) * Eliminate redundant dial mutex causing unbounded connection queue contention * Dialer connection timeouts unit test --------- Co-authored-by: ofekshenawa <104765379+ofekshenawa@users.noreply.github.com> * SortByWithCount FTSearchOptions fix (#3201) * SortByWithCount FTSearchOptions fix * FTSearch test fix * Another FTSearch test fix * Another FTSearch test fix --------- Co-authored-by: Christopher Golling <Chris.Golling@aexp.com> * Fix race condition in clusterNodes.Addrs() (#3219) Resolve a race condition in the clusterNodes.Addrs() method. Previously, the method returned a reference to a string slice, creating the potential for concurrent reads by the caller while the slice was being modified by the garbage collection process. Co-authored-by: Nedyalko Dyakov <nedyalko.dyakov@gmail.com> * chore: fix some comments (#3226) Signed-off-by: zhuhaicity <zhuhai@52it.net> Co-authored-by: Nedyalko Dyakov <nedyalko.dyakov@gmail.com> * fix(aggregate, search): ft.aggregate bugfixes (#3263) * fix: rearange args for ft.aggregate apply should be before any groupby or sortby * improve test * wip: add scorer and addscores * enable all tests * fix ftsearch with count test * make linter happy * Addscores is available in later redisearch releases. For safety state it is available in redis ce 8 * load an apply seem to break scorer and addscores * fix: add unstableresp3 to cluster client (#3266) * fix: add unstableresp3 to cluster client * propagate unstableresp3 * proper test that will ignore error, but fail if client panics * add separate test for clusterclient constructor * fix: flaky ClientKillByFilter test (#3268) * Reinstate read-only lock on hooks access in dialHook (#3225) * use limit when limitoffset is zero (#3275) * remove redis 8 comments * update package versions * use latest golangci-lint * fix(search&aggregate):fix error overwrite and typo #3220 (#3224) * fix (#3220) * LOAD has NO AS param(https://redis.io/docs/latest/commands/ft.aggregate/) * fix typo: WITHCOUT -> WITHCOUNT * fix (#3220): * Compatible with known RediSearch issue in test * fix (#3220) * fixed the calculation bug of the count of load params * test should not include special condition * return errors when they occur --------- Co-authored-by: Nedyalko Dyakov <nedyalko.dyakov@gmail.com> Co-authored-by: ofekshenawa <104765379+ofekshenawa@users.noreply.github.com> * Recognize byte slice for key argument in cluster client hash slot computation (#3049) Co-authored-by: Vladyslav Vildanov <117659936+vladvildanov@users.noreply.github.com> Co-authored-by: ofekshenawa <104765379+ofekshenawa@users.noreply.github.com> --------- Signed-off-by: zhuhaicity <zhuhai@52it.net> Co-authored-by: ofekshenawa <104765379+ofekshenawa@users.noreply.github.com> Co-authored-by: LINKIWI <LINKIWI@users.noreply.github.com> Co-authored-by: Cgol9 <chris.golling@verizon.net> Co-authored-by: Christopher Golling <Chris.Golling@aexp.com> Co-authored-by: Shawn Wang <62313353+shawnwgit@users.noreply.github.com> Co-authored-by: ZhuHaiCheng <zhuhai@52it.net> Co-authored-by: herodot <54836727+bitsark@users.noreply.github.com> Co-authored-by: Vladyslav Vildanov <117659936+vladvildanov@users.noreply.github.com>
252 lines
6.6 KiB
Go
252 lines
6.6 KiB
Go
package redis
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"net"
|
|
"time"
|
|
)
|
|
|
|
// UniversalOptions information is required by UniversalClient to establish
|
|
// connections.
|
|
type UniversalOptions struct {
|
|
// Either a single address or a seed list of host:port addresses
|
|
// of cluster/sentinel nodes.
|
|
Addrs []string
|
|
|
|
// ClientName will execute the `CLIENT SETNAME ClientName` command for each conn.
|
|
ClientName string
|
|
|
|
// Database to be selected after connecting to the server.
|
|
// Only single-node and failover clients.
|
|
DB int
|
|
|
|
// Common options.
|
|
|
|
Dialer func(ctx context.Context, network, addr string) (net.Conn, error)
|
|
OnConnect func(ctx context.Context, cn *Conn) error
|
|
|
|
Protocol int
|
|
Username string
|
|
Password string
|
|
SentinelUsername string
|
|
SentinelPassword string
|
|
|
|
MaxRetries int
|
|
MinRetryBackoff time.Duration
|
|
MaxRetryBackoff time.Duration
|
|
|
|
DialTimeout time.Duration
|
|
ReadTimeout time.Duration
|
|
WriteTimeout time.Duration
|
|
ContextTimeoutEnabled bool
|
|
|
|
// PoolFIFO uses FIFO mode for each node connection pool GET/PUT (default LIFO).
|
|
PoolFIFO bool
|
|
|
|
PoolSize int
|
|
PoolTimeout time.Duration
|
|
MinIdleConns int
|
|
MaxIdleConns int
|
|
MaxActiveConns int
|
|
ConnMaxIdleTime time.Duration
|
|
ConnMaxLifetime time.Duration
|
|
|
|
TLSConfig *tls.Config
|
|
|
|
// Only cluster clients.
|
|
|
|
MaxRedirects int
|
|
ReadOnly bool
|
|
RouteByLatency bool
|
|
RouteRandomly bool
|
|
|
|
// The sentinel master name.
|
|
// Only failover clients.
|
|
|
|
MasterName string
|
|
|
|
DisableIndentity bool
|
|
IdentitySuffix string
|
|
UnstableResp3 bool
|
|
}
|
|
|
|
// Cluster returns cluster options created from the universal options.
|
|
func (o *UniversalOptions) Cluster() *ClusterOptions {
|
|
if len(o.Addrs) == 0 {
|
|
o.Addrs = []string{"127.0.0.1:6379"}
|
|
}
|
|
|
|
return &ClusterOptions{
|
|
Addrs: o.Addrs,
|
|
ClientName: o.ClientName,
|
|
Dialer: o.Dialer,
|
|
OnConnect: o.OnConnect,
|
|
|
|
Protocol: o.Protocol,
|
|
Username: o.Username,
|
|
Password: o.Password,
|
|
|
|
MaxRedirects: o.MaxRedirects,
|
|
ReadOnly: o.ReadOnly,
|
|
RouteByLatency: o.RouteByLatency,
|
|
RouteRandomly: o.RouteRandomly,
|
|
|
|
MaxRetries: o.MaxRetries,
|
|
MinRetryBackoff: o.MinRetryBackoff,
|
|
MaxRetryBackoff: o.MaxRetryBackoff,
|
|
|
|
DialTimeout: o.DialTimeout,
|
|
ReadTimeout: o.ReadTimeout,
|
|
WriteTimeout: o.WriteTimeout,
|
|
ContextTimeoutEnabled: o.ContextTimeoutEnabled,
|
|
|
|
PoolFIFO: o.PoolFIFO,
|
|
|
|
PoolSize: o.PoolSize,
|
|
PoolTimeout: o.PoolTimeout,
|
|
MinIdleConns: o.MinIdleConns,
|
|
MaxIdleConns: o.MaxIdleConns,
|
|
MaxActiveConns: o.MaxActiveConns,
|
|
ConnMaxIdleTime: o.ConnMaxIdleTime,
|
|
ConnMaxLifetime: o.ConnMaxLifetime,
|
|
|
|
TLSConfig: o.TLSConfig,
|
|
|
|
DisableIndentity: o.DisableIndentity,
|
|
IdentitySuffix: o.IdentitySuffix,
|
|
UnstableResp3: o.UnstableResp3,
|
|
}
|
|
}
|
|
|
|
// Failover returns failover options created from the universal options.
|
|
func (o *UniversalOptions) Failover() *FailoverOptions {
|
|
if len(o.Addrs) == 0 {
|
|
o.Addrs = []string{"127.0.0.1:26379"}
|
|
}
|
|
|
|
return &FailoverOptions{
|
|
SentinelAddrs: o.Addrs,
|
|
MasterName: o.MasterName,
|
|
ClientName: o.ClientName,
|
|
|
|
Dialer: o.Dialer,
|
|
OnConnect: o.OnConnect,
|
|
|
|
DB: o.DB,
|
|
Protocol: o.Protocol,
|
|
Username: o.Username,
|
|
Password: o.Password,
|
|
SentinelUsername: o.SentinelUsername,
|
|
SentinelPassword: o.SentinelPassword,
|
|
|
|
MaxRetries: o.MaxRetries,
|
|
MinRetryBackoff: o.MinRetryBackoff,
|
|
MaxRetryBackoff: o.MaxRetryBackoff,
|
|
|
|
DialTimeout: o.DialTimeout,
|
|
ReadTimeout: o.ReadTimeout,
|
|
WriteTimeout: o.WriteTimeout,
|
|
ContextTimeoutEnabled: o.ContextTimeoutEnabled,
|
|
|
|
PoolFIFO: o.PoolFIFO,
|
|
PoolSize: o.PoolSize,
|
|
PoolTimeout: o.PoolTimeout,
|
|
MinIdleConns: o.MinIdleConns,
|
|
MaxIdleConns: o.MaxIdleConns,
|
|
MaxActiveConns: o.MaxActiveConns,
|
|
ConnMaxIdleTime: o.ConnMaxIdleTime,
|
|
ConnMaxLifetime: o.ConnMaxLifetime,
|
|
|
|
TLSConfig: o.TLSConfig,
|
|
|
|
DisableIndentity: o.DisableIndentity,
|
|
IdentitySuffix: o.IdentitySuffix,
|
|
UnstableResp3: o.UnstableResp3,
|
|
}
|
|
}
|
|
|
|
// Simple returns basic options created from the universal options.
|
|
func (o *UniversalOptions) Simple() *Options {
|
|
addr := "127.0.0.1:6379"
|
|
if len(o.Addrs) > 0 {
|
|
addr = o.Addrs[0]
|
|
}
|
|
|
|
return &Options{
|
|
Addr: addr,
|
|
ClientName: o.ClientName,
|
|
Dialer: o.Dialer,
|
|
OnConnect: o.OnConnect,
|
|
|
|
DB: o.DB,
|
|
Protocol: o.Protocol,
|
|
Username: o.Username,
|
|
Password: o.Password,
|
|
|
|
MaxRetries: o.MaxRetries,
|
|
MinRetryBackoff: o.MinRetryBackoff,
|
|
MaxRetryBackoff: o.MaxRetryBackoff,
|
|
|
|
DialTimeout: o.DialTimeout,
|
|
ReadTimeout: o.ReadTimeout,
|
|
WriteTimeout: o.WriteTimeout,
|
|
ContextTimeoutEnabled: o.ContextTimeoutEnabled,
|
|
|
|
PoolFIFO: o.PoolFIFO,
|
|
PoolSize: o.PoolSize,
|
|
PoolTimeout: o.PoolTimeout,
|
|
MinIdleConns: o.MinIdleConns,
|
|
MaxIdleConns: o.MaxIdleConns,
|
|
MaxActiveConns: o.MaxActiveConns,
|
|
ConnMaxIdleTime: o.ConnMaxIdleTime,
|
|
ConnMaxLifetime: o.ConnMaxLifetime,
|
|
|
|
TLSConfig: o.TLSConfig,
|
|
|
|
DisableIndentity: o.DisableIndentity,
|
|
IdentitySuffix: o.IdentitySuffix,
|
|
UnstableResp3: o.UnstableResp3,
|
|
}
|
|
}
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
// UniversalClient is an abstract client which - based on the provided options -
|
|
// represents either a ClusterClient, a FailoverClient, or a single-node Client.
|
|
// This can be useful for testing cluster-specific applications locally or having different
|
|
// clients in different environments.
|
|
type UniversalClient interface {
|
|
Cmdable
|
|
AddHook(Hook)
|
|
Watch(ctx context.Context, fn func(*Tx) error, keys ...string) error
|
|
Do(ctx context.Context, args ...interface{}) *Cmd
|
|
Process(ctx context.Context, cmd Cmder) error
|
|
Subscribe(ctx context.Context, channels ...string) *PubSub
|
|
PSubscribe(ctx context.Context, channels ...string) *PubSub
|
|
SSubscribe(ctx context.Context, channels ...string) *PubSub
|
|
Close() error
|
|
PoolStats() *PoolStats
|
|
}
|
|
|
|
var (
|
|
_ UniversalClient = (*Client)(nil)
|
|
_ UniversalClient = (*ClusterClient)(nil)
|
|
_ UniversalClient = (*Ring)(nil)
|
|
)
|
|
|
|
// NewUniversalClient returns a new multi client. The type of the returned client depends
|
|
// on the following conditions:
|
|
//
|
|
// 1. If the MasterName option is specified, a sentinel-backed FailoverClient is returned.
|
|
// 2. if the number of Addrs is two or more, a ClusterClient is returned.
|
|
// 3. Otherwise, a single-node Client is returned.
|
|
func NewUniversalClient(opts *UniversalOptions) UniversalClient {
|
|
if opts.MasterName != "" {
|
|
return NewFailoverClient(opts.Failover())
|
|
} else if len(opts.Addrs) > 1 {
|
|
return NewClusterClient(opts.Cluster())
|
|
}
|
|
return NewClient(opts.Simple())
|
|
}
|