Skip to content

Commit 27f0add

Browse files
vmihailencovmihailenco
authored
Merge pull request #2111 from go-redis/chore/v9
chore: v9
2 parents a8e56a2 + a18fad5 commit 27f0add

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+107
-114
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ module:
6363
go mod init github.com/my/repo
6464
```
6565

66-
And then install go-redis/v8 (note _v8_ in the import; omitting it is a popular mistake):
66+
If you are using **Redis 6**, install go-redis/**v8**:
6767

6868
```shell
6969
go get github.com/go-redis/redis/v8
7070
```
7171

72-
If you need **Redis 7** support, install go-redis/v9:
72+
If you are using **Redis 7**, install **go-redis/v9**:
7373

7474
```shell
7575
go get github.com/go-redis/redis/v9

‎bench_decode_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/go-redis/redis/v8/internal/proto"
11+
"github.com/go-redis/redis/v9/internal/proto"
1212
)
1313

1414
var ctx = context.TODO()

‎bench_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/go-redis/redis/v8"
13+
"github.com/go-redis/redis/v9"
1414
)
1515

1616
func benchmarkRedisClient(ctx context.Context, poolSize int) *redis.Client {

‎cluster.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"sync/atomic"
1313
"time"
1414

15-
"github.com/go-redis/redis/v8/internal"
16-
"github.com/go-redis/redis/v8/internal/hashtag"
17-
"github.com/go-redis/redis/v8/internal/pool"
18-
"github.com/go-redis/redis/v8/internal/proto"
19-
"github.com/go-redis/redis/v8/internal/rand"
15+
"github.com/go-redis/redis/v9/internal"
16+
"github.com/go-redis/redis/v9/internal/hashtag"
17+
"github.com/go-redis/redis/v9/internal/pool"
18+
"github.com/go-redis/redis/v9/internal/proto"
19+
"github.com/go-redis/redis/v9/internal/rand"
2020
)
2121

2222
var errClusterNoNodes = fmt.Errorf("redis: cluster has no nodes")

‎cluster_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
. "github.com/onsi/ginkgo"
1313
. "github.com/onsi/gomega"
1414

15-
"github.com/go-redis/redis/v8"
16-
"github.com/go-redis/redis/v8/internal/hashtag"
15+
"github.com/go-redis/redis/v9"
16+
"github.com/go-redis/redis/v9/internal/hashtag"
1717
)
1818

1919
type clusterScenario struct {

‎command.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"strconv"
88
"time"
99

10-
"github.com/go-redis/redis/v8/internal"
11-
"github.com/go-redis/redis/v8/internal/hscan"
12-
"github.com/go-redis/redis/v8/internal/proto"
13-
"github.com/go-redis/redis/v8/internal/util"
10+
"github.com/go-redis/redis/v9/internal"
11+
"github.com/go-redis/redis/v9/internal/hscan"
12+
"github.com/go-redis/redis/v9/internal/proto"
13+
"github.com/go-redis/redis/v9/internal/util"
1414
)
1515

1616
type Cmder interface {

‎command_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"time"
66

7-
"github.com/go-redis/redis/v8"
7+
"github.com/go-redis/redis/v9"
88

99
. "github.com/onsi/ginkgo"
1010
. "github.com/onsi/gomega"

‎commands.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"io"
77
"time"
88

9-
"github.com/go-redis/redis/v8/internal"
9+
"github.com/go-redis/redis/v9/internal"
1010
)
1111

1212
// KeepTTL is a Redis KEEPTTL option to keep existing TTL, it requires your redis-server version >= 6.0,

‎commands_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
. "github.com/onsi/ginkgo"
1111
. "github.com/onsi/gomega"
1212

13-
"github.com/go-redis/redis/v8"
14-
"github.com/go-redis/redis/v8/internal/proto"
13+
"github.com/go-redis/redis/v9"
14+
"github.com/go-redis/redis/v9/internal/proto"
1515
)
1616

