simplify

Author: lxzan

cache.go

@@ -167,15 +167,9 @@ func (c *MemoryCache) SetWithCallback(key string, value any, exp time.Duration,
 	var expireAt = c.getExp(exp)
 	v, ok := c.fetch(b, key)
 	if ok {
-		var down = expireAt > v.ExpireAt
 		v.Value = value
-		v.ExpireAt = expireAt
 		v.cb = cb
-		if down {
-			b.Heap.Down(v.index, b.Heap.Len())
-		} else {
-			b.Heap.Up(v.index)
-		}
+		b.Heap.UpdateTTL(v, expireAt)
 		return true
 	}
 
@@ -210,14 +204,7 @@ func (c *MemoryCache) GetWithTTL(key string, exp time.Duration) (v any, exist bo
 		return nil, false
 	}
 
-	var expireAt = c.getExp(exp)
-	var down = expireAt > result.ExpireAt
-	result.ExpireAt = expireAt
-	if down {
-		b.Heap.Down(result.index, b.Heap.Len())
-	} else {
-		b.Heap.Up(result.index)
-	}
+	b.Heap.UpdateTTL(result, c.getExp(exp))
 	return result.Value, true
 }
 

heap.go

@@ -12,6 +12,16 @@ type heap struct {
 
 func (c *heap) Less(i, j int) bool { return c.Data[i].ExpireAt < c.Data[j].ExpireAt }
 
+func (c *heap) UpdateTTL(ele *Element, exp int64) {
+	var down = exp > ele.ExpireAt
+	ele.ExpireAt = exp
+	if down {
+		c.Down(ele.index, c.Len())
+	} else {
+		c.Up(ele.index)
+	}
+}
+
 func (c *heap) min(i, j int) int {
 	if c.Data[i].ExpireAt < c.Data[j].ExpireAt {
 		return i
@@ -64,7 +74,7 @@ func (c *heap) Delete(i int) {
 	case 1:
 		c.Data = c.Data[:0]
 	default:
-		var down = c.Data[n-1].ExpireAt > c.Data[i].ExpireAt
+		var down = c.Less(i, n-1)
 		c.Swap(i, n-1)
 		c.Data = c.Data[:n-1]
 		if i < n-1 {