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

ConcurrentDict Remove add decreaseCount

Browse Source
This commit is contained in:
liyuxing
2021-07-01 10:46:42 +08:00
committed by finley
parent af0ffe6e83
commit 453fef5de1
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datastruct/dict/concurrent.go
View File

@@ -168,6 +168,7 @@ func (dict *ConcurrentDict) Remove(key string) (result int) {
if _, ok := shard.m[key]; ok { if _, ok := shard.m[key]; ok {
delete(shard.m, key) delete(shard.m, key)
dict.decreaseCount()
return 1 return 1
} }
return 0 return 0
@@ -177,6 +178,10 @@ func (dict *ConcurrentDict) addCount() int32 {
return atomic.AddInt32(&dict.count, 1) return atomic.AddInt32(&dict.count, 1)
} }
func (dict *ConcurrentDict) decreaseCount() int32 {
return atomic.AddInt32(&dict.count, -1)
}
// ForEach traversal the dict // ForEach traversal the dict
// it may not visits new entry inserted during traversal // it may not visits new entry inserted during traversal
func (dict *ConcurrentDict) ForEach(consumer Consumer) { func (dict *ConcurrentDict) ForEach(consumer Consumer) {

15
datastruct/dict/concurrent_test.go
View File

@@ -116,14 +116,17 @@ func TestConcurrentPutIfExists(t *testing.T) {
func TestConcurrentRemove(t *testing.T) { func TestConcurrentRemove(t *testing.T) {
d := MakeConcurrent(0) d := MakeConcurrent(0)
totalCount := 100
// remove head node // remove head node
for i := 0; i < 100; i++ { for i := 0; i < totalCount; i++ {
// insert // insert
key := "k" + strconv.Itoa(i) key := "k" + strconv.Itoa(i)
d.Put(key, i) d.Put(key, i)
} }
for i := 0; i < 100; i++ { if d.Len()!=totalCount{
t.Error("put test failed: expected len is 100, actual: " + strconv.Itoa(d.Len()))
}
for i := 0; i < totalCount; i++ {
key := "k" + strconv.Itoa(i) key := "k" + strconv.Itoa(i)
val, ok := d.Get(key) val, ok := d.Get(key)
@@ -140,6 +143,9 @@ func TestConcurrentRemove(t *testing.T) {
if ret != 1 { if ret != 1 {
t.Error("remove test failed: expected result 1, actual: " + strconv.Itoa(ret) + ", key:" + key) t.Error("remove test failed: expected result 1, actual: " + strconv.Itoa(ret) + ", key:" + key)
} }
if d.Len()!=totalCount-i-1{
t.Error("put test failed: expected len is 99, actual: " + strconv.Itoa(d.Len()))
}
_, ok = d.Get(key) _, ok = d.Get(key)
if ok { if ok {
t.Error("remove test failed: expected true, actual false") t.Error("remove test failed: expected true, actual false")
@@ -148,6 +154,9 @@ func TestConcurrentRemove(t *testing.T) {
if ret != 0 { if ret != 0 {
t.Error("remove test failed: expected result 0 actual: " + strconv.Itoa(ret)) t.Error("remove test failed: expected result 0 actual: " + strconv.Itoa(ret))
} }
if d.Len()!=totalCount-i-1{
t.Error("put test failed: expected len is 99, actual: " + strconv.Itoa(d.Len()))
}
} }
// remove tail node // remove tail node