1717
var _ = Describe("Commands", func() {

‎error.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"net"
77
"strings"
88

9-
"github.com/go-redis/redis/v8/internal/pool"
10-
"github.com/go-redis/redis/v8/internal/proto"
9+
"github.com/go-redis/redis/v9/internal/pool"
10+
"github.com/go-redis/redis/v9/internal/proto"
1111
)
1212

1313
// ErrClosed performs any operation on the closed client will return this error.

‎example/del-keys-without-ttl/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module github.com/go-redis/redis/example/del-keys-without-ttl
22

33
go 1.14
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

7-
require github.com/go-redis/redis/v8 v8.11.5
7+
require github.com/go-redis/redis/v9 v8.11.5

‎example/del-keys-without-ttl/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"sync"
77

8-
"github.com/go-redis/redis/v8"
8+
"github.com/go-redis/redis/v9"
99
)
1010

1111
func main() {

‎example/hll/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module github.com/go-redis/redis/example/hll
22

33
go 1.14
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

7-
require github.com/go-redis/redis/v8 v8.11.5
7+
require github.com/go-redis/redis/v9 v8.11.5

‎example/hll/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/go-redis/redis/v8"
7+
"github.com/go-redis/redis/v9"
88
)
99

1010
func main() {

‎example/lua-scripting/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module github.com/go-redis/redis/example/redis-bloom
22

33
go 1.14
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

7-
require github.com/go-redis/redis/v8 v8.11.5
7+
require github.com/go-redis/redis/v9 v8.11.5

‎example/lua-scripting/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/go-redis/redis/v8"
7+
"github.com/go-redis/redis/v9"
88
)
99

1010
func main() {

‎example/otel/go.mod

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ module github.com/go-redis/redis/example/otel
22

33
go 1.14
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

7-
replace github.com/go-redis/redis/extra/redisotel/v8 => ../../extra/redisotel
7+
replace github.com/go-redis/redis/extra/redisotel/v9 => ../../extra/redisotel
88

9-
replace github.com/go-redis/redis/extra/rediscmd/v8 => ../../extra/rediscmd
9+
replace github.com/go-redis/redis/extra/rediscmd/v9 => ../../extra/rediscmd
1010

1111
require (
12-
github.com/go-redis/redis/extra/redisotel/v8 v8.11.5
13-
github.com/go-redis/redis/v8 v8.11.5
1412
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.10
1513
go.opentelemetry.io/otel v1.5.0
1614
go.opentelemetry.io/otel/exporters/jaeger v1.5.0 // indirect

‎example/otel/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"go.opentelemetry.io/otel/codes"
1111
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
1212

13-
"github.com/go-redis/redis/extra/redisotel/v8"
14-
"github.com/go-redis/redis/v8"
13+
"github.com/go-redis/redis/extra/redisotel/v9"
14+
"github.com/go-redis/redis/v9"
1515
)
1616

1717
var tracer = otel.Tracer("redisexample")

‎example/redis-bloom/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module github.com/go-redis/redis/example/redis-bloom
22

33
go 1.14
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

7-
require github.com/go-redis/redis/v8 v8.11.5
7+
require github.com/go-redis/redis/v9 v8.11.5

‎example/redis-bloom/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"math/rand"
77

8-
"github.com/go-redis/redis/v8"
8+
"github.com/go-redis/redis/v9"
99
)
1010

1111
func main() {

‎example/scan-struct/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module github.com/go-redis/redis/example/scan-struct
22

33
go 1.14
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

77
require (
88
github.com/davecgh/go-spew v1.1.1
9-
github.com/go-redis/redis/v8 v8.11.5
9+
github.com/go-redis/redis/v9 v8.11.5
1010
)

‎example/scan-struct/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/davecgh/go-spew/spew"
77

8-
"github.com/go-redis/redis/v8"
8+
"github.com/go-redis/redis/v9"
99
)
1010

1111
type Model struct {

‎example_instrumentation_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/go-redis/redis/v8"
7+
"github.com/go-redis/redis/v9"
88
)
99

1010
type redisHook struct{}

‎example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/go-redis/redis/v8"
10+
"github.com/go-redis/redis/v9"
1111
)
1212

1313
var (

‎export_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"net"
77
"strings"
88

9-
"github.com/go-redis/redis/v8/internal"
10-
"github.com/go-redis/redis/v8/internal/hashtag"
11-
"github.com/go-redis/redis/v8/internal/pool"
9+
"github.com/go-redis/redis/v9/internal"
10+
"github.com/go-redis/redis/v9/internal/hashtag"
11+
"github.com/go-redis/redis/v9/internal/pool"
1212
)
1313

