merge all branch and change project structure

pkg/common/db/mongoModel.go

@@ -1,17 +1,20 @@
 package db
 
 import (
-	pbMsg "Open_IM/pkg/proto/chat"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/log"
+	pbMsg "Open_IM/pkg/proto/chat"
 	"errors"
 	"github.com/golang/protobuf/proto"
 	"gopkg.in/mgo.v2/bson"
+	"strconv"
 	"time"
 )
 
 const cChat = "chat"
 const cGroup = "group"
+const singleGocMsgNum = 5000
 
 type MsgInfo struct {
 	SendTime int64
@@ -28,8 +31,8 @@ type GroupMember struct {
 	UIDList []string
 }
 
-func (d *DataBases) GetUserChat(uid string, seqBegin, seqEnd int64) (SingleMsg []*pbMsg.MsgFormat, GroupMsg []*pbMsg.MsgFormat, MaxSeq int64, MinSeq int64, err error) {
-	count := 0
+func (d *DataBases) GetMsgBySeqRange(uid string, seqBegin, seqEnd int64) (SingleMsg []*pbMsg.MsgFormat, GroupMsg []*pbMsg.MsgFormat, MaxSeq int64, MinSeq int64, err error) {
+	var count int64
 	session := d.mgoSession.Clone()
 	if session == nil {
 		return nil, nil, MaxSeq, MinSeq, errors.New("session == nil")
@@ -76,48 +79,124 @@ func (d *DataBases) GetUserChat(uid string, seqBegin, seqEnd int64) (SingleMsg [
 				GroupMsg = append(GroupMsg, temp)
 			}
 			count++
+			if count == (seqEnd - seqBegin + 1) {
+				break
+			}
 		}
 	}
 
 	return SingleMsg, GroupMsg, MaxSeq, MinSeq, nil
 }
+func (d *DataBases) GetMsgBySeqList(uid string, seqList []int64) (SingleMsg []*pbMsg.MsgFormat, GroupMsg []*pbMsg.MsgFormat, MaxSeq int64, MinSeq int64, err error) {
+	allCount := 0
+	singleCount := 0
+	session := d.mgoSession.Clone()
+	if session == nil {
+		return nil, nil, MaxSeq, MinSeq, errors.New("session == nil")
+	}
+	defer session.Close()
 
-func (d *DataBases) SaveUserChat(uid string, sendTime int64, m proto.Message) error {
-
+	c := session.DB(config.Config.Mongo.DBDatabase).C(cChat)
+	m := func(uid string, seqList []int64) map[string][]int64 {
+		t := make(map[string][]int64)
+		for i := 0; i < len(seqList); i++ {
+			seqUid := getSeqUid(uid, seqList[i])
+			if value, ok := t[seqUid]; !ok {
+				var temp []int64
+				t[seqUid] = append(temp, seqList[i])
+			} else {
+				t[seqUid] = append(value, seqList[i])
+			}
+		}
+		return t
+	}(uid, seqList)
+	sChat := UserChat{}
+	pChat := pbMsg.MsgSvrToPushSvrChatMsg{}
+	for seqUid, value := range m {
+		if err = c.Find(bson.M{"uid": seqUid}).One(&sChat); err != nil {
+			log.NewError("", "not find seqUid", seqUid, value, uid, seqList)
+			continue
+		}
+		singleCount = 0
+		for i := 0; i < len(sChat.Msg); i++ {
+			temp := new(pbMsg.MsgFormat)
+			if err = proto.Unmarshal(sChat.Msg[i].Msg, &pChat); err != nil {
+				log.NewError("", "not find seqUid", seqUid, value, uid, seqList)
+				return nil, nil, MaxSeq, MinSeq, err
+			}
+			if isContainInt64(pChat.RecvSeq, value) {
+				temp.SendID = pChat.SendID
+				temp.RecvID = pChat.RecvID
+				temp.MsgFrom = pChat.MsgFrom
+				temp.Seq = pChat.RecvSeq
+				temp.ServerMsgID = pChat.MsgID
+				temp.SendTime = pChat.SendTime
+				temp.Content = pChat.Content
+				temp.ContentType = pChat.ContentType
+				temp.SenderPlatformID = pChat.PlatformID
+				temp.ClientMsgID = pChat.ClientMsgID
+				temp.SenderFaceURL = pChat.SenderFaceURL
+				temp.SenderNickName = pChat.SenderNickName
+				if pChat.RecvSeq > MaxSeq {
+					MaxSeq = pChat.RecvSeq
+				}
+				if allCount == 0 {
+					MinSeq = pChat.RecvSeq
+				}
+				if pChat.RecvSeq < MinSeq {
+					MinSeq = pChat.RecvSeq
+				}
+				if pChat.SessionType == constant.SingleChatType {
+					SingleMsg = append(SingleMsg, temp)
+				} else {
+					GroupMsg = append(GroupMsg, temp)
+				}
+				allCount++
+				singleCount++
+				if singleCount == len(value) {
+					break
+				}
+			}
+		}
+	}
+	return SingleMsg, GroupMsg, MaxSeq, MinSeq, nil
+}
+func (d *DataBases) SaveUserChat(uid string, sendTime int64, m *pbMsg.MsgSvrToPushSvrChatMsg) error {
+	var seqUid string
+	newTime := getCurrentTimestampByMill()
 	session := d.mgoSession.Clone()
 	if session == nil {
 		return errors.New("session == nil")
 	}
 	defer session.Close()
-
+	log.NewInfo("", "get mgoSession cost time", getCurrentTimestampByMill()-newTime)
 	c := session.DB(config.Config.Mongo.DBDatabase).C(cChat)
-
-	n, err := c.Find(bson.M{"uid": uid}).Count()
+	seqUid = getSeqUid(uid, m.RecvSeq)
+	n, err := c.Find(bson.M{"uid": seqUid}).Count()
 	if err != nil {
 		return err
 	}
-
+	log.NewInfo("", "find mgo uid cost time", getCurrentTimestampByMill()-newTime)
 	sMsg := MsgInfo{}
 	sMsg.SendTime = sendTime
 	if sMsg.Msg, err = proto.Marshal(m); err != nil {
 		return err
 	}
-
 	if n == 0 {
 		sChat := UserChat{}
-		sChat.UID = uid
+		sChat.UID = seqUid
 		sChat.Msg = append(sChat.Msg, sMsg)
 		err = c.Insert(&sChat)
 		if err != nil {
 			return err
 		}
 	} else {
-		err = c.Update(bson.M{"uid": uid}, bson.M{"$push": bson.M{"msg": sMsg}})
+		err = c.Update(bson.M{"uid": seqUid}, bson.M{"$push": bson.M{"msg": sMsg}})
 		if err != nil {
 			return err
 		}
 	}
-
+	log.NewInfo("", "insert mgo data cost time", getCurrentTimestampByMill()-newTime)
 	return nil
 }
 
@@ -231,3 +310,22 @@ func (d *DataBases) DelGroupMember(groupID, uid string) error {
 
 	return nil
 }
+
+func getCurrentTimestampByMill() int64 {
+	return time.Now().UnixNano() / 1e6
+}
+func getSeqUid(uid string, seq int64) string {
+	seqSuffix := seq / singleGocMsgNum
+	return uid + ":" + strconv.FormatInt(seqSuffix, 10)
+}
+func isContainInt64(target int64, List []int64) bool {
+
+	for _, element := range List {
+
+		if target == element {
+			return true
+		}
+	}
+	return false
+
+}