add group member cache in msg rpc

internal/push/logic/init.go

@@ -16,25 +16,22 @@ import (
 	"Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/statistics"
 	"fmt"
-	"sync"
 )
 
 var (
-	rpcServer                  RPCServer
-	pushCh                     PushConsumerHandler
-	pushTerminal               []int32
-	producer                   *kafka.Producer
-	offlinePusher              pusher.OfflinePusher
-	successCount               uint64
-	CacheGroupMemberUserIDList map[string]*GroupMemberUserIDListHash
-	CacheGroupMtx              sync.RWMutex
+	rpcServer     RPCServer
+	pushCh        PushConsumerHandler
+	pushTerminal  []int32
+	producer      *kafka.Producer
+	offlinePusher pusher.OfflinePusher
+	successCount  uint64
 )
 
 func Init(rpcPort int) {
 	rpcServer.Init(rpcPort)
 	pushCh.Init()
 	pushTerminal = []int32{constant.IOSPlatformID, constant.AndroidPlatformID}
-	CacheGroupMemberUserIDList = make(map[string]*GroupMemberUserIDListHash, 0)
+
 }
 func init() {
 	producer = kafka.NewKafkaProducer(config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.Ws2mschat.Topic)

internal/push/logic/push_to_client.go

@@ -8,13 +8,12 @@ package logic
 
 import (
 	"Open_IM/internal/push"
+	utils2 "Open_IM/internal/utils"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
-	rocksCache "Open_IM/pkg/common/db/rocks_cache"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbCache "Open_IM/pkg/proto/cache"
 	pbPush "Open_IM/pkg/proto/push"
 	pbRelay "Open_IM/pkg/proto/relay"
 	pbRtc "Open_IM/pkg/proto/rtc"
@@ -22,7 +21,6 @@ import (
 	"Open_IM/pkg/utils"
 	"context"
 	"encoding/json"
-	"errors"
 	"github.com/golang/protobuf/proto"
 	"strings"
 )
@@ -39,66 +37,8 @@ type AtContent struct {
 	IsAtSelf   bool     `json:"isAtSelf"`
 }
 
-type GroupMemberUserIDListHash struct {
-	MemberListHash uint64
-	UserIDList     []string
-}
-
 //var grpcCons []*grpc.ClientConn
 
-func GetGroupMemberUserIDList(groupID string, operationID string) ([]string, error) {
-	groupHashRemote, err := GetGroupMemberUserIDListHashFromRemote(groupID)
-	if err != nil {
-		CacheGroupMtx.Lock()
-		defer CacheGroupMtx.Unlock()
-		delete(CacheGroupMemberUserIDList, groupID)
-		log.Error(operationID, "GetGroupMemberUserIDListHashFromRemote failed ", err.Error(), groupID)
-		return nil, utils.Wrap(err, groupID)
-	}
-
-	CacheGroupMtx.Lock()
-	defer CacheGroupMtx.Unlock()
-	groupInLocalCache, ok := CacheGroupMemberUserIDList[groupID]
-	if ok && groupInLocalCache.MemberListHash == groupHashRemote {
-		log.Debug(operationID, "in local cache ", groupID)
-		return groupInLocalCache.UserIDList, nil
-	}
-	log.Debug(operationID, "not in local cache or hash changed", groupID, " remote hash ", groupHashRemote, " in cache ", ok)
-	memberUserIDListRemote, err := GetGroupMemberUserIDListFromRemote(groupID, operationID)
-	if err != nil {
-		log.Error(operationID, "GetGroupMemberUserIDListFromRemote failed ", err.Error(), groupID)
-		return nil, utils.Wrap(err, groupID)
-	}
-	CacheGroupMemberUserIDList[groupID] = &GroupMemberUserIDListHash{MemberListHash: groupHashRemote, UserIDList: memberUserIDListRemote}
-	return memberUserIDListRemote, nil
-}
-
-func GetGroupMemberUserIDListHashFromRemote(groupID string) (uint64, error) {
-	return rocksCache.GetGroupMemberListHashFromCache(groupID)
-}
-
-func GetGroupMemberUserIDListFromRemote(groupID string, operationID string) ([]string, error) {
-	getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: operationID, GroupID: groupID}
-	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, operationID)
-	if etcdConn == nil {
-		errMsg := operationID + "getcdv3.GetDefaultConn == nil"
-		log.NewError(operationID, errMsg)
-		return nil, errors.New("errMsg")
-	}
-	client := pbCache.NewCacheClient(etcdConn)
-	cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq)
-	if err != nil {
-		log.NewError(operationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error())
-		return nil, utils.Wrap(err, "GetGroupMemberIDListFromCache rpc call failed")
-	}
-	if cacheResp.CommonResp.ErrCode != 0 {
-		errMsg := operationID + "GetGroupMemberIDListFromCache rpc logic call failed " + cacheResp.CommonResp.ErrMsg
-		log.NewError(operationID, errMsg)
-		return nil, errors.New("errMsg")
-	}
-	return cacheResp.UserIDList, nil
-}
-
 func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 	var wsResult []*pbRelay.SingelMsgToUserResultList
 	isOfflinePush := utils.GetSwitchFromOptions(pushMsg.MsgData.Options, constant.IsOfflinePush)
@@ -235,7 +175,7 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 		log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "callback userIDList Resp", pushToUserIDList)
 	}
 	if len(pushToUserIDList) == 0 {
-		userIDList, err := GetGroupMemberUserIDList(pushMsg.MsgData.GroupID, pushMsg.OperationID)
+		userIDList, err := utils2.GetGroupMemberUserIDList(pushMsg.MsgData.GroupID, pushMsg.OperationID)
 		if err != nil {
 			log.Error(pushMsg.OperationID, "GetGroupMemberUserIDList failed ", err.Error(), pushMsg.MsgData.GroupID)
 			return