blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3124 from openimsdk/cherry-pick-bbb5473

Browse Source 
fix: DeleteDoc crash [Created by @withchao from #3078]
This commit is contained in:
chao 2025-02-08 16:34:32 +08:00 committed by GitHub
commit 202afc8b88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/common/storage/controller/msg.go
View File

@ -18,11 +18,12 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/openimsdk/tools/utils/jsonutil"
"strconv" "strconv"
"strings" "strings"
"time" "time"
"github.com/openimsdk/tools/utils/jsonutil"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database" "github.com/openimsdk/open-im-server/v3/pkg/common/storage/database"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model" "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
@ -722,13 +723,13 @@ func (db *commonMsgDatabase) DeleteDoc(ctx context.Context, docID string) error
if index <= 0 { if index <= 0 {
return errs.ErrInternalServer.WrapMsg("docID is invalid", "docID", docID) return errs.ErrInternalServer.WrapMsg("docID is invalid", "docID", docID)
} }
index, err := strconv.Atoi(docID[index+1:]) docIndex, err := strconv.Atoi(docID[index+1:])
if err != nil { if err != nil {
return errs.WrapMsg(err, "strconv.Atoi", "docID", docID) return errs.WrapMsg(err, "strconv.Atoi", "docID", docID)
} }
conversationID := docID[:index] conversationID := docID[:index]
seqs := make([]int64, db.msgTable.GetSingleGocMsgNum()) seqs := make([]int64, db.msgTable.GetSingleGocMsgNum())
minSeq := db.msgTable.GetMinSeq(index) minSeq := db.msgTable.GetMinSeq(docIndex)
for i := range seqs { for i := range seqs {
seqs[i] = minSeq + int64(i) seqs[i] = minSeq + int64(i)
} }