blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-10-25 04:32:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 8cd57d68535f83c6495423e777f6a30c88cbe0f1 into bf0289075b1bc42b597331ea0cff809752449721

Browse Source
This commit is contained in:
xuzhijvn 2025-09-06 17:06:05 +08:00 committed by GitHub
commit 849e32c622
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/common/storage/cache/redis/batch.go vendored
View File

@ -76,6 +76,27 @@ func batchGetCache2[K comparable, V any](ctx context.Context, rcClient *rocksCac
if err != nil { if err != nil {
return nil, err return nil, err
} }
values, err := fn(ctx, ids)
if err != nil {
log.ZError(ctx, "batchGetCache query database failed", err, "ids", ids)
return nil, err
}
idToValue := make(map[K]*V)
for _, value := range values {
idToValue[vId(value)] = value
}
getSlotValues := func(slotIds []K) []*V {
if len(slotIds) == 0 {
return nil
}
slotValues := make([]*V, 0, len(slotIds))
for _, id := range slotIds {
if value, ok := idToValue[id]; ok {
slotValues = append(slotValues, value)
}
}
return slotValues
}
result := make([]*V, 0, len(findKeys)) result := make([]*V, 0, len(findKeys))
for _, keys := range slotKeys { for _, keys := range slotKeys {
indexCache, err := rcClient.GetClient().FetchBatch2(ctx, keys, expire, func(idx []int) (map[int]string, error) { indexCache, err := rcClient.GetClient().FetchBatch2(ctx, keys, expire, func(idx []int) (map[int]string, error) {
@ -86,16 +107,12 @@ func batchGetCache2[K comparable, V any](ctx context.Context, rcClient *rocksCac
idIndex[id] = index idIndex[id] = index
queryIds = append(queryIds, id) queryIds = append(queryIds, id)
} }
values, err := fn(ctx, queryIds) slotValues := getSlotValues(queryIds)
if err != nil { if len(slotValues) == 0 {
log.ZError(ctx, "batchGetCache query database failed", err, "keys", keys, "queryIds", queryIds)
return nil, err
}
if len(values) == 0 {
return map[int]string{}, nil return map[int]string{}, nil
} }
cacheIndex := make(map[int]string) cacheIndex := make(map[int]string)
for _, value := range values { for _, value := range slotValues {
id := vId(value) id := vId(value)
index, ok := idIndex[id] index, ok := idIndex[id]
if !ok { if !ok {