From 57d623af9a1a00043987d6d34f7c2e2599ef96d6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 18 Apr 2023 18:35:16 +0800 Subject: [PATCH 1/3] getcache --- pkg/common/db/cache/rockscache.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/common/db/cache/rockscache.go b/pkg/common/db/cache/rockscache.go index 6d81aa456..8ff55a379 100644 --- a/pkg/common/db/cache/rockscache.go +++ b/pkg/common/db/cache/rockscache.go @@ -10,6 +10,7 @@ import ( "time" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/dtm-labs/rockscache" ) @@ -107,10 +108,12 @@ func getCache[T any](ctx context.Context, rcClient *rockscache.Client, key strin arr = append(arr, "first return") return t, nil } + if v == "" { + return t, errs.ErrRecordNotFound + } err = json.Unmarshal([]byte(v), &t) if err != nil { arr = append(arr, "json.Unmarshal error "+err.Error()) - log.ZError(ctx, "cache json.Unmarshal failed", err, "key", key, "value", v, "expire", expire) return t, utils.Wrap(err, "") } arr = append(arr, "success") From a927215197ddb066a352736282cf33b076e7eccc Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 18 Apr 2023 18:40:20 +0800 Subject: [PATCH 2/3] group --- pkg/common/db/controller/group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 6aced79dc..519c863f3 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -127,7 +127,7 @@ func (g *groupDatabase) CreateGroup(ctx context.Context, groups []*relationTb.Gr m[groupMember.GroupID] = struct{}{} cache = cache.DelGroupMemberIDs(groupMember.GroupID).DelGroupMembersHash(groupMember.GroupID).DelGroupsMemberNum(groupMember.GroupID) } - cache.DelJoinedGroupID(groupMember.UserID) + cache.DelJoinedGroupID(groupMember.UserID).DelGroupMembersInfo(groupMember.GroupID, groupMember.UserID) } return cache.ExecDel(ctx) }) From b7de5c46cffa40fc56694aa9cc6168941b032ef9 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 18 Apr 2023 19:15:06 +0800 Subject: [PATCH 3/3] cache --- internal/rpc/group/group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 9a9fd3d7c..8db5f687e 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -634,7 +634,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) _, err = s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.InviterUserID) if err == nil { return nil, errs.ErrArgs.Wrap("already in group") - } else if !s.IsNotFound(err) { + } else if !s.IsNotFound(err) && utils.Unwrap(err) != errs.ErrRecordNotFound { return nil, err } resp = &pbGroup.JoinGroupResp{}