chore: gofmt all code

This commit is contained in:
Vladimir Mihailenco 2021-09-08 16:00:52 +03:00
parent 11c4d6f556
commit 9b6ee9c3cc
34 changed files with 72 additions and 55 deletions

View File

@ -19,8 +19,6 @@ testdata/redis:
testdata/redis/src/redis-server: testdata/redis testdata/redis/src/redis-server: testdata/redis
cd $< && make all cd $< && make all
tag: fmt:
git tag $(VERSION) gofmt -w -s ./
git tag extra/rediscmd/$(VERSION) goimports -w -local github.com/go-redis/redis ./
git tag extra/redisotel/$(VERSION)
git tag extra/rediscensus/$(VERSION)

View File

@ -9,11 +9,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v8/internal/hashtag"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
"github.com/go-redis/redis/v8/internal/hashtag"
) )
type clusterScenario struct { type clusterScenario struct {

View File

@ -4,10 +4,10 @@ import (
"errors" "errors"
"time" "time"
redis "github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
redis "github.com/go-redis/redis/v8"
) )
var _ = Describe("Cmd", func() { var _ = Describe("Cmd", func() {
@ -72,7 +72,7 @@ var _ = Describe("Cmd", func() {
}) })
It("supports time.Time", func() { It("supports time.Time", func() {
tm := time.Date(2019, 01, 01, 9, 45, 10, 222125, time.UTC) tm := time.Date(2019, 1, 1, 9, 45, 10, 222125, time.UTC)
err := client.Set(ctx, "time_key", tm, 0).Err() err := client.Set(ctx, "time_key", tm, 0).Err()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

View File

@ -472,11 +472,11 @@ var _ = Describe("Commands", func() {
idleTime := client.ObjectIdleTime(ctx, "key") idleTime := client.ObjectIdleTime(ctx, "key")
Expect(idleTime.Err()).NotTo(HaveOccurred()) Expect(idleTime.Err()).NotTo(HaveOccurred())
//Redis returned milliseconds/1000, which may cause ObjectIdleTime to be at a critical value, // Redis returned milliseconds/1000, which may cause ObjectIdleTime to be at a critical value,
//should be +1s to deal with the critical value problem. // should be +1s to deal with the critical value problem.
//if too much time (>1s) is used during command execution, it may also cause the test to fail. // if too much time (>1s) is used during command execution, it may also cause the test to fail.
//so the ObjectIdleTime result should be <=now-start+1s // so the ObjectIdleTime result should be <=now-start+1s
//link: https://github.com/redis/redis/blob/5b48d900498c85bbf4772c1d466c214439888115/src/object.c#L1265-L1272 // link: https://github.com/redis/redis/blob/5b48d900498c85bbf4772c1d466c214439888115/src/object.c#L1265-L1272
Expect(idleTime.Val()).To(BeNumerically("<=", time.Now().Sub(start)+time.Second)) Expect(idleTime.Val()).To(BeNumerically("<=", time.Now().Sub(start)+time.Second))
}) })

View File

@ -4,12 +4,13 @@ import (
"context" "context"
"sync" "sync"
"github.com/go-redis/redis/extra/redisotel/v8"
"github.com/go-redis/redis/v8"
"go.opentelemetry.io/otel" "go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/exporters/stdout/stdouttrace" "go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
sdktrace "go.opentelemetry.io/otel/sdk/trace" sdktrace "go.opentelemetry.io/otel/sdk/trace"
"github.com/go-redis/redis/extra/redisotel/v8"
"github.com/go-redis/redis/v8"
) )
var tracer = otel.Tracer("redisexample") var tracer = otel.Tracer("redisexample")

View File

@ -4,6 +4,7 @@ import (
"context" "context"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
) )

View File

@ -3,9 +3,10 @@ package rediscensus
import ( import (
"context" "context"
"go.opencensus.io/trace"
"github.com/go-redis/redis/extra/rediscmd/v8" "github.com/go-redis/redis/extra/rediscmd/v8"
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
"go.opencensus.io/trace"
) )
type TracingHook struct{} type TracingHook struct{}

View File

@ -1,3 +1,4 @@
//go:build appengine
// +build appengine // +build appengine
package rediscmd package rediscmd

View File

@ -1,3 +1,4 @@
//go:build !appengine
// +build !appengine // +build !appengine
package rediscmd package rediscmd

View File

@ -3,12 +3,13 @@ package redisotel
import ( import (
"context" "context"
"github.com/go-redis/redis/extra/rediscmd/v8"
"github.com/go-redis/redis/v8"
"go.opentelemetry.io/otel" "go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace"
"github.com/go-redis/redis/extra/rediscmd/v8"
"github.com/go-redis/redis/v8"
) )
var tracer = otel.Tracer("github.com/go-redis/redis") var tracer = otel.Tracer("github.com/go-redis/redis")

View File

@ -1,11 +1,13 @@
//go:build gofuzz
// +build gofuzz // +build gofuzz
package fuzz package fuzz
import ( import (
"context" "context"
"github.com/go-redis/redis/v8"
"time" "time"
"github.com/go-redis/redis/v8"
) )
var ( var (

1
go.mod
View File

@ -4,6 +4,7 @@ go 1.13
require ( require (
github.com/cespare/xxhash/v2 v2.1.2 github.com/cespare/xxhash/v2 v2.1.2
github.com/daixiang0/gci v0.2.9 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f
github.com/google/go-cmp v0.5.6 // indirect github.com/google/go-cmp v0.5.6 // indirect
github.com/onsi/ginkgo v1.16.4 github.com/onsi/ginkgo v1.16.4

3
go.sum
View File

@ -1,5 +1,7 @@
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/daixiang0/gci v0.2.9 h1:iwJvwQpBZmMg31w+QQ6jsyZ54KEATn6/nfARbBNW294=
github.com/daixiang0/gci v0.2.9/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
@ -73,6 +75,7 @@ golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

View File

@ -3,10 +3,10 @@ package hashtag
import ( import (
"testing" "testing"
"github.com/go-redis/redis/v8/internal/rand"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8/internal/rand"
) )
func TestGinkgoSuite(t *testing.T) { func TestGinkgoSuite(t *testing.T) {

View File

@ -69,7 +69,7 @@ var _ = Describe("Scan", func() {
Expect(Scan(&d, i{v}, i{vals[k]})).To(HaveOccurred()) Expect(Scan(&d, i{v}, i{vals[k]})).To(HaveOccurred())
} }
//success // success
f = func(v uint64) string { f = func(v uint64) string {
return strconv.FormatUint(v, 10) return strconv.FormatUint(v, 10)
} }

View File

@ -7,10 +7,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis/v8/internal/pool"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8/internal/pool"
) )
var _ = Describe("ConnPool", func() { var _ = Describe("ConnPool", func() {

View File

@ -3,9 +3,10 @@ package proto_test
import ( import (
"encoding/json" "encoding/json"
"github.com/go-redis/redis/v8/internal/proto"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8/internal/proto"
) )
type testScanSliceStruct struct { type testScanSliceStruct struct {

View File

@ -6,10 +6,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis/v8/internal/proto"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8/internal/proto"
) )
type MyType struct{} type MyType struct{}
@ -51,7 +51,7 @@ var _ = Describe("WriteBuffer", func() {
}) })
It("should append time", func() { It("should append time", func() {
tm := time.Date(2019, 01, 01, 9, 45, 10, 222125, time.UTC) tm := time.Date(2019, 1, 1, 9, 45, 10, 222125, time.UTC)
err := wr.WriteArgs([]interface{}{tm}) err := wr.WriteArgs([]interface{}{tm})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

View File

@ -1,3 +1,4 @@
//go:build appengine
// +build appengine // +build appengine
package internal package internal

View File

@ -1,3 +1,4 @@
//go:build !appengine
// +build !appengine // +build !appengine
package internal package internal

View File

@ -1,3 +1,4 @@
//go:build appengine
// +build appengine // +build appengine
package util package util

View File

@ -1,3 +1,4 @@
//go:build !appengine
// +build !appengine // +build !appengine
package util package util

View File

@ -3,10 +3,10 @@ package redis_test
import ( import (
"fmt" "fmt"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
var _ = Describe("ScanIterator", func() { var _ = Describe("ScanIterator", func() {

View File

@ -12,10 +12,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
const ( const (
@ -295,7 +295,7 @@ func redisDir(port string) (string, error) {
if err := os.RemoveAll(dir); err != nil { if err := os.RemoveAll(dir); err != nil {
return "", err return "", err
} }
if err := os.MkdirAll(dir, 0775); err != nil { if err := os.MkdirAll(dir, 0o775); err != nil {
return "", err return "", err
} }
return dir, nil return dir, nil

View File

@ -1,3 +1,4 @@
//go:build go1.7
// +build go1.7 // +build go1.7
package redis package redis

View File

@ -3,10 +3,10 @@ package redis_test
import ( import (
"strconv" "strconv"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
var _ = Describe("pipelining", func() { var _ = Describe("pipelining", func() {

View File

@ -4,10 +4,10 @@ import (
"context" "context"
"time" "time"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
var _ = Describe("pool", func() { var _ = Describe("pool", func() {

View File

@ -7,10 +7,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
var _ = Describe("PubSub", func() { var _ = Describe("PubSub", func() {

View File

@ -10,10 +10,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
var _ = Describe("races", func() { var _ = Describe("races", func() {

View File

@ -8,10 +8,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
type redisHookError struct { type redisHookError struct {

View File

@ -12,7 +12,8 @@ import (
"time" "time"
"github.com/cespare/xxhash/v2" "github.com/cespare/xxhash/v2"
"github.com/dgryski/go-rendezvous" rendezvous "github.com/dgryski/go-rendezvous" //nolint
"github.com/go-redis/redis/v8/internal" "github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/hashtag" "github.com/go-redis/redis/v8/internal/hashtag"
"github.com/go-redis/redis/v8/internal/pool" "github.com/go-redis/redis/v8/internal/pool"

View File

@ -9,10 +9,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
var _ = Describe("Redis Ring", func() { var _ = Describe("Redis Ring", func() {
@ -190,8 +190,8 @@ var _ = Describe("Redis Ring", func() {
Describe("Process hook", func() { Describe("Process hook", func() {
BeforeEach(func() { BeforeEach(func() {
//the health check leads to data race for variable "stack []string". // the health check leads to data race for variable "stack []string".
//here, the health check time is set to 72 hours to avoid health check // here, the health check time is set to 72 hours to avoid health check
opt := redisRingOptions() opt := redisRingOptions()
opt.HeartbeatFrequency = 72 * time.Hour opt.HeartbeatFrequency = 72 * time.Hour
ring = redis.NewRing(opt) ring = redis.NewRing(opt)

View File

@ -3,10 +3,10 @@ package redis_test
import ( import (
"net" "net"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
var _ = Describe("Sentinel", func() { var _ = Describe("Sentinel", func() {

View File

@ -5,10 +5,10 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/go-redis/redis/v8"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/go-redis/redis/v8"
) )
var _ = Describe("Tx", func() { var _ = Describe("Tx", func() {