zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix golint issues, else blocks (#457)

Browse Source
This commit is contained in:
Kevin Wan
2021-02-09 13:50:21 +08:00
committed by GitHub
parent 42883d0899
commit 5e969cbef0
66 changed files with 341 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/stores/cache/cachenode.go vendored
View File

@@ -75,11 +75,12 @@ func (c cacheNode) DelCache(keys ...string) error {
// GetCache gets the cache with key and fills into v.
func (c cacheNode) GetCache(key string, v interface{}) error {
if err := c.doGetCache(key, v); err == errPlaceholder {
err := c.doGetCache(key, v)
if err == errPlaceholder {
return c.errNotFound
} else {
return err
}
return err
}
// IsNotFound checks if the given error is the defined errNotFound.

1
core/stores/clickhouse/clickhouse.go
View File

@@ -1,6 +1,7 @@
package clickhouse
import (
// imports the driver.
_ "github.com/ClickHouse/clickhouse-go"
"github.com/tal-tech/go-zero/core/stores/sqlx"
)

7
core/stores/kv/store.go
View File

@@ -655,9 +655,10 @@ func (cs clusterStore) Zscore(key string, value string) (int64, error) {
}
func (cs clusterStore) getRedis(key string) (*redis.Redis, error) {
if val, ok := cs.dispatcher.Get(key); !ok {
val, ok := cs.dispatcher.Get(key)
if !ok {
return nil, ErrNoRedisNode
} else {
return val.(*redis.Redis), nil
}
return val.(*redis.Redis), nil
}

4
core/stores/mongo/sessionmanager.go
View File

@@ -66,7 +66,7 @@ func (cs *concurrentSession) takeSession(opts ...Option) (*mgo.Session, error) {
if err := cs.limit.Borrow(o.timeout); err != nil {
return nil, err
} else {
return cs.Copy(), nil
}
return cs.Copy(), nil
}

1
core/stores/postgres/postgresql.go
View File

@@ -1,6 +1,7 @@
package postgres
import (
// imports the driver.
_ "github.com/lib/pq"
"github.com/tal-tech/go-zero/core/stores/sqlx"
)

57
core/stores/redis/redis.go
View File

@@ -72,7 +72,7 @@ func NewRedis(redisAddr, redisType string, redisPass ...string) *Redis {
}
}
// Use passed in redis connection to execute blocking queries
// Blpop uses passed in redis connection to execute blocking queries.
// Doesn't benefit from pooling redis connections of blocking queries
func (s *Redis) Blpop(redisNode RedisNode, key string) (string, error) {
if redisNode == nil {
@@ -1093,15 +1093,16 @@ func (s *Redis) Zadd(key string, score int64, value string) (val bool, err error
return err
}
if v, err := conn.ZAdd(key, red.Z{
v, err := conn.ZAdd(key, red.Z{
Score: float64(score),
Member: value,
}).Result(); err != nil {
}).Result()
if err != nil {
return err
} else {
val = v == 1
return nil
}
val = v == 1
return nil
}, acceptable)
return
@@ -1339,15 +1340,16 @@ func (s *Redis) ZrangebyscoreWithScores(key string, start, stop int64) (val []Pa
return err
}
if v, err := conn.ZRangeByScoreWithScores(key, red.ZRangeBy{
v, err := conn.ZRangeByScoreWithScores(key, red.ZRangeBy{
Min: strconv.FormatInt(start, 10),
Max: strconv.FormatInt(stop, 10),
}).Result(); err != nil {
}).Result()
if err != nil {
return err
} else {
val = toPairs(v)
return nil
}
val = toPairs(v)
return nil
}, acceptable)
return
@@ -1365,17 +1367,18 @@ func (s *Redis) ZrangebyscoreWithScoresAndLimit(key string, start, stop int64, p
return err
}
if v, err := conn.ZRangeByScoreWithScores(key, red.ZRangeBy{
v, err := conn.ZRangeByScoreWithScores(key, red.ZRangeBy{
Min: strconv.FormatInt(start, 10),
Max: strconv.FormatInt(stop, 10),
Offset: int64(page * size),
Count: int64(size),
}).Result(); err != nil {
}).Result()
if err != nil {
return err
} else {
val = toPairs(v)
return nil
}
val = toPairs(v)
return nil
}, acceptable)
return
@@ -1402,15 +1405,16 @@ func (s *Redis) ZrevrangebyscoreWithScores(key string, start, stop int64) (val [
return err
}
if v, err := conn.ZRevRangeByScoreWithScores(key, red.ZRangeBy{
v, err := conn.ZRevRangeByScoreWithScores(key, red.ZRangeBy{
Min: strconv.FormatInt(start, 10),
Max: strconv.FormatInt(stop, 10),
}).Result(); err != nil {
}).Result()
if err != nil {
return err
} else {
val = toPairs(v)
return nil
}
val = toPairs(v)
return nil
}, acceptable)
return
@@ -1428,17 +1432,18 @@ func (s *Redis) ZrevrangebyscoreWithScoresAndLimit(key string, start, stop int64
return err
}
if v, err := conn.ZRevRangeByScoreWithScores(key, red.ZRangeBy{
v, err := conn.ZRevRangeByScoreWithScores(key, red.ZRangeBy{
Min: strconv.FormatInt(start, 10),
Max: strconv.FormatInt(stop, 10),
Offset: int64(page * size),
Count: int64(size),
}).Result(); err != nil {
}).Result()
if err != nil {
return err
} else {
val = toPairs(v)
return nil
}
val = toPairs(v)
return nil
}, acceptable)
return

13
core/stores/redis/redislock.go
View File

@@ -63,10 +63,10 @@ func (rl *RedisLock) Acquire() (bool, error) {
reply, ok := resp.(string)
if ok && reply == "OK" {
return true, nil
} else {
logx.Errorf("Unknown reply when acquiring lock for %s: %v", rl.key, resp)
return false, nil
}
logx.Errorf("Unknown reply when acquiring lock for %s: %v", rl.key, resp)
return false, nil
}
func (rl *RedisLock) Release() (bool, error) {
@@ -75,11 +75,12 @@ func (rl *RedisLock) Release() (bool, error) {
return false, err
}
if reply, ok := resp.(int64); !ok {
reply, ok := resp.(int64)
if !ok {
return false, nil
} else {
return reply == 1, nil
}
return reply == 1, nil
}
func (rl *RedisLock) SetExpire(seconds int) {

37
core/stores/sqlx/orm.go
View File

@@ -107,10 +107,10 @@ func parseTagName(field reflect.StructField) string {
key := field.Tag.Get(tagName)
if len(key) == 0 {
return ""
} else {
options := strings.Split(key, ",")
return options[0]
}
options := strings.Split(key, ",")
return options[0]
}
func unmarshalRow(v interface{}, scanner rowsScanner, strict bool) error {
@@ -136,19 +136,21 @@ func unmarshalRow(v interface{}, scanner rowsScanner, strict bool) error {
reflect.String:
if rve.CanSet() {
return scanner.Scan(v)
} else {
return ErrNotSettable
}
return ErrNotSettable
case reflect.Struct:
columns, err := scanner.Columns()
if err != nil {
return err
}
if values, err := mapStructFieldsIntoSlice(rve, columns, strict); err != nil {
values, err := mapStructFieldsIntoSlice(rve, columns, strict)
if err != nil {
return err
} else {
return scanner.Scan(values...)
}
return scanner.Scan(values...)
default:
return ErrUnsupportedValueType
}
@@ -178,10 +180,10 @@ func unmarshalRows(v interface{}, scanner rowsScanner, strict bool) error {
if rve.CanSet() {
if err := scanner.Scan(value); err != nil {
return err
} else {
appendFn(reflect.ValueOf(value))
return nil
}
appendFn(reflect.ValueOf(value))
return nil
}
return ErrNotSettable
}
@@ -207,14 +209,15 @@ func unmarshalRows(v interface{}, scanner rowsScanner, strict bool) error {
for scanner.Next() {
value := reflect.New(base)
if values, err := mapStructFieldsIntoSlice(value, columns, strict); err != nil {
values, err := mapStructFieldsIntoSlice(value, columns, strict)
if err != nil {
return err
}
if err := scanner.Scan(values...); err != nil {
return err
} else {
if err := scanner.Scan(values...); err != nil {
return err
} else {
appendFn(value)
}
appendFn(value)
}
}
default:

17
core/stores/sqlx/sqlconn.go
View File

@@ -101,14 +101,15 @@ func (db *commonSqlConn) Prepare(query string) (stmt StmtSession, err error) {
return err
}
if st, err := conn.Prepare(query); err != nil {
st, err := conn.Prepare(query)
if err != nil {
return err
} else {
stmt = statement{
stmt: st,
}
return nil
}
stmt = statement{
stmt: st,
}
return nil
}, db.acceptable)
return
@@ -148,9 +149,9 @@ func (db *commonSqlConn) acceptable(err error) bool {
ok := err == nil || err == sql.ErrNoRows || err == sql.ErrTxDone
if db.accept == nil {
return ok
} else {
return ok || db.accept(err)
}
return ok || db.accept(err)
}
func (db *commonSqlConn) queryRows(scanner func(*sql.Rows) error, q string, args ...interface{}) error {

23
core/stores/sqlx/tx.go
View File

@@ -24,13 +24,14 @@ func (t txSession) Exec(q string, args ...interface{}) (sql.Result, error) {
}
func (t txSession) Prepare(q string) (StmtSession, error) {
if stmt, err := t.Tx.Prepare(q); err != nil {
stmt, err := t.Tx.Prepare(q)
if err != nil {
return nil, err
} else {
return statement{
stmt: stmt,
}, nil
}
return statement{
stmt: stmt,
}, nil
}
func (t txSession) QueryRow(v interface{}, q string, args ...interface{}) error {
@@ -58,13 +59,14 @@ func (t txSession) QueryRowsPartial(v interface{}, q string, args ...interface{}
}
func begin(db *sql.DB) (trans, error) {
if tx, err := db.Begin(); err != nil {
tx, err := db.Begin()
if err != nil {
return nil, err
} else {
return txSession{
Tx: tx,
}, nil
}
return txSession{
Tx: tx,
}, nil
}
func transact(db *commonSqlConn, b beginnable, fn func(Session) error) (err error) {
@@ -83,6 +85,7 @@ func transactOnConn(conn *sql.DB, b beginnable, fn func(Session) error) (err err
if err != nil {
return
}
defer func() {
if p := recover(); p != nil {
if e := tx.Rollback(); e != nil {