chore: v9

This commit is contained in:
Vladimir Mihailenco 2022-06-04 17:39:21 +03:00
parent a8e56a2961
commit a18fad5bd3
66 changed files with 107 additions and 114 deletions

View File

@ -63,13 +63,13 @@ module:
go mod init github.com/my/repo
```
And then install go-redis/v8 (note _v8_ in the import; omitting it is a popular mistake):
If you are using **Redis 6**, install go-redis/**v8**:
```shell
go get github.com/go-redis/redis/v8
```
If you need **Redis 7** support, install go-redis/v9:
If you are using **Redis 7**, install **go-redis/v9**:
```shell
go get github.com/go-redis/redis/v9

View File

@ -8,7 +8,7 @@ import (
"testing"
"time"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal/proto"
)
var ctx = context.TODO()

View File

@ -10,7 +10,7 @@ import (
"testing"
"time"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
func benchmarkRedisClient(ctx context.Context, poolSize int) *redis.Client {

View File

@ -12,11 +12,11 @@ import (
"sync/atomic"
"time"
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/hashtag"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v8/internal/rand"
"github.com/go-redis/redis/v9/internal"
"github.com/go-redis/redis/v9/internal/hashtag"
"github.com/go-redis/redis/v9/internal/pool"
"github.com/go-redis/redis/v9/internal/proto"
"github.com/go-redis/redis/v9/internal/rand"
)
var errClusterNoNodes = fmt.Errorf("redis: cluster has no nodes")

View File

@ -12,8 +12,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v8/internal/hashtag"
"github.com/go-redis/redis/v9"
"github.com/go-redis/redis/v9/internal/hashtag"
)
type clusterScenario struct {

View File

@ -7,10 +7,10 @@ import (
"strconv"
"time"
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/hscan"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v8/internal/util"
"github.com/go-redis/redis/v9/internal"
"github.com/go-redis/redis/v9/internal/hscan"
"github.com/go-redis/redis/v9/internal/proto"
"github.com/go-redis/redis/v9/internal/util"
)
type Cmder interface {

View File

@ -4,7 +4,7 @@ import (
"errors"
"time"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

View File

@ -6,7 +6,7 @@ import (
"io"
"time"
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v9/internal"
)
// KeepTTL is a Redis KEEPTTL option to keep existing TTL, it requires your redis-server version >= 6.0,

View File

@ -10,8 +10,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9"
"github.com/go-redis/redis/v9/internal/proto"
)
var _ = Describe("Commands", func() {

View File

@ -6,8 +6,8 @@ import (
"net"
"strings"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal/pool"
"github.com/go-redis/redis/v9/internal/proto"
)
// ErrClosed performs any operation on the closed client will return this error.

View File

@ -2,6 +2,6 @@ module github.com/go-redis/redis/example/del-keys-without-ttl
go 1.14
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
require github.com/go-redis/redis/v8 v8.11.5
require github.com/go-redis/redis/v9 v8.11.5

View File

@ -5,7 +5,7 @@ import (
"fmt"
"sync"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
func main() {

View File

@ -2,6 +2,6 @@ module github.com/go-redis/redis/example/hll
go 1.14
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
require github.com/go-redis/redis/v8 v8.11.5
require github.com/go-redis/redis/v9 v8.11.5

View File

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
func main() {

View File

@ -2,6 +2,6 @@ module github.com/go-redis/redis/example/redis-bloom
go 1.14
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
require github.com/go-redis/redis/v8 v8.11.5
require github.com/go-redis/redis/v9 v8.11.5

View File

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
func main() {

View File

@ -2,15 +2,13 @@ module github.com/go-redis/redis/example/otel
go 1.14
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
replace github.com/go-redis/redis/extra/redisotel/v8 => ../../extra/redisotel
replace github.com/go-redis/redis/extra/redisotel/v9 => ../../extra/redisotel
replace github.com/go-redis/redis/extra/rediscmd/v8 => ../../extra/rediscmd
replace github.com/go-redis/redis/extra/rediscmd/v9 => ../../extra/rediscmd
require (
github.com/go-redis/redis/extra/redisotel/v8 v8.11.5
github.com/go-redis/redis/v8 v8.11.5
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.10
go.opentelemetry.io/otel v1.5.0
go.opentelemetry.io/otel/exporters/jaeger v1.5.0 // indirect

View File

@ -10,8 +10,8 @@ import (
"go.opentelemetry.io/otel/codes"
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
"github.com/go-redis/redis/extra/redisotel/v8"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/extra/redisotel/v9"
"github.com/go-redis/redis/v9"
)
var tracer = otel.Tracer("redisexample")

View File

@ -2,6 +2,6 @@ module github.com/go-redis/redis/example/redis-bloom
go 1.14
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
require github.com/go-redis/redis/v8 v8.11.5
require github.com/go-redis/redis/v9 v8.11.5

View File

@ -5,7 +5,7 @@ import (
"fmt"
"math/rand"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
func main() {

View File

@ -2,9 +2,9 @@ module github.com/go-redis/redis/example/scan-struct
go 1.14
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
require (
github.com/davecgh/go-spew v1.1.1
github.com/go-redis/redis/v8 v8.11.5
github.com/go-redis/redis/v9 v8.11.5
)

View File

@ -5,7 +5,7 @@ import (
"github.com/davecgh/go-spew/spew"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
type Model struct {

View File

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
type redisHook struct{}

View File

@ -7,7 +7,7 @@ import (
"sync"
"time"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var (

View File

@ -6,9 +6,9 @@ import (
"net"
"strings"
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/hashtag"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v9/internal"
"github.com/go-redis/redis/v9/internal/hashtag"
"github.com/go-redis/redis/v9/internal/pool"
)
func (c *baseClient) Pool() pool.Pooler {

View File

@ -1,14 +1,12 @@
module github.com/go-redis/redis/extra/rediscensus/v8
module github.com/go-redis/redis/extra/rediscensus/v9
go 1.15
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
replace github.com/go-redis/redis/extra/rediscmd/v8 => ../rediscmd
replace github.com/go-redis/redis/extra/rediscmd/v9 => ../rediscmd
require (
github.com/go-redis/redis/extra/rediscmd/v8 v8.11.5
github.com/go-redis/redis/v8 v8.11.5
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
go.opencensus.io v0.23.0
)

View File

@ -5,8 +5,8 @@ import (
"go.opencensus.io/trace"
"github.com/go-redis/redis/extra/rediscmd/v8"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/extra/rediscmd/v9"
"github.com/go-redis/redis/v9"
)
type TracingHook struct{}

View File

@ -1,11 +1,10 @@
module github.com/go-redis/redis/extra/rediscmd/v8
module github.com/go-redis/redis/extra/rediscmd/v9
go 1.15
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
require (
github.com/go-redis/redis/v8 v8.11.5
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.18.1
)

View File

@ -7,7 +7,7 @@ import (
"strings"
"time"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
func CmdString(cmd redis.Cmder) string {

View File

@ -3,7 +3,7 @@
## Installation
```bash
go get github.com/go-redis/redis/extra/redisotel/v8
go get github.com/go-redis/redis/extra/redisotel/v9
```
## Usage
@ -12,8 +12,8 @@ Tracing is enabled by adding a hook:
```go
import (
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/extra/redisotel"
"github.com/go-redis/redis/v9"
"github.com/go-redis/redis/extra/redisotel/v9"
)
rdb := rdb.NewClient(&rdb.Options{...})

View File

@ -1,14 +1,12 @@
module github.com/go-redis/redis/extra/redisotel/v8
module github.com/go-redis/redis/extra/redisotel/v9
go 1.15
replace github.com/go-redis/redis/v8 => ../..
replace github.com/go-redis/redis/v9 => ../..
replace github.com/go-redis/redis/extra/rediscmd/v8 => ../rediscmd
replace github.com/go-redis/redis/extra/rediscmd/v9 => ../rediscmd
require (
github.com/go-redis/redis/extra/rediscmd/v8 v8.11.5
github.com/go-redis/redis/v8 v8.11.5
go.opentelemetry.io/otel v1.5.0
go.opentelemetry.io/otel/sdk v1.4.1
go.opentelemetry.io/otel/trace v1.5.0

View File

@ -9,8 +9,8 @@ import (
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
"go.opentelemetry.io/otel/trace"
"github.com/go-redis/redis/extra/rediscmd/v8"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/extra/rediscmd/v9"
"github.com/go-redis/redis/v9"
)
const (

View File

@ -10,8 +10,8 @@ import (
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/trace"
"github.com/go-redis/redis/extra/redisotel/v8"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/extra/redisotel/v9"
"github.com/go-redis/redis/v9"
)
func TestNew(t *testing.T) {

View File

@ -7,7 +7,7 @@ import (
"context"
"time"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var (

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/go-redis/redis/v8
module github.com/go-redis/redis/v9
go 1.17

View File

@ -3,7 +3,7 @@ package hashtag
import (
"strings"
"github.com/go-redis/redis/v8/internal/rand"
"github.com/go-redis/redis/v9/internal/rand"
)
const slotNumber = 16384

View File

@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8/internal/rand"
"github.com/go-redis/redis/v9/internal/rand"
)
func TestGinkgoSuite(t *testing.T) {

View File

@ -3,7 +3,7 @@ package internal
import (
"time"
"github.com/go-redis/redis/v8/internal/rand"
"github.com/go-redis/redis/v9/internal/rand"
)
func RetryBackoff(retry int, minBackoff, maxBackoff time.Duration) time.Duration {

View File

@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v9/internal/pool"
)
type poolGetPutBenchmark struct {

View File

@ -7,7 +7,7 @@ import (
"sync/atomic"
"time"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal/proto"
)
var noDeadline = time.Time{}

View File

@ -8,7 +8,7 @@ import (
"sync/atomic"
"time"
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v9/internal"
)
var (

View File

@ -10,7 +10,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v9/internal/pool"
)
var _ = Describe("ConnPool", func() {

View File

@ -9,7 +9,7 @@ import (
"math/big"
"strconv"
"github.com/go-redis/redis/v8/internal/util"
"github.com/go-redis/redis/v9/internal/util"
)
// redis resp protocol data type.

View File

@ -5,7 +5,7 @@ import (
"io"
"testing"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal/proto"
)
func BenchmarkReader_ParseReply_Status(b *testing.B) {

View File

@ -7,7 +7,7 @@ import (
"reflect"
"time"
"github.com/go-redis/redis/v8/internal/util"
"github.com/go-redis/redis/v9/internal/util"
)
// Scan parses bytes `b` to `v` with appropriate type.

View File

@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal/proto"
)
type testScanSliceStruct struct {

View File

@ -8,7 +8,7 @@ import (
"strconv"
"time"
"github.com/go-redis/redis/v8/internal/util"
"github.com/go-redis/redis/v9/internal/util"
)
type writer interface {

View File

@ -11,7 +11,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal/proto"
)
type MyType struct{}

View File

@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/go-redis/redis/v8/internal/util"
"github.com/go-redis/redis/v9/internal/util"
)
func Sleep(ctx context.Context, dur time.Duration) error {

View File

@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("ScanIterator", func() {

View File

@ -15,7 +15,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
const (

View File

@ -13,7 +13,7 @@ import (
"strings"
"time"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v9/internal/pool"
)
// Limiter is the interface of a rate limiter or a circuit breaker.

View File

@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("pipelining", func() {

View File

@ -7,7 +7,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("pool", func() {

View File

@ -7,9 +7,9 @@ import (
"sync"
"time"
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal"
"github.com/go-redis/redis/v9/internal/pool"
"github.com/go-redis/redis/v9/internal/proto"
)
// PubSub implements Pub/Sub commands as described in

View File

@ -9,7 +9,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("PubSub", func() {

View File

@ -13,7 +13,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("races", func() {

View File

@ -7,9 +7,9 @@ import (
"sync/atomic"
"time"
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal"
"github.com/go-redis/redis/v9/internal/pool"
"github.com/go-redis/redis/v9/internal/proto"
)
// Nil reply returned by Redis when key does not exist.

View File

@ -11,7 +11,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
type redisHookError struct {

View File

@ -14,10 +14,10 @@ import (
"github.com/cespare/xxhash/v2"
rendezvous "github.com/dgryski/go-rendezvous" //nolint
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/hashtag"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v8/internal/rand"
"github.com/go-redis/redis/v9/internal"
"github.com/go-redis/redis/v9/internal/hashtag"
"github.com/go-redis/redis/v9/internal/pool"
"github.com/go-redis/redis/v9/internal/rand"
)
var errRingShardsDown = errors.New("redis: all ring shards are down")

View File

@ -12,7 +12,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("Redis Ring", func() {

View File

@ -9,9 +9,9 @@ import (
"sync"
"time"
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v8/internal/rand"
"github.com/go-redis/redis/v9/internal"
"github.com/go-redis/redis/v9/internal/pool"
"github.com/go-redis/redis/v9/internal/rand"
)
//------------------------------------------------------------------------------

View File

@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("Sentinel", func() {

4
tx.go
View File

@ -3,8 +3,8 @@ package redis
import (
"context"
"github.com/go-redis/redis/v8/internal/pool"
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v9/internal/pool"
"github.com/go-redis/redis/v9/internal/proto"
)
// TxFailedErr transaction redis failed.

View File

@ -8,7 +8,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("Tx", func() {

View File

@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v9"
)
var _ = Describe("UniversalClient", func() {