From df51c8b9a4996b12b103dfc0ec2d2a2f15e83cd8 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 24 May 2022 16:54:56 +0800 Subject: [PATCH] msg cache --- pkg/common/db/batch_insert_chat.go | 5 ----- pkg/common/db/redisModel.go | 27 +++++++++++++++++++++++++++ pkg/utils/utils.go | 1 - 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/pkg/common/db/batch_insert_chat.go b/pkg/common/db/batch_insert_chat.go index 7273dbd18..b5fca3502 100644 --- a/pkg/common/db/batch_insert_chat.go +++ b/pkg/common/db/batch_insert_chat.go @@ -4,7 +4,6 @@ import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" pbMsg "Open_IM/pkg/proto/chat" - server_api_params "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" "errors" @@ -105,7 +104,3 @@ func (d *DataBases) BatchInsertChat(userID string, msgList []*pbMsg.MsgDataToMQ, log.NewWarn(operationID, "batch mgo cost time ", getCurrentTimestampByMill()-newTime, userID, len(msgList)) return utils.Wrap(d.SetUserMaxSeq(userID, uint64(currentMaxSeq)), "") } - -func setMessageToCache(msgList []*server_api_params.MsgData, uid string) (err error) { - return err -} diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 46318ac4a..93ac28d80 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -3,9 +3,14 @@ package db import ( "Open_IM/pkg/common/constant" log2 "Open_IM/pkg/common/log" + pbChat "Open_IM/pkg/proto/chat" pbCommon "Open_IM/pkg/proto/sdk_ws" + "Open_IM/pkg/utils" "encoding/json" + "errors" + "fmt" "github.com/garyburd/redigo/redis" + "strconv" ) const ( @@ -21,6 +26,7 @@ const ( friendRelationCache = "FRIEND_RELATION_CACHE:" blackListCache = "BLACK_LIST_CACHE:" groupCache = "GROUP_CACHE:" + messageCache = "MESSAGE_CACHE:" ) func (d *DataBases) Exec(cmd string, key interface{}, args ...interface{}) (interface{}, error) { @@ -257,3 +263,24 @@ func (d *DataBases) GetGroupMemberIDListFromCache(groupID string) ([]string, err result, err := redis.Strings(d.Exec("SMEMBERS", groupCache+groupID)) return result, err } + +func (d *DataBases) SetMessageToCache(msgList []*pbChat.MsgDataToMQ, uid string) (err error) { + var failedList []pbChat.MsgDataToMQ + for _, msg := range msgList { + key := messageCache + uid + "_" + strconv.Itoa(int(msg.MsgData.Seq)) + m, err := utils.Pb2Map(msg.MsgData) + if err != nil { + log2.NewWarn("", utils.GetSelfFuncName(), "Pb2Map failed", *msg.MsgData, uid, err.Error()) + continue + } + _, err = d.Exec("hmset", key, redis.Args{}.Add().AddFlat(m)...) + if err != nil { + log2.NewWarn("", utils.GetSelfFuncName(), "redis failed", "args:", key, *msg, uid) + failedList = append(failedList, *msg) + } + } + if len(failedList) != 0 { + return errors.New(fmt.Sprintf("set msg to cache failed, failed lists: %s", failedList)) + } + return err +} diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 86b1be180..b9282d699 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -147,6 +147,5 @@ func Pb2Map(pb proto.Message) (map[string]interface{}, error) { jsonCnt := _buffer.Bytes() var out map[string]interface{} err := json.Unmarshal(jsonCnt, &out) - return out, err }