Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Author: FGadvancer

open_im_sdk/constant.go

@@ -91,7 +91,7 @@ func (u *UserRelated) initListenerCh() {
 	u.ConversationCh = u.ch
 
 	u.wsNotification = make(map[string]chan GeneralWsResp, 1)
-	u.seqMsg = make(map[int32]MsgData, 100)
+	u.seqMsg = make(map[int32]MsgData, 1000)
 }
 
 type UserRelated struct {

open_im_sdk/data_model.go

@@ -324,6 +324,7 @@ func (u *UserRelated) Prepare(query string) (*sql.Stmt, error) {
 	return u.db.Prepare(query)
 }
 
+/*
 func (u *UserRelated) setLocalMaxConSeq(seq int) (err error) {
 	sdkLog("setLocalMaxConSeq start ", seq)
 	u.mRWMutex.Lock()
@@ -342,6 +343,7 @@ func (u *UserRelated) setLocalMaxConSeq(seq int) (err error) {
 	}
 	return nil
 }
+*/
 
 func (u *UserRelated) Query(query string, args ...interface{}) (*sql.Rows, error) {
 	if u.db == nil {
@@ -354,6 +356,7 @@ func (u *UserRelated) Query(query string, args ...interface{}) (*sql.Rows, error
 	return u.db.Query(query, args...)
 }
 
+/*
 func (u *UserRelated) getLocalMaxConSeqFromDB() (int64, error) {
 	sdkLog("getLocalMaxConSeqFromDB start")
 	u.mRWMutex.RLock()
@@ -375,6 +378,8 @@ func (u *UserRelated) getLocalMaxConSeqFromDB() (int64, error) {
 	return int64(seq), nil
 }
 
+*/
+
 func (u *UserRelated) replaceIntoUser(info *userInfo) error {
 	u.mRWMutex.Lock()
 	defer u.mRWMutex.Unlock()
@@ -1623,6 +1628,54 @@ func (u *UserRelated) getMultipleMessageModel(messageIDList []string) (err error
 	return nil, list
 }
 
+func (u *UserRelated) getErrorChatLogSeq(startSeq int32) map[int32]interface{} {
+	u.mRWMutex.RLock()
+	defer u.mRWMutex.RUnlock()
+
+	errSeq := make(map[int32]interface{}, 0)
+	var seq int64
+	rows, err := u.Query("SELECT seq FROM error_chat_log where seq>=? order by seq", startSeq)
+	if err == nil {
+		for rows.Next() {
+			err = rows.Scan(&seq)
+			if err != nil {
+				sdkLog("Scan ,failed ", err.Error())
+				continue
+			} else {
+				errSeq[int32(seq)] = nil
+			}
+		}
+	} else {
+		sdkLog("Query failed ", err.Error())
+	}
+	LogEnd()
+	return errSeq
+}
+
+func (u *UserRelated) getNormalChatLogSeq(startSeq int32) map[int32]interface{} {
+	u.mRWMutex.RLock()
+	defer u.mRWMutex.RUnlock()
+
+	errSeq := make(map[int32]interface{}, 0)
+	var seq int64
+	rows, err := u.Query("SELECT seq FROM chat_log where seq>=? order by seq", startSeq)
+	if err == nil {
+		for rows.Next() {
+			err = rows.Scan(&seq)
+			if err != nil {
+				sdkLog("Scan ,failed ", err.Error())
+				continue
+			} else {
+				errSeq[int32(seq)] = nil
+			}
+		}
+	} else {
+		sdkLog("Query failed ", err.Error())
+	}
+	LogEnd()
+	return errSeq
+}
+
 func (u *UserRelated) getConsequentLocalMaxSeq() (seq int64, err error) {
 	LogStart()
 	u.mRWMutex.RLock()