Fix err (#2608)

* refactor: refactor workflows contents. * add tool workflows. * update field. * fix: remove chat error. * Fix err. * fix error. * remove cn comment. * update workflows files. * update infra config. * move workflows. * feat: update bot. * fix: solve uncorrect outdated msg get. * update get docIDs logic. * update * update skip logic. * fix * update. * fix: delay deleteObject func. * remove unused content. * update log type. * feat: implement request batch count limit. * update * update * feat: add rocksTimeout * feat: wrap logs * feat: add logs * feat: listen config * feat: enable listen TIME_WAIT port * feat: add logs * feat: cache batch * chore: enable fullUserCache * feat: push rpc num * feat: push err * feat: with operationID * feat: sleep * feat: change 1s * feat: change log * feat: implement Getbatch in rpcCache. * feat: print getOnline cost * feat: change log * feat: change kafka and push config * feat: del interface * feat: fix err * feat: change config * feat: go mod * feat: change config * feat: change config * feat: add sleep in push * feat: warn logs * feat: logs * feat: logs * feat: change port * feat: start config * feat: remove port reuse * feat: prometheus config * feat: prometheus config * feat: prometheus config * feat: add long time send msg to grafana * feat: init * feat: init * feat: implement offline push. * feat: batch get user online * feat: implement batch Push spilt * update go mod * Revert "feat: change port" This reverts commit 06d5e944 * feat: change port * feat: change config * feat: implement kafka producer and consumer. * update format, * add PushMQ log. * feat: get all online users and init push * feat: lock in online cache * feat: config * fix: init online status * fix: add logs * fix: userIDs * fix: add logs * feat: update Handler logic. * update MQ logic. * update * update * fix: method name * fix: update OfflinePushConsumerHandler. * fix: prommetrics * fix: add logs * fix: ctx * fix: log * fix: config * feat: change port * fix: atomic online cache status --------- Co-authored-by: Monet Lee <monet_lee@163.com>
2026-04-28 06:19:20 +08:00 · 2024-09-12 10:38:17 +08:00
parent b703449615
commit 0276c7df60
43 changed files with 2639 additions and 2105 deletions
@@ -20,7 +20,9 @@ type EvictCallback[K comparable, V any] simplelru.EvictCallback[K, V]

 type LRU[K comparable, V any] interface {
 	Get(key K, fetch func() (V, error)) (V, error)
+	Set(key K, value V)
 	SetHas(key K, value V) bool
+	GetBatch(keys []K, fetch func(keys []K) (map[K]V, error)) (map[K]V, error)
 	Del(key K) bool
 	Stop()
 }
@@ -51,6 +51,11 @@ type ExpirationLRU[K comparable, V any] struct {
 	target     Target
 }

+func (x *ExpirationLRU[K, V]) GetBatch(keys []K, fetch func(keys []K) (map[K]V, error)) (map[K]V, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
 func (x *ExpirationLRU[K, V]) Get(key K, fetch func() (V, error)) (V, error) {
 	x.lock.Lock()
 	v, ok := x.core.Get(key)
@@ -99,5 +104,11 @@ func (x *ExpirationLRU[K, V]) SetHas(key K, value V) bool {
 	return false
 }

+func (x *ExpirationLRU[K, V]) Set(key K, value V) {
+	x.lock.Lock()
+	defer x.lock.Unlock()
+	x.core.Add(key, &expirationLruItem[V]{value: value})
+}
+
 func (x *ExpirationLRU[K, V]) Stop() {
 }
@@ -88,18 +88,76 @@ func (x *LayLRU[K, V]) Get(key K, fetch func() (V, error)) (V, error) {
 	return v.value, v.err
 }

-//func (x *LayLRU[K, V]) Set(key K, value V) {
-//	x.lock.Lock()
-//	x.core.Add(key, &layLruItem[V]{value: value, expires: time.Now().Add(x.successTTL).UnixMilli()})
-//	x.lock.Unlock()
-//}
-//
+func (x *LayLRU[K, V]) GetBatch(keys []K, fetch func(keys []K) (map[K]V, error)) (map[K]V, error) {
+	var (
+		err  error
+		once sync.Once
+	)
+
+	x.lock.Lock()
+	res := make(map[K]V)
+	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, err1 := v.expires, v.value, v.err
+			if expires != 0 && expires > time.Now().UnixMilli() {
+				v.lock.Unlock()
+				x.target.IncrGetHit()
+				res[key] = value
+				if err1 != nil {
+					once.Do(func() {
+						err = err1
+					})
+				}
+				continue
+			}
+		}
+		queries = append(queries, key)
+		x.lock.Unlock()
+	}
+	values, err1 := fetch(queries)
+	if err1 != nil {
+		once.Do(func() {
+			err = err1
+		})
+	}
+	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[key] = val
+	}
+
+	return res, err
+}
+
 //func (x *LayLRU[K, V]) Has(key K) bool {
 //	x.lock.Lock()
 //	defer x.lock.Unlock()
 //	return x.core.Contains(key)
 //}

+func (x *LayLRU[K, V]) Set(key K, value V) {
+	x.lock.Lock()
+	defer x.lock.Unlock()
+	x.core.Add(key, &layLruItem[V]{value: value, expires: time.Now().Add(x.successTTL).UnixMilli()})
+}
+
 func (x *LayLRU[K, V]) SetHas(key K, value V) bool {
 	x.lock.Lock()
 	defer x.lock.Unlock()
@@ -32,6 +32,29 @@ type slotLRU[K comparable, V any] struct {
 	hash  func(k K) uint64
 }

+func (x *slotLRU[K, V]) GetBatch(keys []K, fetch func(keys []K) (map[K]V, error)) (map[K]V, error) {
+	var (
+		slotKeys = make(map[uint64][]K)
+		vs       = make(map[K]V)
+	)
+
+	for _, k := range keys {
+		index := x.getIndex(k)
+		slotKeys[index] = append(slotKeys[index], k)
+	}
+
+	for k, v := range slotKeys {
+		batches, err := x.slots[k].GetBatch(v, fetch)
+		if err != nil {
+			return nil, err
+		}
+		for key, value := range batches {
+			vs[key] = value
+		}
+	}
+	return vs, nil
+}
+
 func (x *slotLRU[K, V]) getIndex(k K) uint64 {
 	return x.hash(k) % x.n
 }
@@ -40,6 +63,10 @@ func (x *slotLRU[K, V]) Get(key K, fetch func() (V, error)) (V, error) {
 	return x.slots[x.getIndex(key)].Get(key, fetch)
 }

+func (x *slotLRU[K, V]) Set(key K, value V) {
+	x.slots[x.getIndex(key)].Set(key, value)
+}
+
 func (x *slotLRU[K, V]) SetHas(key K, value V) bool {
 	return x.slots[x.getIndex(key)].SetHas(key, value)
 }