github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: return original value of setbit in redis (#1746)

Browse Source
This commit is contained in:
Kevin Wan 2022-04-02 20:25:51 +08:00 committed by GitHub
parent dfd58c213c
commit e0fa8d820d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1404,21 +1404,28 @@ func (s *Redis) ScanCtx(ctx context.Context, cursor uint64, match string, count
} }
// SetBit is the implementation of redis setbit command. // SetBit is the implementation of redis setbit command.
func (s *Redis) SetBit(key string, offset int64, value int) error { func (s *Redis) SetBit(key string, offset int64, value int) (int, error) {
return s.SetBitCtx(context.Background(), key, offset, value) return s.SetBitCtx(context.Background(), key, offset, value)
} }
// SetBitCtx is the implementation of redis setbit command. // SetBitCtx is the implementation of redis setbit command.
func (s *Redis) SetBitCtx(ctx context.Context, key string, offset int64, value int) error { func (s *Redis) SetBitCtx(ctx context.Context, key string, offset int64, value int) (val int, err error) {
return s.brk.DoWithAcceptable(func() error { err = s.brk.DoWithAcceptable(func() error {
conn, err := getRedis(s) conn, err := getRedis(s)
if err != nil { if err != nil {
return err return err
} }
_, err = conn.SetBit(ctx, key, offset, value).Result() v, err := conn.SetBit(ctx, key, offset, value).Result()
return err if err != nil {
return err
}
val = int(v)
return nil
}, acceptable) }, acceptable)
return
} }
// Sscan is the implementation of redis sscan command. // Sscan is the implementation of redis sscan command.

15
core/stores/redis/redis_test.go
View File

@ -387,30 +387,33 @@ func TestRedis_Mget(t *testing.T) {
func TestRedis_SetBit(t *testing.T) { func TestRedis_SetBit(t *testing.T) {
runOnRedis(t, func(client *Redis) { runOnRedis(t, func(client *Redis) {
err := New(client.Addr, badType()).SetBit("key", 1, 1) _, err := New(client.Addr, badType()).SetBit("key", 1, 1)
assert.NotNil(t, err) assert.NotNil(t, err)
err = client.SetBit("key", 1, 1) val, err := client.SetBit("key", 1, 1)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 0, val)
}) })
} }
func TestRedis_GetBit(t *testing.T) { func TestRedis_GetBit(t *testing.T) {
runOnRedis(t, func(client *Redis) { runOnRedis(t, func(client *Redis) {
err := client.SetBit("key", 2, 1) val, err := client.SetBit("key", 2, 1)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 0, val)
_, err = New(client.Addr, badType()).GetBit("key", 2) _, err = New(client.Addr, badType()).GetBit("key", 2)
assert.NotNil(t, err) assert.NotNil(t, err)
val, err := client.GetBit("key", 2) v, err := client.GetBit("key", 2)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 1, val) assert.Equal(t, 1, v)
}) })
} }
func TestRedis_BitCount(t *testing.T) { func TestRedis_BitCount(t *testing.T) {
runOnRedis(t, func(client *Redis) { runOnRedis(t, func(client *Redis) {
for i := 0; i < 11; i++ { for i := 0; i < 11; i++ {
err := client.SetBit("key", int64(i), 1) val, err := client.SetBit("key", int64(i), 1)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 0, val)
} }
_, err := New(client.Addr, badType()).BitCount("key", 0, -1) _, err := New(client.Addr, badType()).BitCount("key", 0, -1)