Skip to content

Commit

Permalink
fix golint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
kevwan committed Oct 16, 2020
1 parent 338caf9 commit 9464548
Show file tree
Hide file tree
Showing 27 changed files with 68 additions and 83 deletions.
1 change: 0 additions & 1 deletion core/bloom/bloom.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ type (

BloomFilter struct {
bits uint
maps uint
bitSet BitSetProvider
}
)
Expand Down
5 changes: 3 additions & 2 deletions core/codec/gzip.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"io"
)

const unzipLimit = 100 * 1024 * 1024 // 100MB

func Gzip(bs []byte) []byte {
var b bytes.Buffer

Expand All @@ -24,8 +26,7 @@ func Gunzip(bs []byte) ([]byte, error) {
defer r.Close()

var c bytes.Buffer
_, err = io.Copy(&c, r)
if err != nil {
if _, err = io.Copy(&c, io.LimitReader(r, unzipLimit)); err != nil {
return nil, err
}

Expand Down
3 changes: 1 addition & 2 deletions core/codec/rsa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ FstHGSkUYFLe+nl1dEKHbD+/Zt95L757J3xGTrwoTc7KCTxbrgn+stn0w52BNjj/
kIE2ko4lbh/v8Fl14AyVR9msfKtKOnhe5FCT72mdtApr+qvzcC3q9hfXwkyQU32p
v7q5UimZ205iKSBmgQIDAQAB
-----END PUBLIC KEY-----`
testBody = `this is the content`
encryptedBody = `49e7bc15640e5d927fd3f129b749536d0755baf03a0f35fc914ff1b7b8ce659e5fe3a598442eb908c5995e28bacd3d76e4420bb05b6bfc177040f66c6976f680f7123505d626ab96a9db1151f45c93bc0262db9087b9fb6801715f76f902e644a20029262858f05b0d10540842204346ac1d6d8f29cc5d47dab79af75d922ef2`
testBody = `this is the content`
)

func TestCryption(t *testing.T) {
Expand Down
1 change: 0 additions & 1 deletion core/collection/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ type (
name string
lock sync.Mutex
data map[string]interface{}
evicts *list.List
expire time.Duration
timingWheel *TimingWheel
lruCache lru
Expand Down
2 changes: 1 addition & 1 deletion core/collection/rollingwindow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func TestRollingWindowReduce(t *testing.T) {
for _, test := range tests {
t.Run(stringx.Rand(), func(t *testing.T) {
r := test.win
for x := 0; x < size; x = x + 1 {
for x := 0; x < size; x++ {
for i := 0; i <= x; i++ {
r.Add(float64(i))
}
Expand Down
12 changes: 8 additions & 4 deletions core/contextx/deadline_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,21 @@ import (

func TestShrinkDeadlineLess(t *testing.T) {
deadline := time.Now().Add(time.Second)
ctx, _ := context.WithDeadline(context.Background(), deadline)
ctx, _ = ShrinkDeadline(ctx, time.Minute)
ctx, cancel := context.WithDeadline(context.Background(), deadline)
defer cancel()
ctx, cancel = ShrinkDeadline(ctx, time.Minute)
defer cancel()
dl, ok := ctx.Deadline()
assert.True(t, ok)
assert.Equal(t, deadline, dl)
}

func TestShrinkDeadlineMore(t *testing.T) {
deadline := time.Now().Add(time.Minute)
ctx, _ := context.WithDeadline(context.Background(), deadline)
ctx, _ = ShrinkDeadline(ctx, time.Second)
ctx, cancel := context.WithDeadline(context.Background(), deadline)
defer cancel()
ctx, cancel = ShrinkDeadline(ctx, time.Second)
defer cancel()
dl, ok := ctx.Deadline()
assert.True(t, ok)
assert.True(t, dl.Before(deadline))
Expand Down
6 changes: 4 additions & 2 deletions core/contextx/valueonlycontext_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ func TestContextCancel(t *testing.T) {
c := context.WithValue(context.Background(), "key", "value")
c1, cancel := context.WithCancel(c)
o := ValueOnlyFrom(c1)
c2, _ := context.WithCancel(o)
c2, cancel2 := context.WithCancel(o)
defer cancel2()
contexts := []context.Context{c1, c2}

for _, c := range contexts {
Expand All @@ -35,7 +36,8 @@ func TestContextCancel(t *testing.T) {
}

func TestContextDeadline(t *testing.T) {
c, _ := context.WithDeadline(context.Background(), time.Now().Add(10*time.Millisecond))
c, cancel := context.WithDeadline(context.Background(), time.Now().Add(10*time.Millisecond))
cancel()
o := ValueOnlyFrom(c)
select {
case <-time.After(100 * time.Millisecond):
Expand Down
2 changes: 1 addition & 1 deletion core/discov/clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
)

const (
indexOfKey = iota
_ = iota
indexOfId
)

Expand Down
1 change: 1 addition & 0 deletions core/mathx/int_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func TestMaxInt(t *testing.T) {
}

for _, each := range cases {
each := each
t.Run(stringx.Rand(), func(t *testing.T) {
actual := MaxInt(each.a, each.b)
assert.Equal(t, each.expect, actual)
Expand Down
4 changes: 0 additions & 4 deletions core/proc/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ var started uint32

// Profile represents an active profiling session.
type Profile struct {
// path holds the base path where various profiling files are written.
// If blank, the base path will be generated by ioutil.TempDir.
path string

// closers holds cleanup functions that run after each profile
closers []func()

Expand Down
2 changes: 1 addition & 1 deletion core/service/servicegroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func newMockedService(multiplier int) *mockedService {

func (s *mockedService) Start() {
mutex.Lock()
number = number * s.multiplier
number *= s.multiplier
mutex.Unlock()
done <- struct{}{}
<-s.quit
Expand Down
4 changes: 0 additions & 4 deletions core/syncx/cond_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,3 @@ func TestSignalNoWait(t *testing.T) {
func sleep(millisecond int) {
time.Sleep(time.Duration(millisecond) * time.Millisecond)
}

func currentTimeMillis() int64 {
return time.Now().UnixNano() / int64(time.Millisecond)
}
3 changes: 2 additions & 1 deletion core/syncx/sharedcalls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ func TestExclusiveCallDoDiffDupSuppress(t *testing.T) {
close(broadcast)
wg.Wait()

if got := atomic.LoadInt32(&calls); got != 5 { // five letters
if got := atomic.LoadInt32(&calls); got != 5 {
// five letters
t.Errorf("number of calls = %d; want 5", got)
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/timex/relativetime_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestRelativeTime(t *testing.T) {
}

func TestRelativeTime_Time(t *testing.T) {
diff := Time().Sub(time.Now())
diff := time.Until(Time())
if diff > 0 {
assert.True(t, diff < time.Second)
} else {
Expand Down
9 changes: 3 additions & 6 deletions core/timex/ticker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ func TestFakeTicker(t *testing.T) {

var count int32
go func() {
for {
select {
case <-ticker.Chan():
if atomic.AddInt32(&count, 1) == total {
ticker.Done()
}
for range ticker.Chan() {
if atomic.AddInt32(&count, 1) == total {
ticker.Done()
}
}
}()
Expand Down
5 changes: 1 addition & 4 deletions core/trace/span.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const (
clientFlag = "client"
serverFlag = "server"
spanSepRune = '.'
timeFormat = "2006-01-02 15:04:05.000"
)

var spanSep = string([]byte{spanSepRune})
Expand All @@ -37,9 +36,7 @@ func newServerSpan(carrier Carrier, serviceName, operationName string) tracespec
return carrier.Get(traceIdKey)
}
return ""
}, func() string {
return stringx.RandId()
})
}, stringx.RandId)
spanId := stringx.TakeWithPriority(func() string {
if carrier != nil {
return carrier.Get(spanIdKey)
Expand Down
1 change: 1 addition & 0 deletions core/utils/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func TestCompareVersions(t *testing.T) {
}

for _, each := range cases {
each := each
t.Run(each.ver1, func(t *testing.T) {
actual := CompareVersions(each.ver1, each.operator, each.ver2)
assert.Equal(t, each.out, actual, fmt.Sprintf("%s vs %s", each.ver1, each.ver2))
Expand Down
57 changes: 27 additions & 30 deletions example/etcd/demo/etcdmon.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,41 +128,38 @@ func main() {
ticker := time.NewTicker(time.Minute)
defer ticker.Stop()

for {
select {
case <-ticker.C:
expect, err := loadAll(registry.Client().(*clientv3.Client))
if err != nil {
fmt.Println("[ETCD-test] can't load current keys")
continue
}
for range ticker.C {
expect, err := loadAll(registry.Client().(*clientv3.Client))
if err != nil {
fmt.Println("[ETCD-test] can't load current keys")
continue
}

check := func() bool {
var match bool
barrier.Guard(func() {
match = compare(expect, vals)
})
if match {
logx.Info("match")
}
return match
check := func() bool {
var match bool
barrier.Guard(func() {
match = compare(expect, vals)
})
if match {
logx.Info("match")
}
return match
}
if check() {
continue
}

time.AfterFunc(time.Second*5, func() {
if check() {
continue
return
}

time.AfterFunc(time.Second*5, func() {
if check() {
return
}

var builder strings.Builder
builder.WriteString(fmt.Sprintf("expect:\n%s\n", serializeMap(expect, "\t")))
barrier.Guard(func() {
builder.WriteString(fmt.Sprintf("actual:\n%s\n", serializeMap(vals, "\t")))
})
fmt.Println(builder.String())
var builder strings.Builder
builder.WriteString(fmt.Sprintf("expect:\n%s\n", serializeMap(expect, "\t")))
barrier.Guard(func() {
builder.WriteString(fmt.Sprintf("actual:\n%s\n", serializeMap(vals, "\t")))
})
}
fmt.Println(builder.String())
})
}
}
4 changes: 0 additions & 4 deletions example/mapreduce/deadlock/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ func main() {
}
writer.Write(user)
}, func(pipe <-chan interface{}, writer mr.Writer, cancel func(error)) {
var users []*User
for p := range pipe {
users = append(users, p.(*User))
}
// missing writer.Write(...), should not panic
})
if err != nil {
Expand Down
6 changes: 5 additions & 1 deletion example/periodicalexecutor/pe.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ func main() {
fmt.Println(len(items))
}, executors.WithBulkTasks(10))
for {
executor.Add(1)
if err := executor.Add(1); err != nil {
fmt.Println(err)
return
}

time.Sleep(time.Millisecond * 90)
}
}
9 changes: 3 additions & 6 deletions example/stat/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@ func main() {
ticker := time.NewTicker(time.Second * 5)
defer ticker.Stop()

for {
select {
case <-ticker.C:
percent := stat.CpuUsage()
fmt.Println("cpu:", percent)
}
for range ticker.C {
percent := stat.CpuUsage()
fmt.Println("cpu:", percent)
}
}
2 changes: 1 addition & 1 deletion rest/handler/cryptionhandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func decryptBody(key []byte, r *http.Request) error {
var content []byte
var err error
if r.ContentLength > 0 {
content = make([]byte, r.ContentLength, r.ContentLength)
content = make([]byte, r.ContentLength)
_, err = io.ReadFull(r.Body, content)
} else {
content, err = ioutil.ReadAll(io.LimitReader(r.Body, maxBytes))
Expand Down
2 changes: 0 additions & 2 deletions tools/goctl/k8s/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ const (
ServiceTypeRmq ServiceType = "rmq"
ServiceTypeSync ServiceType = "sync"
envDev = "dev"
envPre = "pre"
envPro = "pro"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion tools/goctl/model/sql/parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

const (
none = iota
_ = iota
primary
unique
normal
Expand Down
4 changes: 1 addition & 3 deletions tools/goctl/util/stringx/string.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ func (s String) ToCamel() string {

// camel->snake
func (s String) ToSnake() string {
list := s.splitBy(func(r rune) bool {
return unicode.IsUpper(r)
}, false)
list := s.splitBy(unicode.IsUpper, false)
var target []string
for _, item := range list {
target = append(target, From(item).Lower())
Expand Down
1 change: 1 addition & 0 deletions zrpc/internal/resolver/directbuilder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func TestDirectBuilder_Build(t *testing.T) {
}

for _, test := range tests {
test := test
t.Run(strconv.Itoa(test), func(t *testing.T) {
var servers []string
for i := 0; i < test; i++ {
Expand Down
1 change: 1 addition & 0 deletions zrpc/internal/resolver/subset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func TestSubset(t *testing.T) {
}

for _, test := range tests {
test := test
t.Run(test.name, func(t *testing.T) {
var vals []string
for i := 0; i < test.set; i++ {
Expand Down

0 comments on commit 9464548

Please sign in to comment.