From 38d30a4bab6120c990b676bfeb7d773db5473437 Mon Sep 17 00:00:00 2001 From: Vladimir Mihailenco Date: Sat, 9 Apr 2016 13:27:16 +0300 Subject: [PATCH] Use redis.v4 that is in alpha/beta state. --- .travis.yml | 4 ++-- bench_test.go | 2 +- cluster.go | 4 ++-- cluster_test.go | 4 ++-- command.go | 2 +- command_test.go | 2 +- commands_test.go | 2 +- example_test.go | 2 +- export_test.go | 2 +- internal/pool/bench_test.go | 2 +- internal/pool/pool_test.go | 2 +- main_test.go | 4 ++-- options.go | 2 +- parser.go | 2 +- parser_test.go | 2 +- pipeline.go | 2 +- pipeline_test.go | 2 +- pool_test.go | 4 ++-- pubsub.go | 2 +- pubsub_test.go | 2 +- race_test.go | 4 ++-- redis.go | 4 ++-- redis_test.go | 2 +- ring.go | 6 +++--- ring_test.go | 2 +- sentinel.go | 2 +- sentinel_test.go | 2 +- tx.go | 2 +- tx_test.go | 2 +- 29 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0a2f98c..afbe1a48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,5 +19,5 @@ install: - go get github.com/onsi/gomega - go get github.com/garyburd/redigo/redis - mkdir -p $HOME/gopath/src/gopkg.in - - mv $HOME/gopath/src/github.com/go-redis/redis $HOME/gopath/src/gopkg.in/redis.v3 - - cd $HOME/gopath/src/gopkg.in/redis.v3 + - mv $HOME/gopath/src/github.com/go-redis/redis $HOME/gopath/src/gopkg.in/redis.v4 + - cd $HOME/gopath/src/gopkg.in/redis.v4 diff --git a/bench_test.go b/bench_test.go index 6a7edd62..0c40cf3a 100644 --- a/bench_test.go +++ b/bench_test.go @@ -7,7 +7,7 @@ import ( redigo "github.com/garyburd/redigo/redis" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) func benchmarkRedisClient(poolSize int) *redis.Client { diff --git a/cluster.go b/cluster.go index 75b37870..592db7b4 100644 --- a/cluster.go +++ b/cluster.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "time" - "gopkg.in/redis.v3/internal/hashtag" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/hashtag" + "gopkg.in/redis.v4/internal/pool" ) // ClusterClient is a Redis Cluster client representing a pool of zero diff --git a/cluster_test.go b/cluster_test.go index 24d516bf..3a4ddb58 100644 --- a/cluster_test.go +++ b/cluster_test.go @@ -14,8 +14,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" - "gopkg.in/redis.v3/internal/hashtag" + "gopkg.in/redis.v4" + "gopkg.in/redis.v4/internal/hashtag" ) type clusterScenario struct { diff --git a/command.go b/command.go index b6a9b195..e10d2fb0 100644 --- a/command.go +++ b/command.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) var ( diff --git a/command_test.go b/command_test.go index 2b218acf..ce7a9601 100644 --- a/command_test.go +++ b/command_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var _ = Describe("Command", func() { diff --git a/commands_test.go b/commands_test.go index dfa22ca0..05728a9d 100644 --- a/commands_test.go +++ b/commands_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var _ = Describe("Commands", func() { diff --git a/example_test.go b/example_test.go index 587ef78a..2e1ea595 100644 --- a/example_test.go +++ b/example_test.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var client *redis.Client diff --git a/export_test.go b/export_test.go index f071b540..948cfb16 100644 --- a/export_test.go +++ b/export_test.go @@ -3,7 +3,7 @@ package redis import ( "time" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) func (c *baseClient) Pool() pool.Pooler { diff --git a/internal/pool/bench_test.go b/internal/pool/bench_test.go index ff102aa5..878b2026 100644 --- a/internal/pool/bench_test.go +++ b/internal/pool/bench_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) func benchmarkPoolGetPut(b *testing.B, poolSize int) { diff --git a/internal/pool/pool_test.go b/internal/pool/pool_test.go index 9d07cd59..ceec428f 100644 --- a/internal/pool/pool_test.go +++ b/internal/pool/pool_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) var _ = Describe("ConnPool", func() { diff --git a/main_test.go b/main_test.go index cf6b181e..b0277e86 100644 --- a/main_test.go +++ b/main_test.go @@ -14,7 +14,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) const ( @@ -94,7 +94,7 @@ var _ = AfterSuite(func() { func TestGinkgoSuite(t *testing.T) { RegisterFailHandler(Fail) - RunSpecs(t, "gopkg.in/redis.v3") + RunSpecs(t, "gopkg.in/redis.v4") } //------------------------------------------------------------------------------ diff --git a/options.go b/options.go index 6214496c..dea2784c 100644 --- a/options.go +++ b/options.go @@ -4,7 +4,7 @@ import ( "net" "time" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) type Options struct { diff --git a/parser.go b/parser.go index d96b5e86..4d8fee13 100644 --- a/parser.go +++ b/parser.go @@ -6,7 +6,7 @@ import ( "net" "strconv" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) const ( diff --git a/parser_test.go b/parser_test.go index 77287a7a..d8fa3609 100644 --- a/parser_test.go +++ b/parser_test.go @@ -5,7 +5,7 @@ import ( "bytes" "testing" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) func BenchmarkParseReplyStatus(b *testing.B) { diff --git a/pipeline.go b/pipeline.go index 95d389f2..fcddc618 100644 --- a/pipeline.go +++ b/pipeline.go @@ -4,7 +4,7 @@ import ( "sync" "sync/atomic" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) // Pipeline implements pipelining as described in diff --git a/pipeline_test.go b/pipeline_test.go index cfbed6e5..939c8b84 100644 --- a/pipeline_test.go +++ b/pipeline_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var _ = Describe("Pipelining", func() { diff --git a/pool_test.go b/pool_test.go index bdf168a9..fcaf243a 100644 --- a/pool_test.go +++ b/pool_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4" + "gopkg.in/redis.v4/internal/pool" ) var _ = Describe("pool", func() { diff --git a/pubsub.go b/pubsub.go index 844dfea2..595c9d1b 100644 --- a/pubsub.go +++ b/pubsub.go @@ -5,7 +5,7 @@ import ( "net" "time" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) var receiveMessageTimeout = 5 * time.Second diff --git a/pubsub_test.go b/pubsub_test.go index 95ab1538..11b14b48 100644 --- a/pubsub_test.go +++ b/pubsub_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var _ = Describe("PubSub", func() { diff --git a/race_test.go b/race_test.go index 968f76e4..c2d3dff2 100644 --- a/race_test.go +++ b/race_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4" + "gopkg.in/redis.v4/internal/pool" ) var _ = Describe("races", func() { diff --git a/redis.go b/redis.go index 88998487..3e37a00e 100644 --- a/redis.go +++ b/redis.go @@ -1,11 +1,11 @@ -package redis // import "gopkg.in/redis.v3" +package redis // import "gopkg.in/redis.v4" import ( "fmt" "io/ioutil" "log" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) // Deprecated. Use SetLogger instead. diff --git a/redis_test.go b/redis_test.go index 9d4a360f..5464a475 100644 --- a/redis_test.go +++ b/redis_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var _ = Describe("Client", func() { diff --git a/ring.go b/ring.go index 02be83c6..0cd31214 100644 --- a/ring.go +++ b/ring.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "gopkg.in/redis.v3/internal/consistenthash" - "gopkg.in/redis.v3/internal/hashtag" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/consistenthash" + "gopkg.in/redis.v4/internal/hashtag" + "gopkg.in/redis.v4/internal/pool" ) var ( diff --git a/ring_test.go b/ring_test.go index 06e6c303..9e1576b7 100644 --- a/ring_test.go +++ b/ring_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var _ = Describe("Redis ring", func() { diff --git a/sentinel.go b/sentinel.go index 1f8ec136..cf8e838c 100644 --- a/sentinel.go +++ b/sentinel.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) //------------------------------------------------------------------------------ diff --git a/sentinel_test.go b/sentinel_test.go index 693b9574..165cce66 100644 --- a/sentinel_test.go +++ b/sentinel_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var _ = Describe("Sentinel", func() { diff --git a/tx.go b/tx.go index 51c87574..3273e2ca 100644 --- a/tx.go +++ b/tx.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "gopkg.in/redis.v3/internal/pool" + "gopkg.in/redis.v4/internal/pool" ) var errDiscard = errors.New("redis: Discard can be used only inside Exec") diff --git a/tx_test.go b/tx_test.go index 66ef6b08..5df4b6af 100644 --- a/tx_test.go +++ b/tx_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/redis.v3" + "gopkg.in/redis.v4" ) var _ = Describe("Tx", func() {