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

chore: refactor to reduce duplicated code (#2477)

Browse Source
This commit is contained in:
Kevin Wan
2022-10-01 21:45:53 +08:00
committed by GitHub
parent 4b9066eda6
commit 1bc138bd34
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,20 +226,7 @@ func (s *Redis) Blpop(node RedisNode, key string) (string, error) {
// BlpopCtx uses passed in redis connection to execute blocking queries. // BlpopCtx uses passed in redis connection to execute blocking queries.
// Doesn't benefit from pooling redis connections of blocking queries // Doesn't benefit from pooling redis connections of blocking queries
func (s *Redis) BlpopCtx(ctx context.Context, node RedisNode, key string) (string, error) { func (s *Redis) BlpopCtx(ctx context.Context, node RedisNode, key string) (string, error) {
if node == nil { return s.BlpopWithTimeoutCtx(ctx, node, blockingQueryTimeout, key)
return "", ErrNilNode
}
vals, err := node.BLPop(ctx, blockingQueryTimeout, key).Result()
if err != nil {
return "", err
}
if len(vals) < 2 {
return "", fmt.Errorf("no value on key: %s", key)
}
return vals[1], nil
} }
// BlpopEx uses passed in redis connection to execute blpop command. // BlpopEx uses passed in redis connection to execute blpop command.
@@ -275,7 +262,8 @@ func (s *Redis) BlpopWithTimeout(node RedisNode, timeout time.Duration, key stri
// BlpopWithTimeoutCtx uses passed in redis connection to execute blpop command. // BlpopWithTimeoutCtx uses passed in redis connection to execute blpop command.
// Control blocking query timeout // Control blocking query timeout
func (s *Redis) BlpopWithTimeoutCtx(ctx context.Context, node RedisNode, timeout time.Duration, key string) (string, error) { func (s *Redis) BlpopWithTimeoutCtx(ctx context.Context, node RedisNode, timeout time.Duration,
key string) (string, error) {
if node == nil { if node == nil {
return "", ErrNilNode return "", ErrNilNode
} }