apps/redis-go
0
0
Fork 0
mirror of https://github.com/HDT3213/godis.git synced 2025-11-03 11:02:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix some data race bugs

Browse Source
This commit is contained in:
hdt3213
2021-05-13 09:06:53 +08:00
parent 97d7b84276
commit 30e3995b4c
4 changed files with 62 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
set.go
View File

@@ -68,6 +68,9 @@ func SIsMember(db *DB, args [][]byte) redis.Reply {
key := string(args[0])
member := string(args[1])
db.RLock(key)
defer db.RUnLock(key)
// get set
set, errReply := db.getAsSet(key)
if errReply != nil {
@@ -123,6 +126,9 @@ func SCard(db *DB, args [][]byte) redis.Reply {
}
key := string(args[0])
db.RLock(key)
defer db.RUnLock(key)
// get or init entity
set, errReply := db.getAsSet(key)
if errReply != nil {
@@ -142,8 +148,8 @@ func SMembers(db *DB, args [][]byte) redis.Reply {
key := string(args[0])
// lock
db.locker.RLock(key)
defer db.locker.RUnLock(key)
db.RLock(key)
defer db.RUnLock(key)
// get or init entity
set, errReply := db.getAsSet(key)
@@ -175,8 +181,8 @@ func SInter(db *DB, args [][]byte) redis.Reply {
}
// lock
db.locker.RLocks(keys...)
defer db.locker.RUnLocks(keys...)
db.RLocks(keys...)
defer db.RUnLocks(keys...)
var result *HashSet.Set
for _, key := range keys {
@@ -223,10 +229,11 @@ func SInterStore(db *DB, args [][]byte) redis.Reply {
}
// lock
db.RLocks(keys...)
defer db.RUnLocks(keys...)
db.Lock(dest)
defer db.UnLock(dest)
lockedKeySet := HashSet.Make(keys...)
lockedKeySet.Add(dest)
lockedKeys := lockedKeySet.ToSlice()
db.Locks(lockedKeys...)
defer db.UnLocks(lockedKeys...)
var result *HashSet.Set
for _, key := range keys {
@@ -319,10 +326,11 @@ func SUnionStore(db *DB, args [][]byte) redis.Reply {
}
// lock
db.RLocks(keys...)
defer db.RUnLocks(keys...)
db.Lock(dest)
defer db.UnLock(dest)
lockedKeySet := HashSet.Make(keys...)
lockedKeySet.Add(dest)
lockedKeys := lockedKeySet.ToSlice()
db.Locks(lockedKeys...)
defer db.UnLocks(lockedKeys...)
var result *HashSet.Set
for _, key := range keys {
@@ -422,10 +430,11 @@ func SDiffStore(db *DB, args [][]byte) redis.Reply {
}
// lock
db.RLocks(keys...)
defer db.RUnLocks(keys...)
db.Lock(dest)
defer db.locker.UnLock(dest)
lockedKeySet := HashSet.Make(keys...)
lockedKeySet.Add(dest)
lockedKeys := lockedKeySet.ToSlice()
db.Locks(lockedKeys...)
defer db.UnLocks(lockedKeys...)
var result *HashSet.Set
for i, key := range keys {