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

Use semantic import versioning
JunboLi-Ray · Aug 8, 2019 · 178deea · 178deea
2 parents 87225c1 + 7779acc
commit 178deea
Show file tree

Hide file tree

Showing 41 changed files with 58 additions and 57 deletions.
diff --git a/bench_test.go b/bench_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v7"
 )
 
 func benchmarkRedisClient(poolSize int) *redis.Client {

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

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

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

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

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

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

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

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

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

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

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

diff --git a/go.sum b/go.sum
@@ -1,5 +1,6 @@
 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/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/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=

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

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

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

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

diff --git a/internal/proto/reader.go b/internal/proto/reader.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/go-redis/redis/internal/util"
+	"github.com/go-redis/redis/v7/internal/util"
 )
 
 const (

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

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

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

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

diff --git a/internal/util.go b/internal/util.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"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 {

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

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

diff --git a/options.go b/options.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/universal_test.go b/universal_test.go
@@ -4,7 +4,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v7"
 )
 
 var _ = Describe("UniversalClient", func() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"io"
     	"time"
-    	"github.com/go-redis/redis/internal"
+    	"github.com/go-redis/redis/v7/internal"
     )
     func usePrecise(dur time.Duration) bool {
@@ Expand Down @@