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

Add GetActionTriggers in DataManager

Browse Source
This commit is contained in:
TeoV
2017-10-18 17:49:35 +03:00
committed by Dan Christian Bogos
parent 935ff50f49
commit 7d98b96816
10 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/datamanager.go
View File

@@ -175,7 +175,7 @@ func (dm *DataManager) CacheDataFromDB(prfx string, ids []string, mustBeCached b
case utils.AccountActionPlansPrefix:
_, err = dm.DataDB().GetAccountActionPlans(dataID, true, utils.NonTransactional)
case utils.ACTION_TRIGGER_PREFIX:
_, err = dm.DataDB().GetActionTriggers(dataID, true, utils.NonTransactional)
_, err = dm.GetActionTriggers(dataID, true, utils.NonTransactional)
case utils.SHARED_GROUP_PREFIX:
_, err = dm.DataDB().GetSharedGroup(dataID, true, utils.NonTransactional)
case utils.DERIVEDCHARGERS_PREFIX:
@@ -494,3 +494,25 @@ func (dm *DataManager) RemoveResourceProfile(tenant, id, transactionID string) (
cacheCommit(transactionID), transactionID)
return
}
func (dm *DataManager) GetActionTriggers(id string, skipCache bool, transactionID string) (attrs ActionTriggers, err error) {
key := utils.ACTION_TRIGGER_PREFIX + id
if !skipCache {
if x, ok := cache.Get(key); ok {
if x == nil {
return nil, utils.ErrNotFound
}
return x.(ActionTriggers), nil
}
}
attrs, err = dm.dataDB.GetActionTriggersDrv(id)
if err != nil {
if err == utils.ErrNotFound {
cache.Set(key, nil, cacheCommit(transactionID), transactionID)
}
return nil, err
}
cache.Set(key, attrs, cacheCommit(transactionID), transactionID)
return
}

2
engine/loader_it_test.go
View File

