uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Faster ActiveSessionsCount

Browse Source
This commit is contained in:
DanB
2016-08-26 15:42:45 +02:00
parent cd4fec5167
commit dedb006d6c
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apier/v1/smgenericv1.go
View File

@@ -90,7 +90,7 @@ func (self *SMGenericV1) ProcessCDR(ev sessionmanager.SMGenericEvent, reply *str
}
func (self *SMGenericV1) ActiveSessions(attrs utils.AttrSMGGetActiveSessions, reply *[]*sessionmanager.ActiveSession) error {
aSessions, err := self.sm.ActiveSessions(attrs.AsMapStringString())
aSessions, _, err := self.sm.ActiveSessions(attrs.AsMapStringString(), false)
if err != nil {
return utils.NewErrServerError(err)
}
@@ -99,11 +99,11 @@ func (self *SMGenericV1) ActiveSessions(attrs utils.AttrSMGGetActiveSessions, re
}
func (self *SMGenericV1) ActiveSessionsCount(attrs utils.AttrSMGGetActiveSessions, reply *int) error {
var aSessions []*sessionmanager.ActiveSession
if err := self.ActiveSessions(attrs, &aSessions); err != nil {
if _, count, err := self.sm.ActiveSessions(attrs.AsMapStringString(), true); err != nil {
return err
} else {
*reply = count
}
*reply = len(aSessions)
return nil
}

9
sessionmanager/smgeneric.go
View File

@@ -592,7 +592,7 @@ func (self *SMGeneric) getSessions() map[string][]*SMGSession {
return self.sessions
}
func (self *SMGeneric) ActiveSessions(fltrs map[string]string) (aSessions []*ActiveSession, err error) {
func (self *SMGeneric) ActiveSessions(fltrs map[string]string, count bool) (aSessions []*ActiveSession, counter int, err error) {
aSessions = make([]*ActiveSession, 0) // Make sure we return at least empty list and not nil
// Check first based on indexes so we can downsize the list of matching sessions
matchingSessionIDs, checkedFilters := self.getSessionIDsMatchingIndexes(fltrs)
@@ -617,7 +617,7 @@ func (self *SMGeneric) ActiveSessions(fltrs map[string]string) (aSessions []*Act
for i, s := range remainingSessions {
sMp, err := s.eventStart.AsMapStringString()
if err != nil {
return nil, err
return nil, 0, err
}
if _, hasRunID := sMp[utils.MEDI_RUNID]; !hasRunID {
sMp[utils.MEDI_RUNID] = utils.META_DEFAULT
@@ -635,8 +635,11 @@ func (self *SMGeneric) ActiveSessions(fltrs map[string]string) (aSessions []*Act
}
}
}
if count {
return nil, len(remainingSessions), nil
}
for _, s := range remainingSessions {
aSessions = append(aSessions, s.AsActiveSession(self.Timezone()))
aSessions = append(aSessions, s.AsActiveSession(self.Timezone())) // Expensive for large number of sessions
}
return
}

10
sessionmanager/smgeneric_test.go
View File

@@ -213,27 +213,27 @@ func TestSMGActiveSessions(t *testing.T) {
"Extra3": "extra3",
}
smg.recordSession(smGev2.GetUUID(), &SMGSession{eventStart: smGev2})
if aSessions, err := smg.ActiveSessions(nil); err != nil {
if aSessions, _, err := smg.ActiveSessions(nil, false); err != nil {
t.Error(err)
} else if len(aSessions) != 2 {
t.Errorf("Received sessions: %%+v", aSessions)
}
if aSessions, err := smg.ActiveSessions(map[string]string{"Tenant": "itsyscom.com"}); err != nil {
if aSessions, _, err := smg.ActiveSessions(map[string]string{"Tenant": "itsyscom.com"}, false); err != nil {
t.Error(err)
} else if len(aSessions) != 1 {
t.Errorf("Received sessions: %%+v", aSessions)
}
if aSessions, err := smg.ActiveSessions(map[string]string{utils.TOR: "*voice"}); err != nil {
if aSessions, _, err := smg.ActiveSessions(map[string]string{utils.TOR: "*voice"}, false); err != nil {
t.Error(err)
} else if len(aSessions) != 2 {
t.Errorf("Received sessions: %%+v", aSessions)
}
if aSessions, err := smg.ActiveSessions(map[string]string{"Extra3": utils.MetaEmpty}); err != nil {
if aSessions, _, err := smg.ActiveSessions(map[string]string{"Extra3": utils.MetaEmpty}, false); err != nil {
t.Error(err)
} else if len(aSessions) != 1 {
t.Errorf("Received sessions: %+v", aSessions)
}
if aSessions, err := smg.ActiveSessions(map[string]string{utils.SUPPLIER: "supplier2"}); err != nil {
if aSessions, _, err := smg.ActiveSessions(map[string]string{utils.SUPPLIER: "supplier2"}, false); err != nil {
t.Error(err)
} else if len(aSessions) != 1 {
t.Errorf("Received sessions: %+v", aSessions)