Merge pull request redis#305 from go-redis/fix/gopkg-v4

vmihailenco · vmihailenco · commit d89a58af9139 · 2016-04-09T13:32:42.000+03:00
Use redis.v4 that is in alpha/beta state.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`redigo "github.com/garyburd/redigo/redis"`
`9`	`9`
`10`		`- "gopkg.in/redis.v3"`
	`10`	`+ "gopkg.in/redis.v4"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func benchmarkRedisClient(poolSize int) *redis.Client {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"sync/atomic"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "gopkg.in/redis.v3/internal/hashtag"`
`10`		`- "gopkg.in/redis.v3/internal/pool"`
	`9`	`+ "gopkg.in/redis.v4/internal/hashtag"`
	`10`	`+ "gopkg.in/redis.v4/internal/pool"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// ClusterClient is a Redis Cluster client representing a pool of zero`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ import (`
`14`	`14`	`. "github.com/onsi/ginkgo"`
`15`	`15`	`. "github.com/onsi/gomega"`
`16`	`16`
`17`		`- "gopkg.in/redis.v3"`
`18`		`- "gopkg.in/redis.v3/internal/hashtag"`
	`17`	`+ "gopkg.in/redis.v4"`
	`18`	`+ "gopkg.in/redis.v4/internal/hashtag"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`type clusterScenario struct {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"strings"`
`8`	`8`	`"time"`
`9`	`9`
`10`		`- "gopkg.in/redis.v3/internal/pool"`
	`10`	`+ "gopkg.in/redis.v4/internal/pool"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`. "github.com/onsi/ginkgo"`
`5`	`5`	`. "github.com/onsi/gomega"`
`6`	`6`
`7`		`- "gopkg.in/redis.v3"`
	`7`	`+ "gopkg.in/redis.v4"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`var _ = Describe("Command", func() {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`. "github.com/onsi/ginkgo"`
`10`	`10`	`. "github.com/onsi/gomega"`
`11`	`11`
`12`		`- "gopkg.in/redis.v3"`
	`12`	`+ "gopkg.in/redis.v4"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var _ = Describe("Commands", func() {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"sync"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "gopkg.in/redis.v3"`
	`9`	`+ "gopkg.in/redis.v4"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`var client *redis.Client`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package redis`
`3`	`3`	`import (`
`4`	`4`	`"time"`
`5`	`5`
`6`		`- "gopkg.in/redis.v3/internal/pool"`
	`6`	`+ "gopkg.in/redis.v4/internal/pool"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func (c *baseClient) Pool() pool.Pooler {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`	`"time"`
`7`	`7`
`8`		`- "gopkg.in/redis.v3/internal/pool"`
	`8`	`+ "gopkg.in/redis.v4/internal/pool"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func benchmarkPoolGetPut(b *testing.B, poolSize int) {`