From 171b3bc59c1ecba614519eb4a85b1e2696661de8 Mon Sep 17 00:00:00 2001
From: xing <fthvgb1@163.com>
Date: Sat, 28 Oct 2023 14:50:06 +0800
Subject: [PATCH] optimize again

---
 cache/map.go | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/cache/map.go b/cache/map.go
index 158de1b..aa7465e 100644
--- a/cache/map.go
+++ b/cache/map.go
@@ -129,25 +129,23 @@ func (m *MapCache[K, V]) GetCache(c context.Context, key K, timeout time.Duratio
 }
 
 func (m *MapCache[K, V]) GetCacheBatch(c context.Context, key []K, timeout time.Duration, params ...any) ([]V, error) {
-	var res []V
-	ver := 0
+	var res = make([]V, 0, len(key))
+	var ver = 0
 	var needFlush []K
-	var needIndex = make(map[int]K)
-	slice.ForEach(key, func(i int, k K) {
+	var needIndex = make(map[K]int)
+	for i, k := range key {
 		v, ok := m.Get(c, k)
-		var vv V
-		if ok {
-			vv = v
-		} else {
+		if !ok {
 			needFlush = append(needFlush, k)
 			ver += m.Ver(c, k)
-			needIndex[i] = k
+			needIndex[k] = i
 		}
-		res = append(res, vv)
-	})
+		res = append(res, v)
+	}
 	if len(needFlush) < 1 {
 		return res, nil
 	}
+
 	var err error
 	call := func() {
 		m.mux.Lock()
@@ -168,6 +166,9 @@ func (m *MapCache[K, V]) GetCacheBatch(c context.Context, key []K, timeout time.
 		}
 		for k, v := range r {
 			m.Set(c, k, v)
+			if i, ok := needIndex[k]; ok {
+				res[i] = v
+			}
 		}
 	}
 	if timeout > 0 {
@@ -186,11 +187,6 @@ func (m *MapCache[K, V]) GetCacheBatch(c context.Context, key []K, timeout time.
 	} else {
 		call()
 	}
-	for index, k := range needIndex {
-		v, ok := m.Get(c, k)
-		if ok {
-			res[index] = v
-		}
-	}
+
 	return res, err
 }