This commit is contained in:
wangchuxiao 2023-05-09 16:55:04 +08:00
parent 7397928acf
commit 6ac95de7b7
2 changed files with 2 additions and 8 deletions

View File

@ -134,17 +134,11 @@ func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sd
} }
maxSeqs, err := m.MsgDatabase.GetMaxSeqs(ctx, conversationIDs) maxSeqs, err := m.MsgDatabase.GetMaxSeqs(ctx, conversationIDs)
if err != nil { if err != nil {
log.ZWarn(ctx, "GetMaxSeqs error", err, "conversationIDs", conversationIDs) log.ZWarn(ctx, "GetMaxSeqs error", err, "conversationIDs", conversationIDs, "maxSeqs", maxSeqs)
return nil, err
}
minSeqs, err := m.MsgDatabase.GetMinSeqs(ctx, conversationIDs)
if err != nil {
log.ZWarn(ctx, "GetMinSeqs error", err, "conversationIDs", conversationIDs)
return nil, err return nil, err
} }
resp := new(sdkws.GetMaxSeqResp) resp := new(sdkws.GetMaxSeqResp)
resp.MaxSeqs = maxSeqs resp.MaxSeqs = maxSeqs
resp.MinSeqs = minSeqs
return resp, nil return resp, nil
} }

View File

@ -147,7 +147,7 @@ func (c *msgCache) getSeqs(ctx context.Context, items []string, getkey func(s st
pipe := c.rdb.Pipeline() pipe := c.rdb.Pipeline()
for _, v := range items { for _, v := range items {
if err := pipe.Get(ctx, getkey(v)).Err(); err != nil && err != redis.Nil { if err := pipe.Get(ctx, getkey(v)).Err(); err != nil && err != redis.Nil {
return nil, err return nil, errs.Wrap(err)
} }
} }
result, err := pipe.Exec(ctx) result, err := pipe.Exec(ctx)