From 01f7262d3a94bc947a8beddd288fad7798000903 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Feb 2023 19:43:51 +0800 Subject: [PATCH] errcode --- pkg/common/db/cache/group.go | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/pkg/common/db/cache/group.go b/pkg/common/db/cache/group.go index 06ad8aab8..83fa95f8d 100644 --- a/pkg/common/db/cache/group.go +++ b/pkg/common/db/cache/group.go @@ -39,14 +39,12 @@ type GroupCache struct { rcClient *rockscache.Client //local cache - cacheGroupMtx sync.RWMutex - cacheGroupMemberUserIDs map[string]*localcache.GroupMemberIDsHash } func NewGroupCache(rdb redis.UniversalClient, groupDB *relation.GroupGorm, groupMemberDB *relation.GroupMemberGorm, groupRequestDB *relation.GroupRequestGorm, mongoClient *unrelation.SuperGroupMongoDriver, opts rockscache.Options) *GroupCache { return &GroupCache{rcClient: rockscache.NewClient(rdb, opts), expireTime: groupExpireTime, group: groupDB, groupMember: groupMemberDB, groupRequest: groupRequestDB, redisClient: NewRedisClient(rdb), - mongoDB: mongoClient, cacheGroupMemberUserIDs: make(map[string]*localcache.GroupMemberIDsHash, 0), + mongoDB: mongoClient, } } @@ -260,36 +258,6 @@ func (g *GroupCache) DelGroupMemberIDs(ctx context.Context, groupID string) (err return g.rcClient.TagAsDeleted(g.getGroupMemberIDsKey(groupID)) } -// from local map -func (g *GroupCache) LocalGetGroupMemberIDs(ctx context.Context, groupID string) (groupMemberIDs []string, err error) { - remoteHash, err := g.GetGroupMembersHash(ctx, groupID) - if err != nil { - g.cacheGroupMtx.Lock() - defer g.cacheGroupMtx.Unlock() - delete(g.cacheGroupMemberUserIDs, groupID) - return nil, err - } - g.cacheGroupMtx.Lock() - defer g.cacheGroupMtx.Unlock() - if remoteHash == 0 { - delete(g.cacheGroupMemberUserIDs, groupID) - return []string{}, nil - } - localCache, ok := g.cacheGroupMemberUserIDs[groupID] - if ok && localCache.MemberListHash == remoteHash { - return localCache.UserIDs, nil - } - groupMemberIDsRemote, err := g.GetGroupMemberIDs(ctx, groupID) - if err != nil { - return nil, err - } - g.cacheGroupMemberUserIDs[groupID] = &localcache.GroupMemberIDsHash{ - MemberListHash: remoteHash, - UserIDs: groupMemberIDsRemote, - } - return groupMemberIDsRemote, nil -} - // JoinedGroups func (g *GroupCache) GetJoinedGroupIDs(ctx context.Context, userID string) (joinedGroupIDs []string, err error) { getJoinedGroupIDList := func() (string, error) {