From 73906f996d670a214ce1dc7f3724fbf4ef802dd4 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 18 May 2021 14:43:09 +0800 Subject: [PATCH] chore(format): change by gofumpt tool (#697) Signed-off-by: Bo-Yi Wu --- core/breaker/googlebreaker.go | 2 +- core/collection/timingwheel.go | 2 +- core/discov/internal/listener.go | 2 +- core/hash/consistenthash.go | 2 +- core/logx/tracelogger_test.go | 2 +- core/mapping/utils.go | 2 +- core/stores/cache/cachenode.go | 2 +- core/stores/kv/store.go | 16 ++++++++-------- core/stores/mongoc/cachedcollection.go | 12 ++++++------ core/stores/mongoc/cachedmodel.go | 6 +++--- core/stores/redis/redis.go | 12 ++++++------ core/stringx/strings.go | 2 +- rest/engine_test.go | 2 +- rest/httpx/router.go | 2 +- tools/goctl/api/docgen/doc.go | 2 +- tools/goctl/api/parser/g4/ast/api.go | 10 +++++----- tools/goctl/api/parser/g4/ast/apiparser.go | 6 +++--- tools/goctl/model/sql/gen/keys_test.go | 2 +- tools/goctl/model/sql/test/model/studentmodel.go | 4 ++-- tools/goctl/plugin/plugin.go | 2 +- tools/goctl/rpc/execx/execx.go | 2 +- 21 files changed, 47 insertions(+), 47 deletions(-) diff --git a/core/breaker/googlebreaker.go b/core/breaker/googlebreaker.go index 48795b8e..5da1471f 100644 --- a/core/breaker/googlebreaker.go +++ b/core/breaker/googlebreaker.go @@ -94,7 +94,7 @@ func (b *googleBreaker) markFailure() { b.stat.Add(0) } -func (b *googleBreaker) history() (accepts int64, total int64) { +func (b *googleBreaker) history() (accepts, total int64) { b.stat.Reduce(func(b *collection.Bucket) { accepts += int64(b.Sum) total += b.Count diff --git a/core/collection/timingwheel.go b/core/collection/timingwheel.go index eb736cd5..07189e03 100644 --- a/core/collection/timingwheel.go +++ b/core/collection/timingwheel.go @@ -151,7 +151,7 @@ func (tw *TimingWheel) drainAll(fn func(key, value interface{})) { } } -func (tw *TimingWheel) getPositionAndCircle(d time.Duration) (pos int, circle int) { +func (tw *TimingWheel) getPositionAndCircle(d time.Duration) (pos, circle int) { steps := int(d / tw.interval) pos = (tw.tickedPos + steps) % tw.numSlots circle = (steps - 1) / tw.numSlots diff --git a/core/discov/internal/listener.go b/core/discov/internal/listener.go index 3087410f..3893ea37 100644 --- a/core/discov/internal/listener.go +++ b/core/discov/internal/listener.go @@ -2,5 +2,5 @@ package internal // Listener interface wraps the OnUpdate method. type Listener interface { - OnUpdate(keys []string, values []string, newKey string) + OnUpdate(keys, values []string, newKey string) } diff --git a/core/hash/consistenthash.go b/core/hash/consistenthash.go index 911b46c1..13f386b1 100644 --- a/core/hash/consistenthash.go +++ b/core/hash/consistenthash.go @@ -83,7 +83,7 @@ func (h *ConsistentHash) AddWithReplicas(node interface{}, replicas int) { h.ring[hash] = append(h.ring[hash], node) } - sort.Slice(h.keys, func(i int, j int) bool { + sort.Slice(h.keys, func(i, j int) bool { return h.keys[i] < h.keys[j] }) } diff --git a/core/logx/tracelogger_test.go b/core/logx/tracelogger_test.go index 68735a12..da7be2e7 100644 --- a/core/logx/tracelogger_test.go +++ b/core/logx/tracelogger_test.go @@ -112,5 +112,5 @@ func (t mockTrace) Follow(ctx context.Context, serviceName, operationName string return nil, nil } -func (t mockTrace) Visit(fn func(key string, val string) bool) { +func (t mockTrace) Visit(fn func(key, val string) bool) { } diff --git a/core/mapping/utils.go b/core/mapping/utils.go index 67f59eff..e8ff102e 100644 --- a/core/mapping/utils.go +++ b/core/mapping/utils.go @@ -286,7 +286,7 @@ func parseNumberRange(str string) (*numberRange, error) { }, nil } -func parseOption(fieldOpts *fieldOptions, fieldName string, option string) error { +func parseOption(fieldOpts *fieldOptions, fieldName, option string) error { switch { case option == stringOption: fieldOpts.FromString = true diff --git a/core/stores/cache/cachenode.go b/core/stores/cache/cachenode.go index 779f7c3e..2405e3ff 100644 --- a/core/stores/cache/cachenode.go +++ b/core/stores/cache/cachenode.go @@ -205,7 +205,7 @@ func (c cacheNode) doTake(v interface{}, key string, query func(v interface{}) e return jsonx.Unmarshal(val.([]byte), v) } -func (c cacheNode) processCache(key string, data string, v interface{}) error { +func (c cacheNode) processCache(key, data string, v interface{}) error { err := jsonx.Unmarshal([]byte(data), v) if err == nil { return nil diff --git a/core/stores/kv/store.go b/core/stores/kv/store.go index b022042f..aa0a499a 100644 --- a/core/stores/kv/store.go +++ b/core/stores/kv/store.go @@ -17,7 +17,7 @@ type ( // Store interface represents a KV store. Store interface { Del(keys ...string) (int, error) - Eval(script string, key string, args ...interface{}) (interface{}, error) + Eval(script, key string, args ...interface{}) (interface{}, error) Exists(key string) (bool, error) Expire(key string, seconds int) error Expireat(key string, expireTime int64) error @@ -39,7 +39,7 @@ type ( Llen(key string) (int, error) Lpop(key string) (string, error) Lpush(key string, values ...interface{}) (int, error) - Lrange(key string, start int, stop int) ([]string, error) + Lrange(key string, start, stop int) ([]string, error) Lrem(key string, count int, value string) (int, error) Persist(key string) (bool, error) Pfadd(key string, values ...interface{}) (bool, error) @@ -47,7 +47,7 @@ type ( Rpush(key string, values ...interface{}) (int, error) Sadd(key string, values ...interface{}) (int, error) Scard(key string) (int64, error) - Set(key string, value string) error + Set(key, value string) error Setex(key, value string, seconds int) error Setnx(key, value string) (bool, error) SetnxEx(key, value string, seconds int) (bool, error) @@ -74,7 +74,7 @@ type ( Zrevrange(key string, start, stop int64) ([]string, error) ZrevrangebyscoreWithScores(key string, start, stop int64) ([]redis.Pair, error) ZrevrangebyscoreWithScoresAndLimit(key string, start, stop int64, page, size int) ([]redis.Pair, error) - Zscore(key string, value string) (int64, error) + Zscore(key, value string) (int64, error) Zrevrank(key, field string) (int64, error) } @@ -123,7 +123,7 @@ func (cs clusterStore) Del(keys ...string) (int, error) { return val, be.Err() } -func (cs clusterStore) Eval(script string, key string, args ...interface{}) (interface{}, error) { +func (cs clusterStore) Eval(script, key string, args ...interface{}) (interface{}, error) { node, err := cs.getRedis(key) if err != nil { return nil, err @@ -321,7 +321,7 @@ func (cs clusterStore) Lpush(key string, values ...interface{}) (int, error) { return node.Lpush(key, values...) } -func (cs clusterStore) Lrange(key string, start int, stop int) ([]string, error) { +func (cs clusterStore) Lrange(key string, start, stop int) ([]string, error) { node, err := cs.getRedis(key) if err != nil { return nil, err @@ -393,7 +393,7 @@ func (cs clusterStore) Scard(key string) (int64, error) { return node.Scard(key) } -func (cs clusterStore) Set(key string, value string) error { +func (cs clusterStore) Set(key, value string) error { node, err := cs.getRedis(key) if err != nil { return err @@ -648,7 +648,7 @@ func (cs clusterStore) Zrevrank(key, field string) (int64, error) { return node.Zrevrank(key, field) } -func (cs clusterStore) Zscore(key string, value string) (int64, error) { +func (cs clusterStore) Zscore(key, value string) (int64, error) { node, err := cs.getRedis(key) if err != nil { return 0, err diff --git a/core/stores/mongoc/cachedcollection.go b/core/stores/mongoc/cachedcollection.go index 2be85e8f..dc14fe68 100644 --- a/core/stores/mongoc/cachedcollection.go +++ b/core/stores/mongoc/cachedcollection.go @@ -24,11 +24,11 @@ type ( CachedCollection interface { Count(query interface{}) (int, error) DelCache(keys ...string) error - FindAllNoCache(v interface{}, query interface{}, opts ...QueryOption) error + FindAllNoCache(v, query interface{}, opts ...QueryOption) error FindOne(v interface{}, key string, query interface{}) error - FindOneNoCache(v interface{}, query interface{}) error + FindOneNoCache(v, query interface{}) error FindOneId(v interface{}, key string, id interface{}) error - FindOneIdNoCache(v interface{}, id interface{}) error + FindOneIdNoCache(v, id interface{}) error GetCache(key string, v interface{}) error Insert(docs ...interface{}) error Pipe(pipeline interface{}) mongo.Pipe @@ -68,7 +68,7 @@ func (c *cachedCollection) DelCache(keys ...string) error { return c.cache.Del(keys...) } -func (c *cachedCollection) FindAllNoCache(v interface{}, query interface{}, opts ...QueryOption) error { +func (c *cachedCollection) FindAllNoCache(v, query interface{}, opts ...QueryOption) error { q := c.collection.Find(query) for _, opt := range opts { q = opt(q) @@ -83,7 +83,7 @@ func (c *cachedCollection) FindOne(v interface{}, key string, query interface{}) }) } -func (c *cachedCollection) FindOneNoCache(v interface{}, query interface{}) error { +func (c *cachedCollection) FindOneNoCache(v, query interface{}) error { q := c.collection.Find(query) return q.One(v) } @@ -95,7 +95,7 @@ func (c *cachedCollection) FindOneId(v interface{}, key string, id interface{}) }) } -func (c *cachedCollection) FindOneIdNoCache(v interface{}, id interface{}) error { +func (c *cachedCollection) FindOneIdNoCache(v, id interface{}) error { q := c.collection.FindId(id) return q.One(v) } diff --git a/core/stores/mongoc/cachedmodel.go b/core/stores/mongoc/cachedmodel.go index e5d59090..88142f06 100644 --- a/core/stores/mongoc/cachedmodel.go +++ b/core/stores/mongoc/cachedmodel.go @@ -75,7 +75,7 @@ func (mm *Model) GetCollection(session *mgo.Session) CachedCollection { } // FindAllNoCache finds all records without cache. -func (mm *Model) FindAllNoCache(v interface{}, query interface{}, opts ...QueryOption) error { +func (mm *Model) FindAllNoCache(v, query interface{}, opts ...QueryOption) error { return mm.execute(func(c CachedCollection) error { return c.FindAllNoCache(v, query, opts...) }) @@ -89,7 +89,7 @@ func (mm *Model) FindOne(v interface{}, key string, query interface{}) error { } // FindOneNoCache unmarshals a record into v with query, without cache. -func (mm *Model) FindOneNoCache(v interface{}, query interface{}) error { +func (mm *Model) FindOneNoCache(v, query interface{}) error { return mm.execute(func(c CachedCollection) error { return c.FindOneNoCache(v, query) }) @@ -103,7 +103,7 @@ func (mm *Model) FindOneId(v interface{}, key string, id interface{}) error { } // FindOneIdNoCache unmarshals a record into v with query, without cache. -func (mm *Model) FindOneIdNoCache(v interface{}, id interface{}) error { +func (mm *Model) FindOneIdNoCache(v, id interface{}) error { return mm.execute(func(c CachedCollection) error { return c.FindOneIdNoCache(v, id) }) diff --git a/core/stores/redis/redis.go b/core/stores/redis/redis.go index d60cd4cf..caf05a22 100644 --- a/core/stores/redis/redis.go +++ b/core/stores/redis/redis.go @@ -180,7 +180,7 @@ func (s *Redis) BitOpXor(destKey string, keys ...string) (val int64, err error) } // BitPos is redis bitpos command implementation. -func (s *Redis) BitPos(key string, bit int64, start, end int64) (val int64, err error) { +func (s *Redis) BitPos(key string, bit, start, end int64) (val int64, err error) { err = s.brk.DoWithAcceptable(func() error { conn, err := getRedis(s) if err != nil { @@ -346,7 +346,7 @@ func (s *Redis) GeoAdd(key string, geoLocation ...*GeoLocation) (val int64, err } // GeoDist is the implementation of redis geodist command. -func (s *Redis) GeoDist(key string, member1, member2, unit string) (val float64, err error) { +func (s *Redis) GeoDist(key, member1, member2, unit string) (val float64, err error) { err = s.brk.DoWithAcceptable(func() error { conn, err := getRedis(s) if err != nil { @@ -795,7 +795,7 @@ func (s *Redis) Lpush(key string, values ...interface{}) (val int, err error) { } // Lrange is the implementation of redis lrange command. -func (s *Redis) Lrange(key string, start int, stop int) (val []string, err error) { +func (s *Redis) Lrange(key string, start, stop int) (val []string, err error) { err = s.brk.DoWithAcceptable(func() error { conn, err := getRedis(s) if err != nil { @@ -1074,7 +1074,7 @@ func (s *Redis) ScriptLoad(script string) (string, error) { } // Set is the implementation of redis set command. -func (s *Redis) Set(key string, value string) error { +func (s *Redis) Set(key, value string) error { return s.brk.DoWithAcceptable(func() error { conn, err := getRedis(s) if err != nil { @@ -1412,7 +1412,7 @@ func (s *Redis) Zincrby(key string, increment int64, field string) (val int64, e } // Zscore is the implementation of redis zscore command. -func (s *Redis) Zscore(key string, value string) (val int64, err error) { +func (s *Redis) Zscore(key, value string) (val int64, err error) { err = s.brk.DoWithAcceptable(func() error { conn, err := getRedis(s) if err != nil { @@ -1684,7 +1684,7 @@ func (s *Redis) ZrevrangebyscoreWithScoresAndLimit(key string, start, stop int64 } // Zrevrank is the implementation of redis zrevrank command. -func (s *Redis) Zrevrank(key string, field string) (val int64, err error) { +func (s *Redis) Zrevrank(key, field string) (val int64, err error) { err = s.brk.DoWithAcceptable(func() error { conn, err := getRedis(s) if err != nil { diff --git a/core/stringx/strings.go b/core/stringx/strings.go index 0274b5b1..477fdd07 100644 --- a/core/stringx/strings.go +++ b/core/stringx/strings.go @@ -86,7 +86,7 @@ func Reverse(s string) string { } // Substr returns runes between start and stop [start, stop) regardless of the chars are ascii or utf8. -func Substr(str string, start int, stop int) (string, error) { +func Substr(str string, start, stop int) (string, error) { rs := []rune(str) length := len(rs) diff --git a/rest/engine_test.go b/rest/engine_test.go index eff1c12e..f5eac8f1 100644 --- a/rest/engine_test.go +++ b/rest/engine_test.go @@ -159,7 +159,7 @@ type mockedRouter struct{} func (m mockedRouter) ServeHTTP(writer http.ResponseWriter, request *http.Request) { } -func (m mockedRouter) Handle(method string, path string, handler http.Handler) error { +func (m mockedRouter) Handle(method, path string, handler http.Handler) error { return errors.New("foo") } diff --git a/rest/httpx/router.go b/rest/httpx/router.go index dc58cadb..e4430bff 100644 --- a/rest/httpx/router.go +++ b/rest/httpx/router.go @@ -5,7 +5,7 @@ import "net/http" // Router interface represents a http router that handles http requests. type Router interface { http.Handler - Handle(method string, path string, handler http.Handler) error + Handle(method, path string, handler http.Handler) error SetNotFoundHandler(handler http.Handler) SetNotAllowedHandler(handler http.Handler) } diff --git a/tools/goctl/api/docgen/doc.go b/tools/goctl/api/docgen/doc.go index dba54186..a479f27c 100644 --- a/tools/goctl/api/docgen/doc.go +++ b/tools/goctl/api/docgen/doc.go @@ -33,7 +33,7 @@ const ( ` ) -func genDoc(api *spec.ApiSpec, dir string, filename string) error { +func genDoc(api *spec.ApiSpec, dir, filename string) error { fp, _, err := util.MaybeCreateFile(dir, "", filename) if err != nil { return err diff --git a/tools/goctl/api/parser/g4/ast/api.go b/tools/goctl/api/parser/g4/ast/api.go index 45a12c3d..2b601d87 100644 --- a/tools/goctl/api/parser/g4/ast/api.go +++ b/tools/goctl/api/parser/g4/ast/api.go @@ -42,7 +42,7 @@ func (v *ApiVisitor) VisitApi(ctx *api.ApiContext) interface{} { return &final } -func (v *ApiVisitor) acceptService(root *Api, final *Api) { +func (v *ApiVisitor) acceptService(root, final *Api) { for _, service := range root.Service { if _, ok := final.serviceM[service.ServiceApi.Name.Text()]; !ok && len(final.serviceM) > 0 { v.panic(service.ServiceApi.Name, fmt.Sprintf("mutiple service declaration")) @@ -104,7 +104,7 @@ func (v *ApiVisitor) duplicateServerItemCheck(service *Service) { } } -func (v *ApiVisitor) acceptType(root *Api, final *Api) { +func (v *ApiVisitor) acceptType(root, final *Api) { for _, tp := range root.Type { if _, ok := final.typeM[tp.NameExpr().Text()]; ok { v.panic(tp.NameExpr(), fmt.Sprintf("duplicate type '%s'", tp.NameExpr().Text())) @@ -115,7 +115,7 @@ func (v *ApiVisitor) acceptType(root *Api, final *Api) { } } -func (v *ApiVisitor) acceptInfo(root *Api, final *Api) { +func (v *ApiVisitor) acceptInfo(root, final *Api) { if root.Info != nil { infoM := map[string]PlaceHolder{} if final.Info != nil { @@ -133,7 +133,7 @@ func (v *ApiVisitor) acceptInfo(root *Api, final *Api) { } } -func (v *ApiVisitor) acceptImport(root *Api, final *Api) { +func (v *ApiVisitor) acceptImport(root, final *Api) { for _, imp := range root.Import { if _, ok := final.importM[imp.Value.Text()]; ok { v.panic(imp.Import, fmt.Sprintf("duplicate import '%s'", imp.Value.Text())) @@ -144,7 +144,7 @@ func (v *ApiVisitor) acceptImport(root *Api, final *Api) { } } -func (v *ApiVisitor) acceptSyntax(root *Api, final *Api) { +func (v *ApiVisitor) acceptSyntax(root, final *Api) { if root.Syntax != nil { if final.Syntax != nil { v.panic(root.Syntax.Syntax, fmt.Sprintf("mutiple syntax declaration")) diff --git a/tools/goctl/api/parser/g4/ast/apiparser.go b/tools/goctl/api/parser/g4/ast/apiparser.go index 9835cae0..bdf5e91c 100644 --- a/tools/goctl/api/parser/g4/ast/apiparser.go +++ b/tools/goctl/api/parser/g4/ast/apiparser.go @@ -177,7 +177,7 @@ func (p *Parser) invoke(linePrefix, content string) (v *Api, err error) { return } -func (p *Parser) valid(mainApi *Api, nestedApi *Api) error { +func (p *Parser) valid(mainApi, nestedApi *Api) error { err := p.nestedApiCheck(mainApi, nestedApi) if err != nil { return err @@ -237,7 +237,7 @@ func (p *Parser) valid(mainApi *Api, nestedApi *Api) error { return nil } -func (p *Parser) duplicateRouteCheck(nestedApi *Api, mainHandlerMap map[string]PlaceHolder, mainRouteMap map[string]PlaceHolder) error { +func (p *Parser) duplicateRouteCheck(nestedApi *Api, mainHandlerMap, mainRouteMap map[string]PlaceHolder) error { for _, each := range nestedApi.Service { for _, r := range each.ServiceApi.ServiceRoute { handler := r.GetHandler() @@ -260,7 +260,7 @@ func (p *Parser) duplicateRouteCheck(nestedApi *Api, mainHandlerMap map[string]P return nil } -func (p *Parser) nestedApiCheck(mainApi *Api, nestedApi *Api) error { +func (p *Parser) nestedApiCheck(mainApi, nestedApi *Api) error { if len(nestedApi.Import) > 0 { importToken := nestedApi.Import[0].Import return fmt.Errorf("%s line %d:%d the nested api does not support import", diff --git a/tools/goctl/model/sql/gen/keys_test.go b/tools/goctl/model/sql/gen/keys_test.go index 8fd9e507..45682c57 100644 --- a/tools/goctl/model/sql/gen/keys_test.go +++ b/tools/goctl/model/sql/gen/keys_test.go @@ -136,7 +136,7 @@ func TestGenCacheKeys(t *testing.T) { }) } -func cacheKeyEqual(k1 Key, k2 Key) bool { +func cacheKeyEqual(k1, k2 Key) bool { k1Join := k1.FieldNameJoin k2Join := k2.FieldNameJoin sort.Strings(k1Join) diff --git a/tools/goctl/model/sql/test/model/studentmodel.go b/tools/goctl/model/sql/test/model/studentmodel.go index 2acac963..cba62675 100755 --- a/tools/goctl/model/sql/test/model/studentmodel.go +++ b/tools/goctl/model/sql/test/model/studentmodel.go @@ -28,7 +28,7 @@ type ( StudentModel interface { Insert(data Student) (sql.Result, error) FindOne(id int64) (*Student, error) - FindOneByClassName(class string, name string) (*Student, error) + FindOneByClassName(class, name string) (*Student, error) Update(data Student) error // only for test Delete(id int64, className, studentName string) error @@ -85,7 +85,7 @@ func (m *defaultStudentModel) FindOne(id int64) (*Student, error) { } } -func (m *defaultStudentModel) FindOneByClassName(class string, name string) (*Student, error) { +func (m *defaultStudentModel) FindOneByClassName(class, name string) (*Student, error) { studentClassNameKey := fmt.Sprintf("%s%v%v", cacheStudentClassNamePrefix, class, name) var resp Student err := m.QueryRowIndex(&resp, studentClassNameKey, m.formatPrimary, func(conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { diff --git a/tools/goctl/plugin/plugin.go b/tools/goctl/plugin/plugin.go index 9e47b082..3ab8783b 100644 --- a/tools/goctl/plugin/plugin.go +++ b/tools/goctl/plugin/plugin.go @@ -136,7 +136,7 @@ func getCommand(arg string) (string, bool, error) { return arg, false, nil } -func downloadFile(filepath string, url string) error { +func downloadFile(filepath, url string) error { resp, err := http.Get(url) if err != nil { return err diff --git a/tools/goctl/rpc/execx/execx.go b/tools/goctl/rpc/execx/execx.go index e7536935..2c674d2a 100644 --- a/tools/goctl/rpc/execx/execx.go +++ b/tools/goctl/rpc/execx/execx.go @@ -15,7 +15,7 @@ import ( // Run provides the execution of shell scripts in golang, // which can support macOS, Windows, and Linux operating systems. // Other operating systems are currently not supported -func Run(arg string, dir string, in ...*bytes.Buffer) (string, error) { +func Run(arg, dir string, in ...*bytes.Buffer) (string, error) { goos := runtime.GOOS var cmd *exec.Cmd switch goos {