From d6bbc749f80596f79e53bfdb97b5dc2acd6139f0 Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Sat, 1 Jun 2024 11:57:43 +0800 Subject: [PATCH] refactor: delete message and message batch use lua. --- pkg/common/storage/controller/msg.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/common/storage/controller/msg.go b/pkg/common/storage/controller/msg.go index c8adc3579..8eb9e8e6f 100644 --- a/pkg/common/storage/controller/msg.go +++ b/pkg/common/storage/controller/msg.go @@ -568,6 +568,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin } newBegin := seqs[0] newEnd := seqs[len(seqs)-1] + var successMsgs []*sdkws.MsgData log.ZDebug(ctx, "GetMsgBySeqsRange", "first seqs", seqs, "newBegin", newBegin, "newEnd", newEnd) cachedMsgs, failedSeqs, err := db.msg.GetMessagesBySeq(ctx, conversationID, seqs) if err != nil { @@ -576,7 +577,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin log.ZError(ctx, "get message from redis exception", err, "conversationID", conversationID, "seqs", seqs) } } - var successMsgs []*sdkws.MsgData + successMsgs = append(successMsgs, cachedMsgs...) log.ZDebug(ctx, "get msgs from cache", "cachedMsgs", cachedMsgs) // get from cache or db @@ -587,7 +588,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin return 0, 0, nil, err } - successMsgs = append(mongoMsgs, cachedMsgs...) + successMsgs = append(mongoMsgs, successMsgs...) } return minSeq, maxSeq, successMsgs, nil