Merge branch 'fix-err' into fix-err

pkg/localcache/lru/lru_lazy.go

@@ -155,7 +155,50 @@ func (x *LayLRU[K, V]) GetBatch(keys []K, fetchBatch func([]K) (map[K]V, error))
 	return resultMap, nil
 }
 
-func (x *LayLRU[K, V]) SetHasBatch(data map[K]V) {
+func (x *LayLRU[K, V]) GetBatchs(keys []K, fetch func(keys []K) (map[K]V, error)) ([]V, error) {
+	x.lock.Lock()
+	res := make([]V, 0)
+	queries := make([]K, 0)
+	setVs := make(map[K]*layLruItem[V])
+	for _, key := range keys {
+		v, ok := x.core.Get(key)
+		if ok {
+			x.lock.Unlock()
+			v.lock.Lock()
+			expires, value, _ := v.expires, v.value, v.err
+			if expires != 0 && expires > time.Now().UnixMilli() {
+				v.lock.Unlock()
+				x.target.IncrGetHit()
+				res = append(res, value)
+				continue
+			}
+		}
+		queries = append(queries, key)
+		x.lock.Unlock()
+	}
+	values, err := fetch(queries)
+	for key, val := range values {
+		v := &layLruItem[V]{}
+		v.value = val
+
+		if err == nil {
+			v.expires = time.Now().Add(x.successTTL).UnixMilli()
+			x.target.IncrGetSuccess()
+		} else {
+			v.expires = time.Now().Add(x.failedTTL).UnixMilli()
+			x.target.IncrGetFailed()
+		}
+		setVs[key] = v
+		x.lock.Lock()
+		x.core.Add(key, v)
+		x.lock.Unlock()
+		res = append(res, val)
+	}
+
+	return res, err
+}
+
+func (x *LayLRU[K, V]) SetBatch(data map[K]V) bool {
 	x.lock.Lock()
 	defer x.lock.Unlock()
 

pkg/rpccache/online.go

@@ -155,8 +155,6 @@ func (o *OnlineCache) GetUserOnline(ctx context.Context, userID string) (bool, e
 	return len(platformIDs) > 0, nil
 }
 
-// ----------------------
-
 func (o *OnlineCache) getUserOnlinePlatformBatch(ctx context.Context, userIDs []string) (map[string][]int32, error) {
 	platformIDsMap, err := o.lruCache.GetBatch(userIDs, func(missingUsers []string) (map[string][]int32, error) {
 		platformIDsMap := make(map[string][]int32)
@@ -181,8 +179,10 @@ func (o *OnlineCache) getUserOnlinePlatformBatch(ctx context.Context, userIDs []
 	return platformIDsMap, nil
 }
 
-// Finalllllllllllllllllllllllllll
+
-func (o *OnlineCache) GetUsersOnline(ctx context.Context, userIDs []string) ([]string, []string, error) {
+func (o *OnlineCache) GetUsersOnline(ctx context.Context, usersID []string) ([]string, []string, error) {
+	t := time.Now()
+
 	var (
 		onlineUserIDs  []string
 		offlineUserIDs []string
@@ -213,8 +213,8 @@ func (o *OnlineCache) GetUsersOnline(ctx context.Context, userIDs []string) ([]s
 	case false:
 	}
 
-	log.ZWarn(ctx, "get users online", nil, "online users length", len(onlineUserIDs), "offline users length", len(offlineUserIDs))
+	log.ZWarn(ctx, "get users online", nil, "online users length", len(onlineUserIDS), "offline users length", len(offlineUserIDs), "cost", time.Since(t))
-	return onlineUserIDs, offlineUserIDs, nil
+	return onlineUserIDS, offlineUserIDs, nil
 }
 
 //func (o *OnlineCache) GetUsersOnline(ctx context.Context, userIDs []string) ([]string, error) {