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

update resp in add sortVersion field.

Browse Source
This commit is contained in:
Monet Lee 2024-07-19 12:17:04 +08:00
parent 7e9f969a3c
commit 18f4e2956f
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
internal/rpc/group/sync.go
View File

@ -2,7 +2,6 @@ package group
import ( import (
"context" "context"
"slices"
"github.com/openimsdk/open-im-server/v3/internal/rpc/incrversion" "github.com/openimsdk/open-im-server/v3/internal/rpc/incrversion"
"github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/authverify"
@ -144,11 +143,12 @@ func (s *groupServer) BatchGetIncrementalGroupMember(ctx context.Context, req *p
groupsVersionMap := make(map[string]*VersionInfo) groupsVersionMap := make(map[string]*VersionInfo)
groupsMap := make(map[string]*model.Group) groupsMap := make(map[string]*model.Group)
hasGroupUpdateMap := make(map[string]bool) hasGroupUpdateMap := make(map[string]bool)
sortVersionMap := make(map[string]uint64)
var targetKeys, versionIDs []string var targetKeys, versionIDs []string
var versionNumbers []uint64 var versionNumbers []uint64
// var requestBodyLen int var requestBodyLen int
for _, group := range req.ReqList { for _, group := range req.ReqList {
groupsVersionMap[group.GroupID] = &VersionInfo{ groupsVersionMap[group.GroupID] = &VersionInfo{
@ -194,14 +194,20 @@ func (s *groupServer) BatchGetIncrementalGroupMember(ctx context.Context, req *p
} }
for groupID, vlog := range vLogs { for groupID, vlog := range vLogs {
vlog.Logs = slices.DeleteFunc(vlog.Logs, func(elem model.VersionLogElem) bool { vlogElems := make([]model.VersionLogElem, 0, len(vlog.Logs))
if elem.EID == "" { for i, log := range vlog.Logs {
switch log.EID {
case model.VersionGroupChangeID:
vlog.LogLen-- vlog.LogLen--
hasGroupUpdateMap[groupID] = true hasGroupUpdateMap[groupID] = true
return true case model.VersionSortChangeID:
vlog.LogLen--
sortVersionMap[groupID] = uint64(log.Version)
default:
vlogElems = append(vlogElems, vlog.Logs[i])
} }
return false }
}) vlog.Logs = vlogElems
if vlog.LogLen > 0 { if vlog.LogLen > 0 {
hasGroupUpdateMap[groupID] = true hasGroupUpdateMap[groupID] = true
} }
@ -223,12 +229,18 @@ func (s *groupServer) BatchGetIncrementalGroupMember(ctx context.Context, req *p
for groupID, versionLog := range versions { for groupID, versionLog := range versions {
resList[groupID] = &pbgroup.GetIncrementalGroupMemberResp{ resList[groupID] = &pbgroup.GetIncrementalGroupMemberResp{
VersionID: versionLog.ID.Hex(), VersionID: versionLog.ID.Hex(),
Version: uint64(versionLog.Version), Version: uint64(versionLog.Version),
Full: fullMap[groupID], Full: fullMap[groupID],
Delete: deleteIdsMap[groupID], Delete: deleteIdsMap[groupID],
Insert: insertListMap[groupID], Insert: insertListMap[groupID],
Update: updateListMap[groupID], Update: updateListMap[groupID],
SortVersion: sortVersionMap[groupID],
}
requestBodyLen += len(insertListMap[groupID]) + len(updateListMap[groupID]) + len(deleteIdsMap[groupID])
if requestBodyLen > 200 {
break
} }
} }