1414
func (c *baseClient) Pool() pool.Pooler {

‎extra/rediscensus/go.mod

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
module github.com/go-redis/redis/extra/rediscensus/v8
1+
module github.com/go-redis/redis/extra/rediscensus/v9
22

33
go 1.15
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

7-
replace github.com/go-redis/redis/extra/rediscmd/v8 => ../rediscmd
7+
replace github.com/go-redis/redis/extra/rediscmd/v9 => ../rediscmd
88

99
require (
10-
github.com/go-redis/redis/extra/rediscmd/v8 v8.11.5
11-
github.com/go-redis/redis/v8 v8.11.5
1210
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
1311
go.opencensus.io v0.23.0
1412
)

‎extra/rediscensus/rediscensus.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"go.opencensus.io/trace"
77

8-
"github.com/go-redis/redis/extra/rediscmd/v8"
9-
"github.com/go-redis/redis/v8"
8+
"github.com/go-redis/redis/extra/rediscmd/v9"
9+
"github.com/go-redis/redis/v9"
1010
)
1111

1212
type TracingHook struct{}

‎extra/rediscmd/go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
module github.com/go-redis/redis/extra/rediscmd/v8
1+
module github.com/go-redis/redis/extra/rediscmd/v9
22

33
go 1.15
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

77
require (
8-
github.com/go-redis/redis/v8 v8.11.5
98
github.com/onsi/ginkgo v1.16.5
109
github.com/onsi/gomega v1.18.1
1110
)

‎extra/rediscmd/rediscmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/go-redis/redis/v8"
10+
"github.com/go-redis/redis/v9"
1111
)
1212

1313
func CmdString(cmd redis.Cmder) string {

‎extra/redisotel/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Installation
44

55
```bash
6-
go get github.com/go-redis/redis/extra/redisotel/v8
6+
go get github.com/go-redis/redis/extra/redisotel/v9
77
```
88

99
## Usage
@@ -12,8 +12,8 @@ Tracing is enabled by adding a hook:
1212

1313
```go
1414
import (
15-
"github.com/go-redis/redis/v8"
16-
"github.com/go-redis/redis/extra/redisotel"
15+
"github.com/go-redis/redis/v9"
16+
"github.com/go-redis/redis/extra/redisotel/v9"
1717
)
1818

1919
rdb := rdb.NewClient(&rdb.Options{...})

‎extra/redisotel/go.mod

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
module github.com/go-redis/redis/extra/redisotel/v8
1+
module github.com/go-redis/redis/extra/redisotel/v9
22

33
go 1.15
44

5-
replace github.com/go-redis/redis/v8 => ../..
5+
replace github.com/go-redis/redis/v9 => ../..
66

7-
replace github.com/go-redis/redis/extra/rediscmd/v8 => ../rediscmd
7+
replace github.com/go-redis/redis/extra/rediscmd/v9 => ../rediscmd
88

99
require (
10-
github.com/go-redis/redis/extra/rediscmd/v8 v8.11.5
11-
github.com/go-redis/redis/v8 v8.11.5
1210
go.opentelemetry.io/otel v1.5.0
1311
go.opentelemetry.io/otel/sdk v1.4.1
1412
go.opentelemetry.io/otel/trace v1.5.0

‎extra/redisotel/redisotel.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
1010
"go.opentelemetry.io/otel/trace"
1111

12-
"github.com/go-redis/redis/extra/rediscmd/v8"
13-
"github.com/go-redis/redis/v8"
12+
"github.com/go-redis/redis/extra/rediscmd/v9"
13+
"github.com/go-redis/redis/v9"
1414
)
1515

1616
const (

‎extra/redisotel/redisotel_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
sdktrace "go.opentelemetry.io/otel/sdk/trace"
1111
"go.opentelemetry.io/otel/trace"
1212

13-
"github.com/go-redis/redis/extra/redisotel/v8"
14-
"github.com/go-redis/redis/v8"
13+
"github.com/go-redis/redis/extra/redisotel/v9"
14+
"github.com/go-redis/redis/v9"
1515
)
1616

1717
func TestNew(t *testing.T) {

‎fuzz/fuzz.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"time"
99

10-
"github.com/go-redis/redis/v8"
10+
"github.com/go-redis/redis/v9"
1111
)
1212

1313
var (

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/go-redis/redis/v8
1+
module github.com/go-redis/redis/v9
22

33
go 1.17
44

0 commit comments

Comments
 (0)