From 8ee4ca03575fe0ad6060680503833937fac58ac0 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 20 Jul 2022 12:05:57 +0800 Subject: [PATCH] docker-compose fix --- internal/rpc/group/group.go | 10 +++------- pkg/common/db/rocks_cache/rocks_cache.go | 4 ++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 007685b18..fab2edce0 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -219,19 +219,15 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetJoinedGroupIDListFromCache failed", err.Error(), req.FromUserID) return &pbGroup.GetJoinedGroupListResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil } - + log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "joinedGroupList: ", joinedGroupList) var resp pbGroup.GetJoinedGroupListResp for _, v := range joinedGroupList { var groupNode open_im_sdk.GroupInfo num, err := imdb.GetGroupMemberNumByGroupID(v) - - groupOwnerID, err2 := rocksCache.GetGroupOwnerFromCache(v) - owner, err2 := rocksCache.GetGroupMemberInfoFromCache(v, groupOwnerID) - //owner, err2 := imdb.GetGroupOwnerInfoByGroupID(v) - + owner, err2 := imdb.GetGroupOwnerInfoByGroupID(v) group, err := rocksCache.GetGroupInfoFromCache(v) - //group, err := imdb.GetGroupInfoByGroupID(v) + log.NewInfo(req.OperationID, num, owner, err2, group, err) if num > 0 && owner != nil && err2 == nil && group != nil && err == nil { if group.Status == constant.GroupStatusDismissed { log.NewError(req.OperationID, "constant.GroupStatusDismissed ", group) diff --git a/pkg/common/db/rocks_cache/rocks_cache.go b/pkg/common/db/rocks_cache/rocks_cache.go index 67514a5bd..b2ce477d7 100644 --- a/pkg/common/db/rocks_cache/rocks_cache.go +++ b/pkg/common/db/rocks_cache/rocks_cache.go @@ -40,6 +40,10 @@ func init() { } n += len(keys) fmt.Printf("\n %s key found %d keys: %v, current cursor %d\n", key, n, keys, cursor) + err = db.DB.RDB.Del(context.Background(), keys...).Err() + if err != nil { + panic(err.Error()) + } if cursor == 0 { break }