Skip to content

Commit

Permalink
Use redis.v4 that is in alpha/beta state.
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmihailenco
vmihailenco committed Apr 9, 2016
1 parent 96650c0 commit 38d30a4
Show file tree
Hide file tree
Showing 29 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

"gopkg.in/redis.v3/internal/pool"
"gopkg.in/redis.v4/internal/pool"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion command_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion commands_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion example_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"time"

"gopkg.in/redis.v3"
"gopkg.in/redis.v4"
)

var client *redis.Client
Expand Down
2 changes: 1 addition & 1 deletion export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/pool/bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/pool/pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"gopkg.in/redis.v3"
"gopkg.in/redis.v4"
)

const (
Expand Down Expand Up @@ -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")
}

//------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net"
"time"

"gopkg.in/redis.v3/internal/pool"
"gopkg.in/redis.v4/internal/pool"
)

type Options struct {
Expand Down
2 changes: 1 addition & 1 deletion parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net"
"strconv"

"gopkg.in/redis.v3/internal/pool"
"gopkg.in/redis.v4/internal/pool"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion parser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"bytes"
"testing"

"gopkg.in/redis.v3/internal/pool"
"gopkg.in/redis.v4/internal/pool"
)

func BenchmarkParseReplyStatus(b *testing.B) {
Expand Down
2 changes: 1 addition & 1 deletion pipeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pipeline_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion pubsub.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net"
"time"

"gopkg.in/redis.v3/internal/pool"
"gopkg.in/redis.v4/internal/pool"
)

var receiveMessageTimeout = 5 * time.Second
Expand Down
2 changes: 1 addition & 1 deletion pubsub_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions race_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions redis.go
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion redis_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions ring.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion ring_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion sentinel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

"gopkg.in/redis.v3/internal/pool"
"gopkg.in/redis.v4/internal/pool"
)

//------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion sentinel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion tx_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 38d30a4

Please sign in to comment.