Upgrade go-redis

bringg · Jan 23, 2024 · 4da6311 · 4da6311
1 parent bfed31b
commit 4da6311
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 50 deletions.
diff --git a/algorithm/cloudflare/redis_store.go b/algorithm/cloudflare/redis_store.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 
 	"github.com/bringg/go_redis_ratelimit/algorithm"
 )

diff --git a/algorithm/gcra/gcra.go b/algorithm/gcra/gcra.go
@@ -4,7 +4,7 @@ package gcra
 import (
 	"context"
 
-	"github.com/go-redis/redis_rate/v9"
+	"github.com/go-redis/redis_rate/v10"
 
 	"github.com/bringg/go_redis_ratelimit/algorithm"
 )

diff --git a/algorithm/model.go b/algorithm/model.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 )
 
 var Registry []*RegInfo
@@ -25,13 +25,16 @@ type (
 		Del(ctx context.Context, keys ...string) *redis.IntCmd
 		ScriptLoad(ctx context.Context, script string) *redis.StringCmd
 		ScriptExists(ctx context.Context, hashes ...string) *redis.BoolSliceCmd
-		ZAdd(ctx context.Context, key string, members ...*redis.Z) *redis.IntCmd
+		ZAdd(ctx context.Context, key string, members ...redis.Z) *redis.IntCmd
 		Expire(ctx context.Context, key string, expiration time.Duration) *redis.BoolCmd
 		ZRemRangeByScore(ctx context.Context, key string, min string, max string) *redis.IntCmd
 		Eval(ctx context.Context, script string, keys []string, args ...interface{}) *redis.Cmd
 		EvalSha(ctx context.Context, sha1 string, keys []string, args ...interface{}) *redis.Cmd
 		TxPipelined(ctx context.Context, fn func(pipe redis.Pipeliner) error) ([]redis.Cmder, error)
 		ZRangeByScoreWithScores(ctx context.Context, key string, opt *redis.ZRangeBy) *redis.ZSliceCmd
+
+		EvalRO(ctx context.Context, script string, keys []string, args ...interface{}) *redis.Cmd
+		EvalShaRO(ctx context.Context, sha1 string, keys []string, args ...interface{}) *redis.Cmd
 	}
 
 	Algorithm interface {

diff --git a/algorithm/sliding_window/sliding_window_lua.go b/algorithm/sliding_window/sliding_window_lua.go
@@ -1,6 +1,6 @@
 package sliding_window
 
-import "github.com/go-redis/redis/v8"
+import "github.com/redis/go-redis/v9"
 
 var script = redis.NewScript(`
 -- this script has side-effects, so it requires replicate commands mode

diff --git a/algorithm/sliding_window/v2/sliding_window.go b/algorithm/sliding_window/v2/sliding_window.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 
 	"github.com/bringg/go_redis_ratelimit/algorithm"
 )
@@ -57,7 +57,7 @@ func (c *SlidingWindow) Allow() (r *algorithm.Result, err error) {
 	if err := pipe.ZAdd(
 		ctx,
 		c.key,
-		&redis.Z{
+		redis.Z{
 			Member: nowNanos,
 			Score:  float64(nowNanos),
 		},

diff --git a/examples/cloudflare/main.go b/examples/cloudflare/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 
 	limiter "github.com/bringg/go_redis_ratelimit"
 	"github.com/bringg/go_redis_ratelimit/algorithm/cloudflare"

diff --git a/examples/gcra/main.go b/examples/gcra/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 
 	"github.com/bringg/go_redis_ratelimit"
 	"github.com/bringg/go_redis_ratelimit/algorithm/gcra"

diff --git a/examples/sliding_window/main.go b/examples/sliding_window/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 
 	"github.com/bringg/go_redis_ratelimit"
 	"github.com/bringg/go_redis_ratelimit/algorithm/sliding_window"

diff --git a/go.mod b/go.mod
@@ -5,9 +5,9 @@ go 1.21
 require (
 	github.com/alicebob/miniredis/v2 v2.31.1
 	github.com/coinpaprika/ratelimiter v0.2.1
-	github.com/go-redis/redis/v8 v8.11.4
-	github.com/go-redis/redis_rate/v9 v9.1.2
+	github.com/go-redis/redis_rate/v10 v10.0.1
 	github.com/golangci/golangci-lint v1.55.2
+	github.com/redis/go-redis/v9 v9.4.0
 	github.com/stretchr/testify v1.8.4
 	gotest.tools/gotestsum v1.11.0
 )
@@ -43,7 +43,7 @@ require (
 	github.com/butuzov/mirror v1.1.0 // indirect
 	github.com/catenacyber/perfsprint v0.2.0 // indirect
 	github.com/ccojocar/zxcvbn-go v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/charithe/durationcheck v0.0.10 // indirect
 	github.com/chavacava/garif v0.1.0 // indirect
 	github.com/curioswitch/go-reassign v0.2.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/limiter.go b/limiter.go
@@ -3,7 +3,7 @@ package go_redis_ratelimit
 import (
 	"errors"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 
 	"github.com/bringg/go_redis_ratelimit/algorithm"
 	_ "github.com/bringg/go_redis_ratelimit/algorithm/all"

diff --git a/limiter_test.go b/limiter_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/alicebob/miniredis/v2"
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/go-redis/redis/v8"
+    	"github.com/redis/go-redis/v9"
     	"github.com/bringg/go_redis_ratelimit/algorithm"
     )
@@ Expand Down @@