From 255c5ed1c3ca8acd08d69f5c57d695571ae9cb37 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 18 Apr 2023 17:58:53 +0800 Subject: [PATCH 1/2] debug --- internal/rpc/group/group.go | 3 +-- pkg/common/db/controller/group.go | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 25f1c3203..9a9fd3d7c 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -546,7 +546,6 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string { return e.GroupID }) - log.ZDebug(ctx, "groups return", "groups", groups, "owners", owners, "ownerMap", ownerMap, "groupMemberNumMap", groupMemberNumMap) resp.GroupInfos = utils.Slice(groups, func(e *relationTb.GroupModel) *sdkws.GroupInfo { return DbToPbGroupInfo(e, ownerMap[e.GroupID].UserID, groupMemberNumMap[e.GroupID]) }) @@ -621,7 +620,6 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup } func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) (resp *pbGroup.JoinGroupResp, err error) { - resp = &pbGroup.JoinGroupResp{} user, err := s.UserCheck.GetUserInfo(ctx, req.InviterUserID) if err != nil { return nil, err @@ -639,6 +637,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) } else if !s.IsNotFound(err) { return nil, err } + resp = &pbGroup.JoinGroupResp{} if group.NeedVerification == constant.Directly { if group.GroupType == constant.SuperGroup { return nil, errs.ErrGroupTypeNotSupport.Wrap() diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 58475c30b..8e8033722 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -11,6 +11,7 @@ import ( unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/tx" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/dtm-labs/rockscache" "github.com/go-redis/redis/v8" @@ -122,12 +123,15 @@ func (g *groupDatabase) CreateGroup(ctx context.Context, groups []*relationTb.Gr } m := make(map[string]struct{}) var cache = g.cache.NewCache() + log.ZDebug(ctx, "CreateGroup", "groupMembers", groupMembers) for _, groupMember := range groupMembers { if _, ok := m[groupMember.GroupID]; !ok { + log.ZDebug(ctx, "CreateGroup", "groupMember", groupMember) m[groupMember.GroupID] = struct{}{} cache = cache.DelGroupMemberIDs(groupMember.GroupID).DelGroupMembersHash(groupMember.GroupID).DelJoinedGroupID(groupMember.UserID).DelGroupsMemberNum(groupMember.GroupID) } } + log.ZDebug(ctx, "CreateGroup", "keys", cache.GetPreDelKeys()) return g.cache.ExecDel(ctx) }) } From a6f30db53b15831b158b4ab8487efc8d54549c66 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 18 Apr 2023 18:10:58 +0800 Subject: [PATCH 2/2] group --- pkg/common/db/controller/group.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 8e8033722..6aced79dc 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -11,7 +11,6 @@ import ( unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/tx" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/dtm-labs/rockscache" "github.com/go-redis/redis/v8" @@ -123,16 +122,14 @@ func (g *groupDatabase) CreateGroup(ctx context.Context, groups []*relationTb.Gr } m := make(map[string]struct{}) var cache = g.cache.NewCache() - log.ZDebug(ctx, "CreateGroup", "groupMembers", groupMembers) for _, groupMember := range groupMembers { if _, ok := m[groupMember.GroupID]; !ok { - log.ZDebug(ctx, "CreateGroup", "groupMember", groupMember) m[groupMember.GroupID] = struct{}{} - cache = cache.DelGroupMemberIDs(groupMember.GroupID).DelGroupMembersHash(groupMember.GroupID).DelJoinedGroupID(groupMember.UserID).DelGroupsMemberNum(groupMember.GroupID) + cache = cache.DelGroupMemberIDs(groupMember.GroupID).DelGroupMembersHash(groupMember.GroupID).DelGroupsMemberNum(groupMember.GroupID) } + cache.DelJoinedGroupID(groupMember.UserID) } - log.ZDebug(ctx, "CreateGroup", "keys", cache.GetPreDelKeys()) - return g.cache.ExecDel(ctx) + return cache.ExecDel(ctx) }) }