update cause of update

SaintWish · Dec 26, 2023 · f9af0d5 · f9af0d5
1 parent c5c2d06
commit f9af0d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/kv1/shardmap.go b/kv1/shardmap.go
@@ -42,7 +42,7 @@ func (m *shard[K, V]) get(key K) (val V) {
 func (m *shard[K, V]) getRenew(key K) (val V) {
 	m.Lock()
 
-	if v,ok := m.Map.GetHas(key); ok {
+	if ok,v := m.Map.GetHas(key); ok {
 		v.Expire = time.Now().Add(m.Expiration)
 		m.Map.Set(key, v)
 		val = v.Object
@@ -66,7 +66,7 @@ func (m *shard[K, V]) has(key K) (ok bool) {
 func (m *shard[K, V]) getHas(key K) (val V, ok bool) {
 	m.RLock()
 
-	v,ok := m.Map.GetHas(key);
+	ok,v := m.Map.GetHas(key);
 	val = v.Object
 
 	m.RUnlock()
@@ -77,7 +77,7 @@ func (m *shard[K, V]) getHas(key K) (val V, ok bool) {
 func (m *shard[K, V]) getHasRenew(key K) (val V, ok bool) {
 	m.Lock()
 
-	if v,ok := m.Map.GetHas(key); ok {
+	if ok,v := m.Map.GetHas(key); ok {
 		v.Expire = time.Now().Add(m.Expiration)
 		m.Map.Set(key, v)
 		val = v.Object
@@ -118,7 +118,7 @@ func (m *shard[K, V]) delete(key K) (ok bool) {
 func (m *shard[K, V]) isExpired(key K) (ex bool) {
 	m.RLock()
 
-	if v, ok := m.Map.GetHas(key); ok {
+	if ok,v:= m.Map.GetHas(key); ok {
 		ex = time.Now().After(v.Expire)
 	}
 
@@ -131,7 +131,7 @@ func (m *shard[K, V]) evictItem(key K, cb func(K,V)) (ex bool) {
 	m.Lock()
 
 	ex = false
-	if v, ok := m.Map.GetHas(key); ok {
+	if ok,v := m.Map.GetHas(key); ok {
 		if time.Now().After(v.Expire) {
 			ex = true
 			cb(key, v.Object)
@@ -169,7 +169,7 @@ func (m *shard[K, V]) renew(key K) {
 
 	m.Lock()
 
-	if v, ok := m.Map.GetHas(key); ok {
+	if ok,v := m.Map.GetHas(key); ok {
 		v.Expire = expire
 	}
 

diff --git a/kv1s/shard.go b/kv1s/shard.go
@@ -30,14 +30,14 @@ func (m *shard[K, V]) has(key K) bool {
 	return ok
 }
 
-func (m *shard[K, V]) getHas(key K) (V, bool) {
+func (m *shard[K, V]) getHas(key K) (val V, ok bool) {
 	m.RLock()
 
-	val, ok := m.Map.GetHas(key)
+	ok, val = m.Map.GetHas(key)
 
 	m.RUnlock()
 
-	return val, ok
+	return
 }
 
 func (m *shard[K, V]) getHasRenew(key K) (V, bool) {
@@ -72,7 +72,7 @@ func (m *shard[K, V]) set(key K, val V, callback func(K, V)) {
 func (m *shard[K, V]) update(key K, val V) {
 	m.Lock()
 
-	if val, ok := m.Map.GetHas(key); ok {
+	if ok, val := m.Map.GetHas(key); ok {
 		m.Map.Set(key, val)
 	}
 

diff --git a/kv2/shardcapcity.go b/kv2/shardcapcity.go
@@ -39,7 +39,7 @@ func (m *shardCapacity[K, V]) has(key K) bool {
 func (m *shardCapacity[K, V]) getHasRenew(key K) (V, bool) {
 	m.Lock()
 
-	val, ok := m.Map.GetHas(key)
+	ok,val := m.Map.GetHas(key)
 	val.Index = m.Stack.MoveToBack(val.Index)
 	m.Map.Set(key, val)
 
@@ -51,7 +51,7 @@ func (m *shardCapacity[K, V]) getHasRenew(key K) (V, bool) {
 func (m *shardCapacity[K, V]) getHas(key K) (V, bool) {
 	m.RLock()
 
-	val, ok := m.Map.GetHas(key)
+	ok,val := m.Map.GetHas(key)
 
 	m.RUnlock()
 
@@ -111,7 +111,7 @@ func (m *shardCapacity[K, V]) set(key K, val V, callback func(K, V)) {
 func (m *shardCapacity[K, V]) update(key K, val V) {
 	m.Lock()
 
-	if v, ok := m.Map.GetHas(key); ok {
+	if ok,v := m.Map.GetHas(key); ok {
 		v.Object = val
 		v.Index = m.Stack.MoveToBack(v.Index)
 		m.Map.Set(key, v)