Add existing code change to support dcc with v9.6.1

grab · Oct 3, 2024 · cd47349 · cd47349
1 parent 034a7da
commit cd47349
Show file tree

Hide file tree

Showing 12 changed files with 2,084 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Redis client for Go
 
 [![build workflow](https://github.com/redis/go-redis/actions/workflows/build.yml/badge.svg)](https://github.com/redis/go-redis/actions)
-[![PkgGoDev](https://pkg.go.dev/badge/github.com/redis/go-redis/v9)](https://pkg.go.dev/github.com/redis/go-redis/v9?tab=doc)
+[![PkgGoDev](https://pkg.go.dev/badge/gitlab.myteksi.net/dbops/Redis/v9)](https://pkg.go.dev/gitlab.myteksi.net/dbops/Redis/v9?tab=doc)
 [![Documentation](https://img.shields.io/badge/redis-documentation-informational)](https://redis.uptrace.dev/)
 [![Chat](https://discordapp.com/api/guilds/752070105847955518/widget.png)](https://discord.gg/rWtp5Aj)
 
@@ -36,8 +36,8 @@
 
 - [Discussions](https://github.com/redis/go-redis/discussions)
 - [Chat](https://discord.gg/rWtp5Aj)
-- [Reference](https://pkg.go.dev/github.com/redis/go-redis/v9)
-- [Examples](https://pkg.go.dev/github.com/redis/go-redis/v9#pkg-examples)
+- [Reference](https://pkg.go.dev/gitlab.myteksi.net/dbops/Redis/v9)
+- [Examples](https://pkg.go.dev/gitlab.myteksi.net/dbops/Redis/v9#pkg-examples)
 
 ## Ecosystem
 
@@ -75,7 +75,7 @@ go mod init github.com/my/repo
 Then install go-redis/**v9**:
 
 ```shell
-go get github.com/redis/go-redis/v9
+go get gitlab.myteksi.net/dbops/Redis/v9
 ```
 
 ## Quickstart
@@ -85,7 +85,7 @@ import (
     "context"
     "fmt"
 
-    "github.com/redis/go-redis/v9"
+    "gitlab.myteksi.net/dbops/Redis/v9"
 )
 
 var ctx = context.Background()
@@ -143,7 +143,10 @@ to this specification.
 
 ```go
 import (
-    "github.com/redis/go-redis/v9"
+    "context"
+    "fmt"
+
+    "gitlab.myteksi.net/dbops/Redis/v9"
 )
 
 func ExampleClient() *redis.Client {
@@ -158,30 +161,6 @@ func ExampleClient() *redis.Client {
 
 ```
 
-
-### Advanced Configuration
-
-go-redis supports extending the client identification phase to allow projects to send their own custom client identification.
-
-#### Default Client Identification
-
-By default, go-redis automatically sends the client library name and version during the connection process. This feature is available in redis-server as of version 7.2. As a result, the command is "fire and forget", meaning it should fail silently, in the case that the redis server does not support this feature.
-
-#### Disabling Identity Verification
-
-When connection identity verification is not required or needs to be explicitly disabled, a `DisableIndentity` configuration option exists. In V10 of this library, `DisableIndentity` will become `DisableIdentity` in order to fix the associated typo.
-
-To disable verification, set the `DisableIndentity` option to `true` in the Redis client options:
-
-```go
-rdb := redis.NewClient(&redis.Options{
-    Addr:            "localhost:6379",
-    Password:        "",
-    DB:              0,
-    DisableIndentity: true, // Disable set-info on connect
-})
-```
-
 ## Contributing
 
 Please see [out contributing guidelines](CONTRIBUTING.md) to help us improve this library!

diff --git a/cluster_dynamic.go b/cluster_dynamic.go
@@ -0,0 +1,271 @@
+package redis
+
+import (
+	"context"
+	"crypto/tls"
+	"runtime"
+	"time"
+
+	"gitlab.myteksi.net/dbops/Redis/v9/internal"
+)
+
+// NewDynamicClusterClient is similar to NewClusterClient, but it supports dynamic connection pool management
+// in exiting clients if NewClient option is not specific in ClusterOptions
+func NewDynamicClusterClient(opt *ClusterOptions) *ClusterClient {
+	if opt.NewClient == nil {
+		opt.NewClient = NewDynamicClient
+	}
+
+	return NewClusterClient(opt)
+}
+
+func (c *ClusterClient) SetMaxRedirects(maxRedirects int) {
+	if maxRedirects == -1 {
+		maxRedirects = 0
+	} else if maxRedirects == 0 {
+		maxRedirects = 3
+	}
+
+	c.opt.MaxRedirects = maxRedirects
+}
+
+func (c *ClusterClient) SetReadOnly(readOnly bool) {
+	c.opt.ReadOnly = readOnly
+}
+
+func (c *ClusterClient) SetRouteByLatency(routeByLatency bool) {
+	if routeByLatency {
+		c.opt.ReadOnly = true
+		for _, node := range c.nodes.nodes {
+			go node.updateLatency()
+		}
+	}
+	c.opt.RouteByLatency = routeByLatency
+}
+
+func (c *ClusterClient) SetRouteRandomly(routeRandomly bool) {
+	if routeRandomly {
+		c.opt.ReadOnly = true
+	}
+	c.opt.RouteRandomly = routeRandomly
+}
+
+func (c *ClusterClient) SetUsername(username string) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetUsername(username)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetUsername failed: %s", err)
+		return
+	}
+
+	c.opt.Username = username
+}
+
+func (c *ClusterClient) SetPassword(password string) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetPassword(password)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetPassword failed: %s", err)
+		return
+	}
+
+	c.opt.Password = password
+}
+
+func (c *ClusterClient) SetMaxRetries(maxRetries int) {
+	if maxRetries == 0 {
+		maxRetries = -1
+	}
+
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetMaxRetries(maxRetries)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetMaxRetries failed: %s", err)
+		return
+	}
+
+	c.opt.MaxRetries = maxRetries
+}
+
+func (c *ClusterClient) SetMinRetryBackoff(minRetryBackoff time.Duration) {
+	if minRetryBackoff == -1 {
+		minRetryBackoff = 0
+	} else if minRetryBackoff == 0 {
+		minRetryBackoff = 8 * time.Millisecond
+	}
+
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetMinRetryBackoff(minRetryBackoff)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetMinRetryBackoff failed: %s", err)
+		return
+	}
+
+	c.opt.MinRetryBackoff = minRetryBackoff
+}
+
+func (c *ClusterClient) SetMaxRetryBackoff(maxRetryBackoff time.Duration) {
+	if maxRetryBackoff == -1 {
+		maxRetryBackoff = 0
+	} else if maxRetryBackoff == 0 {
+		maxRetryBackoff = 512 * time.Millisecond
+	}
+
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetMaxRetryBackoff(maxRetryBackoff)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetMaxRetryBackoff failed: %s", err)
+		return
+	}
+
+	c.opt.MaxRetryBackoff = maxRetryBackoff
+}
+
+func (c *ClusterClient) SetDialTimeout(dialTimeout time.Duration) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetDialTimeout(dialTimeout)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetDialTimeout failed: %s", err)
+		return
+	}
+
+	c.opt.DialTimeout = dialTimeout
+}
+
+func (c *ClusterClient) SetReadTimeout(readTimeout time.Duration) {
+	if readTimeout == -1 {
+		readTimeout = 0
+	} else if readTimeout == 0 {
+		readTimeout = 3 * time.Second
+	}
+
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetReadTimeout(readTimeout)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetReadTimeout failed: %s", err)
+		return
+	}
+
+	c.opt.ReadTimeout = readTimeout
+}
+
+func (c *ClusterClient) SetWriteTimeout(writeTimeout time.Duration) {
+	if writeTimeout == -1 {
+		writeTimeout = 0
+	} else if writeTimeout == 0 {
+		writeTimeout = c.opt.ReadTimeout
+	}
+
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetWriteTimeout(writeTimeout)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetWriteTimeout failed: %s", err)
+		return
+	}
+
+	c.opt.WriteTimeout = writeTimeout
+}
+
+func (c *ClusterClient) SetPoolFIFO(poolFIFO bool) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetPoolFIFO(poolFIFO)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetPoolFIFO failed: %s", err)
+		return
+	}
+
+	c.opt.PoolFIFO = poolFIFO
+}
+
+func (c *ClusterClient) SetPoolSize(poolSize int) {
+	if poolSize == 0 {
+		poolSize = 5 * runtime.GOMAXPROCS(0)
+	}
+
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetPoolSize(poolSize)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetPoolSize failed: %s", err)
+		return
+	}
+
+	c.opt.PoolSize = poolSize
+}
+
+func (c *ClusterClient) SetMinIdleConns(minIdleConns int) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetMinIdleConns(minIdleConns)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetMinIdleConns failed: %s", err)
+		return
+	}
+
+	c.opt.MinIdleConns = minIdleConns
+}
+
+func (c *ClusterClient) SetMaxIdleConns(maxIdleConns int) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetMaxIdleConns(maxIdleConns)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetMaxIdleConns failed: %s", err)
+		return
+	}
+
+	c.opt.MaxIdleConns = maxIdleConns
+}
+
+func (c *ClusterClient) SetConnMaxLifetime(connMaxLifetime time.Duration) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetConnMaxLifetime(connMaxLifetime)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetConnMaxLifetimefailed: %s", err)
+		return
+	}
+
+	c.opt.ConnMaxLifetime = connMaxLifetime
+}
+
+func (c *ClusterClient) SetPoolTimeout(poolTimeout time.Duration) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetPoolTimeout(poolTimeout)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetPoolTimeout failed: %s", err)
+		return
+	}
+
+	c.opt.PoolTimeout = poolTimeout
+}
+
+func (c *ClusterClient) SetConnMaxIdleTimeout(idleTimeout time.Duration) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetConnMaxIdleTime(idleTimeout)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetIdleTimeout failed: %s", err)
+		return
+	}
+
+	c.opt.ConnMaxIdleTime = idleTimeout
+}
+
+func (c *ClusterClient) SetTLSConfig(tlsConfig *tls.Config) {
+	if err := c.applyUpdateFn(func(client *Client) {
+		client.SetTLSConfig(tlsConfig)
+	}); err != nil {
+		internal.Logger.Printf(context.Background(), "SetTLSConfig failed: %s", err)
+		return
+	}
+
+	c.opt.TLSConfig = tlsConfig
+}
+
+func (c *ClusterClient) applyUpdateFn(fn func(client *Client)) error {
+	nodes, err := c.nodes.All()
+	if err != nil {
+		return err
+	}
+
+	for _, node := range nodes {
+		fn(node.Client)
+	}
+	return nil
+}