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

Merge pull request #1117 from go-redis/fix/go-mod-v7 

Use semantic import versioning
This commit is contained in:
Vladimir Mihailenco 2019-08-08 14:57:06 +03:00 committed by GitHub
parent 87225c1cf9 7779accbea
commit 178deea321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench_test.go
View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
) )
func benchmarkRedisClient(poolSize int) *redis.Client { func benchmarkRedisClient(poolSize int) *redis.Client {

8
cluster.go
View File

@ -13,10 +13,10 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/go-redis/redis/internal" "github.com/go-redis/redis/v7/internal"
"github.com/go-redis/redis/internal/hashtag" "github.com/go-redis/redis/v7/internal/hashtag"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
) )
var errClusterNoNodes = fmt.Errorf("redis: cluster has no nodes") var errClusterNoNodes = fmt.Errorf("redis: cluster has no nodes")

4
cluster_test.go
View File

@ -9,8 +9,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
"github.com/go-redis/redis/internal/hashtag" "github.com/go-redis/redis/v7/internal/hashtag"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

6
command.go
View File

@ -7,9 +7,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/go-redis/redis/internal" "github.com/go-redis/redis/v7/internal"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
"github.com/go-redis/redis/internal/util" "github.com/go-redis/redis/v7/internal/util"
) )
type Cmder interface { type Cmder interface {

2
command_test.go
View File

@ -3,7 +3,7 @@ package redis_test
import ( import (
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

2
commands.go
View File

@ -5,7 +5,7 @@ import (
"io" "io"
"time" "time"
"github.com/go-redis/redis/internal" "github.com/go-redis/redis/v7/internal"
) )
func usePrecise(dur time.Duration) bool { func usePrecise(dur time.Duration) bool {

4
commands_test.go
View File

@ -9,8 +9,8 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
) )
var _ = Describe("Commands", func() { var _ = Describe("Commands", func() {

2
error.go
View File

@ -6,7 +6,7 @@ import (
"net" "net"
"strings" "strings"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
) )
func isRetryableError(err error, retryTimeout bool) bool { func isRetryableError(err error, retryTimeout bool) bool {

2
example_instrumentation_test.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
) )
type redisHook struct{} type redisHook struct{}

2
example_test.go
View File

@ -6,7 +6,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
) )
var redisdb *redis.Client var redisdb *redis.Client

4
export_test.go
View File

@ -5,8 +5,8 @@ import (
"net" "net"
"strings" "strings"
"github.com/go-redis/redis/internal/hashtag" "github.com/go-redis/redis/v7/internal/hashtag"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
) )
func (c *baseClient) Pool() pool.Pooler { func (c *baseClient) Pool() pool.Pooler {

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/go-redis/redis module github.com/go-redis/redis/v7
require ( require (
github.com/onsi/ginkgo v1.8.0 github.com/onsi/ginkgo v1.8.0

1
go.sum
View File

@ -1,5 +1,6 @@
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/go-redis/redis v6.15.3+incompatible h1:NZ0O90AhLSvSrvLZ/S9h7D4kl1mW2PrKyxL7MyBKO2g=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=

2
internal/pool/bench_test.go
View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
) )
type poolGetPutBenchmark struct { type poolGetPutBenchmark struct {

2
internal/pool/conn.go
View File

@ -6,7 +6,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
) )
var noDeadline = time.Time{} var noDeadline = time.Time{}

2
internal/pool/pool.go
View File

@ -8,7 +8,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/go-redis/redis/internal" "github.com/go-redis/redis/v7/internal"
) )
var ErrClosed = errors.New("redis: client is closed") var ErrClosed = errors.New("redis: client is closed")

2
internal/pool/pool_test.go
View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

2
internal/proto/reader.go
View File

@ -6,7 +6,7 @@ import (
"io" "io"
"strconv" "strconv"
"github.com/go-redis/redis/internal/util" "github.com/go-redis/redis/v7/internal/util"
) )
const ( const (

2
internal/proto/reader_test.go
View File

@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
) )
func BenchmarkReader_ParseReply_Status(b *testing.B) { func BenchmarkReader_ParseReply_Status(b *testing.B) {

2
internal/proto/scan.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"github.com/go-redis/redis/internal/util" "github.com/go-redis/redis/v7/internal/util"
) )
func Scan(b []byte, v interface{}) error { func Scan(b []byte, v interface{}) error {

2
internal/proto/write_buffer_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

2
internal/proto/writer.go
View File

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/go-redis/redis/internal/util" "github.com/go-redis/redis/v7/internal/util"
) )
type Writer struct { type Writer struct {

2
internal/util.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/go-redis/redis/internal/util" "github.com/go-redis/redis/v7/internal/util"
) )
func Sleep(ctx context.Context, dur time.Duration) error { func Sleep(ctx context.Context, dur time.Duration) error {

2
iterator_test.go
View File

@ -3,7 +3,7 @@ package redis_test
import ( import (
"fmt" "fmt"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

2
main_test.go
View File

@ -11,7 +11,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

2
options.go
View File

@ -12,7 +12,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
) )
// Limiter is the interface of a rate limiter or a circuit breaker. // Limiter is the interface of a rate limiter or a circuit breaker.

2
pipeline.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"sync" "sync"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
) )
type pipelineExecer func(context.Context, []Cmder) error type pipelineExecer func(context.Context, []Cmder) error

2
pipeline_test.go
View File

@ -1,7 +1,7 @@
package redis_test package redis_test
import ( import (
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

2
pool_test.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

6
pubsub.go
View File

@ -8,9 +8,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis/internal" "github.com/go-redis/redis/v7/internal"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
) )
const pingTimeout = 30 * time.Second const pingTimeout = 30 * time.Second

2
pubsub_test.go
View File

@ -6,7 +6,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

2
race_test.go
View File

@ -9,7 +9,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

6
redis.go
View File

@ -6,9 +6,9 @@ import (
"log" "log"
"time" "time"
"github.com/go-redis/redis/internal" "github.com/go-redis/redis/v7/internal"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
) )
// Nil reply Redis returns when key does not exist. // Nil reply Redis returns when key does not exist.

2
redis_test.go
View File

@ -6,7 +6,7 @@ import (
"net" "net"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

8
ring.go
View File

@ -10,10 +10,10 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/go-redis/redis/internal" "github.com/go-redis/redis/v7/internal"
"github.com/go-redis/redis/internal/consistenthash" "github.com/go-redis/redis/v7/internal/consistenthash"
"github.com/go-redis/redis/internal/hashtag" "github.com/go-redis/redis/v7/internal/hashtag"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
) )
// Hash is type of hash function used in consistent hash. // Hash is type of hash function used in consistent hash.

2
ring_test.go
View File

@ -9,7 +9,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

4
sentinel.go
View File

@ -9,8 +9,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis/internal" "github.com/go-redis/redis/v7/internal"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
) )
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
sentinel_test.go
View File

@ -1,7 +1,7 @@
package redis_test package redis_test
import ( import (
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

4
tx.go
View File

@ -3,8 +3,8 @@ package redis
import ( import (
"context" "context"
"github.com/go-redis/redis/internal/pool" "github.com/go-redis/redis/v7/internal/pool"
"github.com/go-redis/redis/internal/proto" "github.com/go-redis/redis/v7/internal/proto"
) )
// TxFailedErr transaction redis failed. // TxFailedErr transaction redis failed.

2
tx_test.go
View File

@ -5,7 +5,7 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

2
universal_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"
"github.com/go-redis/redis" "github.com/go-redis/redis/v7"
) )
var _ = Describe("UniversalClient", func() { var _ = Describe("UniversalClient", func() {