@@ -191,7 +191,7 @@ func TestLoaderITWriteToDatabase(t *testing.T) {
}
for k, atrs := range loader.actionsTriggers {
rcv, err := loader.dataStorage.GetActionTriggers(k, true, utils.NonTransactional)
rcv, err := loader.dm.GetActionTriggers(k, true, utils.NonTransactional)
if err != nil {
t.Error("Failed GetActionTriggers: ", err.Error())
}

8
engine/onstor_it_test.go
View File

@@ -1397,13 +1397,13 @@ func testOnStorITCRUDActionTriggers(t *testing.T) {
ActivationDate: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Local()},
}
atsID := ats[0].ID
if _, rcvErr := onStor.DataDB().GetActionTriggers(atsID, true, utils.NonTransactional); rcvErr != utils.ErrNotFound {
if _, rcvErr := onStor.GetActionTriggers(atsID, true, utils.NonTransactional); rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
if err := onStor.DataDB().SetActionTriggers(atsID, ats, utils.NonTransactional); err != nil {
t.Error(err)
}
if rcv, err := onStor.DataDB().GetActionTriggers(atsID, true, utils.NonTransactional); err != nil {
if rcv, err := onStor.GetActionTriggers(atsID, true, utils.NonTransactional); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(ats[0], rcv[0]) {
t.Errorf("Expecting: %v, received: %v", ats[0], rcv[0])
@@ -1416,7 +1416,7 @@ func testOnStorITCRUDActionTriggers(t *testing.T) {
// t.Error(rcvErr)
// }
//
if rcv, err := onStor.DataDB().GetActionTriggers(atsID, false, utils.NonTransactional); err != nil {
if rcv, err := onStor.GetActionTriggers(atsID, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(ats[0], rcv[0]) {
t.Errorf("Expecting: %v, received: %v", ats[0], rcv[0])
@@ -1428,7 +1428,7 @@ func testOnStorITCRUDActionTriggers(t *testing.T) {
if err := onStor.DataDB().RemoveActionTriggers(atsID, utils.NonTransactional); err != nil {
t.Error(err)
}
if _, rcvErr := onStor.DataDB().GetActionTriggers(atsID, true, utils.NonTransactional); rcvErr != utils.ErrNotFound {
if _, rcvErr := onStor.GetActionTriggers(atsID, true, utils.NonTransactional); rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
}

2
engine/storage_interface.go
View File

@@ -71,7 +71,7 @@ type DataDB interface {
RemoveActions(string, string) error
GetSharedGroup(string, bool, string) (*SharedGroup, error)
SetSharedGroup(*SharedGroup, string) error
GetActionTriggers(string, bool, string) (ActionTriggers, error)
GetActionTriggersDrv(string) (ActionTriggers, error)
SetActionTriggers(string, ActionTriggers, string) error
RemoveActionTriggers(string, string) error
GetActionPlan(string, bool, string) (*ActionPlan, error)

13
engine/storage_map.go
View File

@@ -832,26 +832,15 @@ func (ms *MapStorage) AddLoadHistory(*utils.LoadInstance, int, string) error {
return nil
}
func (ms *MapStorage) GetActionTriggers(key string, skipCache bool, transactionID string) (atrs ActionTriggers, err error) {
func (ms *MapStorage) GetActionTriggersDrv(key string) (atrs ActionTriggers, err error) {
ms.mu.RLock()
defer ms.mu.RUnlock()
cCommit := cacheCommit(transactionID)
key = utils.ACTION_TRIGGER_PREFIX + key
if !skipCache {
if x, ok := cache.Get(key); ok {
if x != nil {
return x.(ActionTriggers), nil
}
return nil, utils.ErrNotFound
}
}
if values, ok := ms.dict[key]; ok {
err = ms.ms.Unmarshal(values, &atrs)
} else {
cache.Set(key, nil, cCommit, transactionID)
return nil, utils.ErrNotFound
}
cache.Set(key, atrs, cCommit, transactionID)
return
}

14
engine/storage_mongo_datadb.go
View File

@@ -1410,17 +1410,7 @@ func (ms *MongoStorage) AddLoadHistory(ldInst *utils.LoadInstance, loadHistSize
return err
}
func (ms *MongoStorage) GetActionTriggers(key string, skipCache bool, transactionID string) (atrs ActionTriggers, err error) {
cacheKey := utils.ACTION_TRIGGER_PREFIX + key
if !skipCache {
if x, ok := cache.Get(cacheKey); ok {
if x != nil {
return x.(ActionTriggers), nil
}
return nil, utils.ErrNotFound
}
}
func (ms *MongoStorage) GetActionTriggersDrv(key string) (atrs ActionTriggers, err error) {
var kv struct {
Key string
Value ActionTriggers
@@ -1429,13 +1419,11 @@ func (ms *MongoStorage) GetActionTriggers(key string, skipCache bool, transactio
defer session.Close()
if err = col.Find(bson.M{"key": key}).One(&kv); err != nil {
if err == mgo.ErrNotFound {
cache.Set(cacheKey, nil, cacheCommit(transactionID), transactionID)
err = utils.ErrNotFound
}
return
}
atrs = kv.Value
cache.Set(cacheKey, atrs, cacheCommit(transactionID), transactionID)
return
}

12
engine/storage_redis.go
View File

@@ -930,20 +930,11 @@ func (rs *RedisStorage) AddLoadHistory(ldInst *utils.LoadInstance, loadHistSize
return err
}
func (rs *RedisStorage) GetActionTriggers(key string, skipCache bool, transactionID string) (atrs ActionTriggers, err error) {
func (rs *RedisStorage) GetActionTriggersDrv(key string) (atrs ActionTriggers, err error) {
key = utils.ACTION_TRIGGER_PREFIX + key
if !skipCache {
if x, ok := cache.Get(key); ok {
if x == nil {
return nil, utils.ErrNotFound
}
return x.(ActionTriggers), nil
}
}
var values []byte
if values, err = rs.Cmd("GET", key).Bytes(); err != nil {
if err == redis.ErrRespNil { // did not find the destination
cache.Set(key, nil, cacheCommit(transactionID), transactionID)
err = utils.ErrNotFound
}
return
@@ -951,7 +942,6 @@ func (rs *RedisStorage) GetActionTriggers(key string, skipCache bool, transactio
if err = rs.ms.Unmarshal(values, &atrs); err != nil {
return
}
cache.Set(key, atrs, cacheCommit(transactionID), transactionID)
return
}