update the reference to forked redis v9

Runze Cui · Runze Cui · commit d7b3e46cc9e4 · 2024-09-05T16:40:41.000+08:00
diff --git a/cluster_dynamic.go b/cluster_dynamic.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/redis/go-redis/v9/internal"
+	"gitlab.myteksi.net/dbops/Redis/v9/internal"
 )
 
 // NewDynamicClusterClient is similar to NewClusterClient, but it supports dynamic connection pool management
diff --git a/cluster_dynamic_test.go b/cluster_dynamic_test.go
@@ -8,7 +8,7 @@ import (
 	. "github.com/bsm/ginkgo/v2"
 	. "github.com/bsm/gomega"
 
-	"github.com/redis/go-redis/v9"
+	"gitlab.myteksi.net/dbops/Redis/v9"
 )
 
 var _ = Describe("Dynamic ClusterClient", func() {
diff --git a/extra/rediscensus/go.sum b/extra/rediscensus/go.sum
@@ -2,8 +2,10 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
 github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
 github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
diff --git a/extra/rediscmd/go.mod b/extra/rediscmd/go.mod
@@ -5,7 +5,7 @@ go 1.15
 replace gitlab.myteksi.net/dbops/Redis/v9 => ../..
 
 require (
-	github.com/bsm/ginkgo/v2 v2.7.0
-	github.com/bsm/gomega v1.26.0
+	github.com/bsm/ginkgo/v2 v2.12.0
+	github.com/bsm/gomega v1.27.10
 	gitlab.myteksi.net/dbops/Redis/v9 v9.5.0
 )
diff --git a/extra/rediscmd/go.sum b/extra/rediscmd/go.sum
@@ -1,7 +1,9 @@
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
 github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
 github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
diff --git a/extra/redisotel/go.sum b/extra/redisotel/go.sum
@@ -1,7 +1,9 @@
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
 github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
 github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
diff --git a/internal/pool/pool_dynamic.go b/internal/pool/pool_dynamic.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/redis/go-redis/v9/internal"
+	"gitlab.myteksi.net/dbops/Redis/v9/internal"
 )
 
 const (
diff --git a/redis_dynamic.go b/redis_dynamic.go
@@ -7,8 +7,8 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/redis/go-redis/v9/internal"
-	"github.com/redis/go-redis/v9/internal/pool"
+	"gitlab.myteksi.net/dbops/Redis/v9/internal"
+	"gitlab.myteksi.net/dbops/Redis/v9/internal/pool"
 )
 
 // NewDynamicClient is similar to NewClient, but it uses a dynamic pool instead to provide dynamic connection management
diff --git a/redis_dynamic_test.go b/redis_dynamic_test.go
@@ -162,6 +162,10 @@ var limiterError = fmt.Errorf("limiter error")
 type errorLimiter struct {
 }
 
+func (*errorLimiter) Execute(f func() error) error {
+	return limiterError
+}
+
 func (*errorLimiter) Allow() error {
 	return limiterError
 }
@@ -174,6 +178,10 @@ type normalLimiter struct {
 	errors []error
 }
 
+func (*normalLimiter) Execute(f func() error) error {
+	return nil
+}
+
 func (*normalLimiter) Allow() error {
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"runtime"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.com/redis/go-redis/v9/internal"`
	`9`	`+ "gitlab.myteksi.net/dbops/Redis/v9/internal"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// NewDynamicClusterClient is similar to NewClusterClient, but it supports dynamic connection pool management`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`. "github.com/bsm/ginkgo/v2"`
`9`	`9`	`. "github.com/bsm/gomega"`
`10`	`10`
`11`		`- "github.com/redis/go-redis/v9"`
	`11`	`+ "gitlab.myteksi.net/dbops/Redis/v9"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var _ = Describe("Dynamic ClusterClient", func() {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ go 1.15`
`5`	`5`	`replace gitlab.myteksi.net/dbops/Redis/v9 => ../..`
`6`	`6`
`7`	`7`	`require (`
`8`		`- github.com/bsm/ginkgo/v2 v2.7.0`
`9`		`- github.com/bsm/gomega v1.26.0`
	`8`	`+ github.com/bsm/ginkgo/v2 v2.12.0`
	`9`	`+ github.com/bsm/gomega v1.27.10`
`10`	`10`	`gitlab.myteksi.net/dbops/Redis/v9 v9.5.0`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"sync/atomic"`
`8`	`8`	`"time"`
`9`	`9`
`10`		`- "github.com/redis/go-redis/v9/internal"`
	`10`	`+ "gitlab.myteksi.net/dbops/Redis/v9/internal"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"runtime"`
`8`	`8`	`"time"`
`9`	`9`
`10`		`- "github.com/redis/go-redis/v9/internal"`
`11`		`- "github.com/redis/go-redis/v9/internal/pool"`
	`10`	`+ "gitlab.myteksi.net/dbops/Redis/v9/internal"`
	`11`	`+ "gitlab.myteksi.net/dbops/Redis/v9/internal/pool"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// NewDynamicClient is similar to NewClient, but it uses a dynamic pool instead to provide dynamic connection management`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,10 @@ var limiterError = fmt.Errorf("limiter error")`
`162`	`162`	`type errorLimiter struct {`
`163`	`163`	`}`
`164`	`164`
	`165`	`+func (*errorLimiter) Execute(f func() error) error {`
	`166`	`+ return limiterError`
	`167`	`+}`
	`168`	`+`
`165`	`169`	`func (*errorLimiter) Allow() error {`
`166`	`170`	`return limiterError`
`167`	`171`	`}`
`@@ -174,6 +178,10 @@ type normalLimiter struct {`
`174`	`178`	`errors []error`
`175`	`179`	`}`
`176`	`180`
	`181`	`+func (*normalLimiter) Execute(f func() error) error {`
	`182`	`+ return nil`
	`183`	`+}`
	`184`	`+`
`177`	`185`	`func (*normalLimiter) Allow() error {`
`178`	`186`	`return nil`
`179`	`187`	`}`