re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Use redis.v4 that is in alpha/beta state.
This commit is contained in:
Vladimir Mihailenco 2016-04-09 13:32:42 +03:00
parent 09ec5f0b4b 38d30a4bab
commit d89a58af91
29 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -19,5 +19,5 @@ install:
- go get github.com/onsi/gomega - go get github.com/onsi/gomega
- go get github.com/garyburd/redigo/redis - go get github.com/garyburd/redigo/redis
- mkdir -p $HOME/gopath/src/gopkg.in - mkdir -p $HOME/gopath/src/gopkg.in
- mv $HOME/gopath/src/github.com/go-redis/redis $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.v3 - cd $HOME/gopath/src/gopkg.in/redis.v4

2
bench_test.go
View File

@ -7,7 +7,7 @@ import (
redigo "github.com/garyburd/redigo/redis" redigo "github.com/garyburd/redigo/redis"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
func benchmarkRedisClient(poolSize int) *redis.Client { func benchmarkRedisClient(poolSize int) *redis.Client {

4
cluster.go
View File

@ -6,8 +6,8 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gopkg.in/redis.v3/internal/hashtag" "gopkg.in/redis.v4/internal/hashtag"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
// ClusterClient is a Redis Cluster client representing a pool of zero // ClusterClient is a Redis Cluster client representing a pool of zero

4
cluster_test.go
View File

@ -14,8 +14,8 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
"gopkg.in/redis.v3/internal/hashtag" "gopkg.in/redis.v4/internal/hashtag"
) )
type clusterScenario struct { type clusterScenario struct {

2
command.go
View File

@ -7,7 +7,7 @@ import (
"strings" "strings"
"time" "time"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
var ( var (

2
command_test.go
View File

@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var _ = Describe("Command", func() { var _ = Describe("Command", func() {

2
commands_test.go
View File

@ -9,7 +9,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var _ = Describe("Commands", func() { var _ = Describe("Commands", func() {

2
example_test.go
View File

@ -6,7 +6,7 @@ import (
"sync" "sync"
"time" "time"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var client *redis.Client var client *redis.Client

2
export_test.go
View File

@ -3,7 +3,7 @@ package redis
import ( import (
"time" "time"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
func (c *baseClient) Pool() pool.Pooler { func (c *baseClient) Pool() pool.Pooler {

2
internal/pool/bench_test.go
View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
func benchmarkPoolGetPut(b *testing.B, poolSize int) { func benchmarkPoolGetPut(b *testing.B, poolSize int) {

2
internal/pool/pool_test.go
View File

@ -9,7 +9,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
var _ = Describe("ConnPool", func() { var _ = Describe("ConnPool", func() {

4
main_test.go
View File

@ -14,7 +14,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
const ( const (
@ -94,7 +94,7 @@ var _ = AfterSuite(func() {
func TestGinkgoSuite(t *testing.T) { func TestGinkgoSuite(t *testing.T) {
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
RunSpecs(t, "gopkg.in/redis.v3") RunSpecs(t, "gopkg.in/redis.v4")
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
options.go
View File

@ -4,7 +4,7 @@ import (
"net" "net"
"time" "time"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
type Options struct { type Options struct {

2
parser.go
View File

@ -6,7 +6,7 @@ import (
"net" "net"
"strconv" "strconv"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
const ( const (

2
parser_test.go
View File

@ -5,7 +5,7 @@ import (
"bytes" "bytes"
"testing" "testing"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
func BenchmarkParseReplyStatus(b *testing.B) { func BenchmarkParseReplyStatus(b *testing.B) {

2
pipeline.go
View File

@ -4,7 +4,7 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
// Pipeline implements pipelining as described in // Pipeline implements pipelining as described in

2
pipeline_test.go
View File

@ -7,7 +7,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var _ = Describe("Pipelining", func() { var _ = Describe("Pipelining", func() {

4
pool_test.go
View File

@ -4,8 +4,8 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
var _ = Describe("pool", func() { var _ = Describe("pool", func() {

2
pubsub.go
View File

@ -5,7 +5,7 @@ import (
"net" "net"
"time" "time"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
var receiveMessageTimeout = 5 * time.Second var receiveMessageTimeout = 5 * time.Second

2
pubsub_test.go
View File

@ -9,7 +9,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var _ = Describe("PubSub", func() { var _ = Describe("PubSub", func() {

4
race_test.go
View File

@ -11,8 +11,8 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
var _ = Describe("races", func() { var _ = Describe("races", func() {

4
redis.go
View File

@ -1,11 +1,11 @@
package redis // import "gopkg.in/redis.v3" package redis // import "gopkg.in/redis.v4"
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log" "log"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
// Deprecated. Use SetLogger instead. // Deprecated. Use SetLogger instead.

2
redis_test.go
View File

@ -7,7 +7,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var _ = Describe("Client", func() { var _ = Describe("Client", func() {

6
ring.go
View File

@ -6,9 +6,9 @@ import (
"sync" "sync"
"time" "time"
"gopkg.in/redis.v3/internal/consistenthash" "gopkg.in/redis.v4/internal/consistenthash"
"gopkg.in/redis.v3/internal/hashtag" "gopkg.in/redis.v4/internal/hashtag"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
var ( var (

2
ring_test.go
View File

@ -8,7 +8,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var _ = Describe("Redis ring", func() { var _ = Describe("Redis ring", func() {

2
sentinel.go
View File

@ -8,7 +8,7 @@ import (
"sync" "sync"
"time" "time"
"gopkg.in/redis.v3/internal/pool" "gopkg.in/redis.v4/internal/pool"
) )
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
sentinel_test.go
View File

@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var _ = Describe("Sentinel", func() { var _ = Describe("Sentinel", func() {

2
tx.go
View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"fmt" "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") var errDiscard = errors.New("redis: Discard can be used only inside Exec")

2
tx_test.go
View File

@ -7,7 +7,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v3" "gopkg.in/redis.v4"
) )
var _ = Describe("Tx", func() { var _ = Describe("Tx", func() {