fix bug of structure pointer func
This commit is contained in:
douxu
parent
3d79993de2
commit
25a55b94e8
|
|
@ -37,17 +37,17 @@ func (rs *RedisSet) SADD(setKey string, members ...interface{}) error {
|
|||
}
|
||||
|
||||
// SREM define func of remove the specified members from redis set by key
|
||||
func (rh *RedisHash) SREM(setKey string, members ...interface{}) error {
|
||||
err := rh.rwLocker.WLock()
|
||||
func (rs *RedisSet) SREM(setKey string, members ...interface{}) error {
|
||||
err := rs.rwLocker.WLock()
|
||||
if err != nil {
|
||||
rh.logger.Error("lock wLock by setKey failed", zap.String("setKey", setKey), zap.Error(err))
|
||||
rs.logger.Error("lock wLock by setKey failed", zap.String("setKey", setKey), zap.Error(err))
|
||||
return err
|
||||
}
|
||||
defer rh.rwLocker.UnWLock()
|
||||
defer rs.rwLocker.UnWLock()
|
||||
|
||||
count, err := rh.storageClient.SRem(rh.ctx, setKey, members).Result()
|
||||
count, err := rs.storageClient.SRem(rs.ctx, setKey, members).Result()
|
||||
if err != nil || count != int64(len(members)) {
|
||||
rh.logger.Error("rem members from set failed", zap.String("setKey", setKey), zap.Any("members", members), zap.Error(err))
|
||||
rs.logger.Error("rem members from set failed", zap.String("setKey", setKey), zap.Any("members", members), zap.Error(err))
|
||||
|
||||
return fmt.Errorf("rem members from set failed:%w", err)
|
||||
}
|
||||
|
|
@ -55,17 +55,17 @@ func (rh *RedisHash) SREM(setKey string, members ...interface{}) error {
|
|||
}
|
||||
|
||||
// SMembers define func of get all memebers from redis set by key
|
||||
func (rh *RedisHash) SMembers(setKey string) ([]string, error) {
|
||||
err := rh.rwLocker.RLock()
|
||||
func (rs *RedisSet) SMembers(setKey string) ([]string, error) {
|
||||
err := rs.rwLocker.RLock()
|
||||
if err != nil {
|
||||
rh.logger.Error("lock rLock by setKey failed", zap.String("setKey", setKey), zap.Error(err))
|
||||
rs.logger.Error("lock rLock by setKey failed", zap.String("setKey", setKey), zap.Error(err))
|
||||
return nil, err
|
||||
}
|
||||
defer rh.rwLocker.UnRLock()
|
||||
defer rs.rwLocker.UnRLock()
|
||||
|
||||
result, err := rh.storageClient.SMembers(rh.ctx, setKey).Result()
|
||||
result, err := rs.storageClient.SMembers(rs.ctx, setKey).Result()
|
||||
if err != nil {
|
||||
rh.logger.Error("get all hash field by hash key failed", zap.String("setKey", setKey), zap.Error(err))
|
||||
rs.logger.Error("get all hash field by hash key failed", zap.String("setKey", setKey), zap.Error(err))
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
|
|
@ -73,13 +73,6 @@ func (rh *RedisHash) SMembers(setKey string) ([]string, error) {
|
|||
|
||||
// SIsMember define func of determine whether an member is in set by key
|
||||
func (rh *RedisHash) SIsMember(setKey string, member interface{}) (bool, error) {
|
||||
err := rh.rwLocker.RLock()
|
||||
if err != nil {
|
||||
rh.logger.Error("lock rLock by setKey failed", zap.String("setKey", setKey), zap.Error(err))
|
||||
return false, err
|
||||
}
|
||||
defer rh.rwLocker.UnRLock()
|
||||
|
||||
result, err := rh.storageClient.SIsMember(rh.ctx, setKey, member).Result()
|
||||
if err != nil {
|
||||
rh.logger.Error("get all hash field by hash key failed", zap.String("setKey", setKey), zap.Error(err))
|
||||
|
|
|
|||
10
go.sum
10
go.sum
|
|
@ -11,6 +11,10 @@ github.com/actgardner/gogen-avro/v9 v9.1.0/go.mod h1:nyTj6wPqDJoxM3qdnjcLv+EnMDS
|
|||
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
|
||||
github.com/bitly/go-simplejson v0.5.1 h1:xgwPbetQScXt1gh9BmoJ6j9JMr3TElvuIyjR8pgdoow=
|
||||
github.com/bitly/go-simplejson v0.5.1/go.mod h1:YOPVLzCfwK14b4Sff3oP1AmGhI9T9Vsg84etUnlyp+Q=
|
||||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
||||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
||||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
||||
github.com/bytedance/sonic v1.12.5 h1:hoZxY8uW+mT+OpkcUWw4k0fDINtOcVavEsGfzwzFU/w=
|
||||
github.com/bytedance/sonic v1.12.5/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
|
||||
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
|
||||
|
|
@ -18,6 +22,8 @@ github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iC
|
|||
github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||
|
|
@ -39,6 +45,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||
|
|
@ -219,6 +227,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
|
|||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
|
||||
github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
|
||||
github.com/rogpeppe/clock v0.0.0-20190514195947-2896927a307a/go.mod h1:4r5QyqhjIWCcK8DO4KMclc5Iknq5qVBAlbYYzAbUScQ=
|
||||
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
|
||||
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
|
||||
|
|
|
|||
Loading…
Reference in New Issue