From 3dcb844106a8c7923822b3f2b02c23dde5bf82e8 Mon Sep 17 00:00:00 2001 From: Vladimir Mihailenco Date: Wed, 11 Mar 2020 16:29:16 +0200 Subject: [PATCH] Bump major version --- bench_test.go | 2 +- cluster.go | 8 ++++---- cluster_test.go | 4 ++-- command.go | 6 +++--- command_test.go | 2 +- commands.go | 2 +- commands_test.go | 4 ++-- error.go | 2 +- example_instrumentation_test.go | 2 +- example_test.go | 2 +- export_test.go | 4 ++-- go.mod | 3 ++- go.sum | 3 +++ internal/pool/bench_test.go | 2 +- internal/pool/conn.go | 4 ++-- internal/pool/pool.go | 2 +- internal/pool/pool_test.go | 2 +- internal/proto/reader.go | 2 +- internal/proto/reader_test.go | 2 +- internal/proto/scan.go | 2 +- internal/proto/write_buffer_test.go | 2 +- internal/proto/writer.go | 2 +- internal/util.go | 2 +- iterator_test.go | 2 +- main_test.go | 2 +- options.go | 4 ++-- pipeline.go | 2 +- pipeline_test.go | 2 +- pool_test.go | 2 +- pubsub.go | 6 +++--- pubsub_test.go | 2 +- race_test.go | 2 +- redis.go | 6 +++--- redis_test.go | 2 +- ring.go | 8 ++++---- ring_test.go | 2 +- sentinel.go | 4 ++-- sentinel_test.go | 2 +- tx.go | 4 ++-- tx_test.go | 2 +- universal_test.go | 2 +- 41 files changed, 63 insertions(+), 59 deletions(-) diff --git a/bench_test.go b/bench_test.go index c20f95dc6..01cc997fd 100644 --- a/bench_test.go +++ b/bench_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" ) func benchmarkRedisClient(ctx context.Context, poolSize int) *redis.Client { diff --git a/cluster.go b/cluster.go index 31eed3d71..b5db59853 100644 --- a/cluster.go +++ b/cluster.go @@ -13,10 +13,10 @@ import ( "sync/atomic" "time" - "github.com/go-redis/redis/v7/internal" - "github.com/go-redis/redis/v7/internal/hashtag" - "github.com/go-redis/redis/v7/internal/pool" - "github.com/go-redis/redis/v7/internal/proto" + "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" ) var errClusterNoNodes = fmt.Errorf("redis: cluster has no nodes") diff --git a/cluster_test.go b/cluster_test.go index 83e120d7b..d05ec6b8a 100644 --- a/cluster_test.go +++ b/cluster_test.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/go-redis/redis/v7" - "github.com/go-redis/redis/v7/internal/hashtag" + "github.com/go-redis/redis/v8" + "github.com/go-redis/redis/v8/internal/hashtag" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/command.go b/command.go index f0a6133ec..1b052bac0 100644 --- a/command.go +++ b/command.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/go-redis/redis/v7/internal" - "github.com/go-redis/redis/v7/internal/proto" - "github.com/go-redis/redis/v7/internal/util" + "github.com/go-redis/redis/v8/internal" + "github.com/go-redis/redis/v8/internal/proto" + "github.com/go-redis/redis/v8/internal/util" ) type Cmder interface { diff --git a/command_test.go b/command_test.go index ed506a45f..5685a6493 100644 --- a/command_test.go +++ b/command_test.go @@ -4,7 +4,7 @@ import ( "errors" "time" - redis "github.com/go-redis/redis/v7" + redis "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/commands.go b/commands.go index 073b7fcc6..742010e87 100644 --- a/commands.go +++ b/commands.go @@ -6,7 +6,7 @@ import ( "io" "time" - "github.com/go-redis/redis/v7/internal" + "github.com/go-redis/redis/v8/internal" ) func usePrecise(dur time.Duration) bool { diff --git a/commands_test.go b/commands_test.go index 7ab355562..3d2dbd49d 100644 --- a/commands_test.go +++ b/commands_test.go @@ -10,8 +10,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/go-redis/redis/v7" - "github.com/go-redis/redis/v7/internal/proto" + "github.com/go-redis/redis/v8" + "github.com/go-redis/redis/v8/internal/proto" ) var _ = Describe("Commands", func() { diff --git a/error.go b/error.go index a84c44f12..964f5cfef 100644 --- a/error.go +++ b/error.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/go-redis/redis/v7/internal/proto" + "github.com/go-redis/redis/v8/internal/proto" ) func isRetryableError(err error, retryTimeout bool) bool { diff --git a/example_instrumentation_test.go b/example_instrumentation_test.go index 7dcb6512c..c68c66fd9 100644 --- a/example_instrumentation_test.go +++ b/example_instrumentation_test.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" ) type redisHook struct{} diff --git a/example_test.go b/example_test.go index 3e14d8dee..1e72bc4d5 100644 --- a/example_test.go +++ b/example_test.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" ) var ctx = context.Background() diff --git a/export_test.go b/export_test.go index 0ffa4fe2f..ede8b304d 100644 --- a/export_test.go +++ b/export_test.go @@ -6,8 +6,8 @@ import ( "net" "strings" - "github.com/go-redis/redis/v7/internal/hashtag" - "github.com/go-redis/redis/v7/internal/pool" + "github.com/go-redis/redis/v8/internal/hashtag" + "github.com/go-redis/redis/v8/internal/pool" ) func (c *baseClient) Pool() pool.Pooler { diff --git a/go.mod b/go.mod index 87805d3d3..5ee8bf687 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ -module github.com/go-redis/redis/v7 +module github.com/go-redis/redis/v8 require ( + github.com/go-redis/redis/v7 v7.2.0 github.com/golang/protobuf v1.3.2 // indirect github.com/kr/pretty v0.1.0 // indirect github.com/onsi/ginkgo v1.10.1 diff --git a/go.sum b/go.sum index fd04528d6..8534318b7 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,9 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/go-redis/redis v6.15.7+incompatible h1:3skhDh95XQMpnqeqNftPkQD9jL9e5e36z/1SUm6dy1U= +github.com/go-redis/redis/v7 v7.2.0 h1:CrCexy/jYWZjW0AyVoHlcJUeZN19VWlbepTh1Vq6dJs= +github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= diff --git a/internal/pool/bench_test.go b/internal/pool/bench_test.go index 0d3620ef8..a43c19e20 100644 --- a/internal/pool/bench_test.go +++ b/internal/pool/bench_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/go-redis/redis/v7/internal/pool" + "github.com/go-redis/redis/v8/internal/pool" ) type poolGetPutBenchmark struct { diff --git a/internal/pool/conn.go b/internal/pool/conn.go index 427e8b1d7..1f856f0e0 100644 --- a/internal/pool/conn.go +++ b/internal/pool/conn.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "time" - "github.com/go-redis/redis/v7/internal" - "github.com/go-redis/redis/v7/internal/proto" + "github.com/go-redis/redis/v8/internal" + "github.com/go-redis/redis/v8/internal/proto" ) var noDeadline = time.Time{} diff --git a/internal/pool/pool.go b/internal/pool/pool.go index a8d8276a9..cabcba1b1 100644 --- a/internal/pool/pool.go +++ b/internal/pool/pool.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - "github.com/go-redis/redis/v7/internal" + "github.com/go-redis/redis/v8/internal" ) var ErrClosed = errors.New("redis: client is closed") diff --git a/internal/pool/pool_test.go b/internal/pool/pool_test.go index f29600f12..cf31d345d 100644 --- a/internal/pool/pool_test.go +++ b/internal/pool/pool_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/go-redis/redis/v7/internal/pool" + "github.com/go-redis/redis/v8/internal/pool" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/internal/proto/reader.go b/internal/proto/reader.go index 24fc0bd86..516a2c12c 100644 --- a/internal/proto/reader.go +++ b/internal/proto/reader.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/go-redis/redis/v7/internal/util" + "github.com/go-redis/redis/v8/internal/util" ) const ( diff --git a/internal/proto/reader_test.go b/internal/proto/reader_test.go index 1e87f34bd..4add5ea0b 100644 --- a/internal/proto/reader_test.go +++ b/internal/proto/reader_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/go-redis/redis/v7/internal/proto" + "github.com/go-redis/redis/v8/internal/proto" ) func BenchmarkReader_ParseReply_Status(b *testing.B) { diff --git a/internal/proto/scan.go b/internal/proto/scan.go index 90c1e4ae6..8fa032317 100644 --- a/internal/proto/scan.go +++ b/internal/proto/scan.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/go-redis/redis/v7/internal/util" + "github.com/go-redis/redis/v8/internal/util" ) func Scan(b []byte, v interface{}) error { diff --git a/internal/proto/write_buffer_test.go b/internal/proto/write_buffer_test.go index 4a9339ee2..ec870f860 100644 --- a/internal/proto/write_buffer_test.go +++ b/internal/proto/write_buffer_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/go-redis/redis/v7/internal/proto" + "github.com/go-redis/redis/v8/internal/proto" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/internal/proto/writer.go b/internal/proto/writer.go index cd83d6580..a7c53c895 100644 --- a/internal/proto/writer.go +++ b/internal/proto/writer.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/go-redis/redis/v7/internal/util" + "github.com/go-redis/redis/v8/internal/util" ) type Writer struct { diff --git a/internal/util.go b/internal/util.go index 0b0afe479..7bdd57ab3 100644 --- a/internal/util.go +++ b/internal/util.go @@ -5,7 +5,7 @@ import ( "reflect" "time" - "github.com/go-redis/redis/v7/internal/util" + "github.com/go-redis/redis/v8/internal/util" "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/trace" diff --git a/iterator_test.go b/iterator_test.go index e9dd06b64..d171d3043 100644 --- a/iterator_test.go +++ b/iterator_test.go @@ -3,7 +3,7 @@ package redis_test import ( "fmt" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/main_test.go b/main_test.go index 470f01297..7a512253f 100644 --- a/main_test.go +++ b/main_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/options.go b/options.go index d6c4176c4..eb24e227d 100644 --- a/options.go +++ b/options.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/go-redis/redis/v7/internal" - "github.com/go-redis/redis/v7/internal/pool" + "github.com/go-redis/redis/v8/internal" + "github.com/go-redis/redis/v8/internal/pool" ) // Limiter is the interface of a rate limiter or a circuit breaker. diff --git a/pipeline.go b/pipeline.go index 44067432a..c6ec34099 100644 --- a/pipeline.go +++ b/pipeline.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/go-redis/redis/v7/internal/pool" + "github.com/go-redis/redis/v8/internal/pool" ) type pipelineExecer func(context.Context, []Cmder) error diff --git a/pipeline_test.go b/pipeline_test.go index 378671187..3a767f8dd 100644 --- a/pipeline_test.go +++ b/pipeline_test.go @@ -1,7 +1,7 @@ package redis_test import ( - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pool_test.go b/pool_test.go index c1a90ab54..4cf8d4f7d 100644 --- a/pool_test.go +++ b/pool_test.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pubsub.go b/pubsub.go index cce24ee74..73cec7d57 100644 --- a/pubsub.go +++ b/pubsub.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/go-redis/redis/v7/internal" - "github.com/go-redis/redis/v7/internal/pool" - "github.com/go-redis/redis/v7/internal/proto" + "github.com/go-redis/redis/v8/internal" + "github.com/go-redis/redis/v8/internal/pool" + "github.com/go-redis/redis/v8/internal/proto" ) const pingTimeout = 30 * time.Second diff --git a/pubsub_test.go b/pubsub_test.go index d18819898..b9633b2fc 100644 --- a/pubsub_test.go +++ b/pubsub_test.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/race_test.go b/race_test.go index 1042f5d00..bd15a16a7 100644 --- a/race_test.go +++ b/race_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/redis.go b/redis.go index ace2e31a9..41cb3a31d 100644 --- a/redis.go +++ b/redis.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/go-redis/redis/v7/internal" - "github.com/go-redis/redis/v7/internal/pool" - "github.com/go-redis/redis/v7/internal/proto" + "github.com/go-redis/redis/v8/internal" + "github.com/go-redis/redis/v8/internal/pool" + "github.com/go-redis/redis/v8/internal/proto" ) // Nil reply returned by Redis when key does not exist. diff --git a/redis_test.go b/redis_test.go index 53426e5e4..d5a38855b 100644 --- a/redis_test.go +++ b/redis_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/ring.go b/ring.go index 0cdb4d8a1..5833eff77 100644 --- a/ring.go +++ b/ring.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "github.com/go-redis/redis/v7/internal" - "github.com/go-redis/redis/v7/internal/consistenthash" - "github.com/go-redis/redis/v7/internal/hashtag" - "github.com/go-redis/redis/v7/internal/pool" + "github.com/go-redis/redis/v8/internal" + "github.com/go-redis/redis/v8/internal/consistenthash" + "github.com/go-redis/redis/v8/internal/hashtag" + "github.com/go-redis/redis/v8/internal/pool" ) // Hash is type of hash function used in consistent hash. diff --git a/ring_test.go b/ring_test.go index d54ac06a9..2e5a54cb4 100644 --- a/ring_test.go +++ b/ring_test.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/sentinel.go b/sentinel.go index 60d56646d..50f1f3a77 100644 --- a/sentinel.go +++ b/sentinel.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/go-redis/redis/v7/internal" - "github.com/go-redis/redis/v7/internal/pool" + "github.com/go-redis/redis/v8/internal" + "github.com/go-redis/redis/v8/internal/pool" ) //------------------------------------------------------------------------------ diff --git a/sentinel_test.go b/sentinel_test.go index dc18b3add..87469e700 100644 --- a/sentinel_test.go +++ b/sentinel_test.go @@ -1,7 +1,7 @@ package redis_test import ( - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/tx.go b/tx.go index 5b8d217b3..6da043426 100644 --- a/tx.go +++ b/tx.go @@ -3,8 +3,8 @@ package redis import ( "context" - "github.com/go-redis/redis/v7/internal/pool" - "github.com/go-redis/redis/v7/internal/proto" + "github.com/go-redis/redis/v8/internal/pool" + "github.com/go-redis/redis/v8/internal/proto" ) // TxFailedErr transaction redis failed. diff --git a/tx_test.go b/tx_test.go index e8e43ee0a..f10cf2182 100644 --- a/tx_test.go +++ b/tx_test.go @@ -5,7 +5,7 @@ import ( "strconv" "sync" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/universal_test.go b/universal_test.go index 484057f0e..655dd69f3 100644 --- a/universal_test.go +++ b/universal_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/go-redis/redis/v7" + "github.com/go-redis/redis/v8" ) var _ = Describe("UniversalClient", func() {