chore: redislock use stringx.randn replace randomStr func (#1220)

master
an 3 years ago committed by GitHub
parent d3bfa16813
commit 3a510a9138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -3,6 +3,7 @@ package redis
import ( import (
"crypto/tls" "crypto/tls"
"errors" "errors"
"github.com/tal-tech/go-zero/core/stringx"
"io" "io"
"strconv" "strconv"
"testing" "testing"
@ -186,7 +187,7 @@ func TestRedis_Hscan(t *testing.T) {
key := "hash:test" key := "hash:test"
fieldsAndValues := make(map[string]string) fieldsAndValues := make(map[string]string)
for i := 0; i < 1550; i++ { for i := 0; i < 1550; i++ {
fieldsAndValues["filed_"+strconv.Itoa(i)] = randomStr(i) fieldsAndValues["filed_"+strconv.Itoa(i)] = stringx.Randn(i)
} }
err := client.Hmset(key, fieldsAndValues) err := client.Hmset(key, fieldsAndValues)
assert.Nil(t, err) assert.Nil(t, err)
@ -550,7 +551,7 @@ func TestRedis_Sscan(t *testing.T) {
key := "list" key := "list"
var list []string var list []string
for i := 0; i < 1550; i++ { for i := 0; i < 1550; i++ {
list = append(list, randomStr(i)) list = append(list, stringx.Randn(i))
} }
lens, err := client.Sadd(key, list) lens, err := client.Sadd(key, list)
assert.Nil(t, err) assert.Nil(t, err)

@ -1,6 +1,7 @@
package redis package redis
import ( import (
"github.com/tal-tech/go-zero/core/stringx"
"math/rand" "math/rand"
"strconv" "strconv"
"sync/atomic" "sync/atomic"
@ -45,7 +46,7 @@ func NewRedisLock(store *Redis, key string) *RedisLock {
return &RedisLock{ return &RedisLock{
store: store, store: store,
key: key, key: key,
id: randomStr(randomLen), id: stringx.Randn(randomLen),
} }
} }
@ -92,11 +93,3 @@ func (rl *RedisLock) Release() (bool, error) {
func (rl *RedisLock) SetExpire(seconds int) { func (rl *RedisLock) SetExpire(seconds int) {
atomic.StoreUint32(&rl.seconds, uint32(seconds)) atomic.StoreUint32(&rl.seconds, uint32(seconds))
} }
func randomStr(n int) string {
b := make([]byte, n)
for i := range b {
b[i] = letters[rand.Intn(len(letters))]
}
return string(b)
}

Loading…
Cancel
Save