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

Finishing implemented datadb methods for InternalDB

Browse Source
This commit is contained in:
TeoV
2019-09-29 17:59:58 +03:00
committed by Dan Christian Bogos
parent 5e49af1139
commit 2c8d717007
24 changed files with 812 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
engine/storage_map_datadb.go
View File

@@ -498,14 +498,14 @@ func (ms *MapStorage) GetAccount(key string) (ub *Account, err error) {
if !ok {
return nil, utils.ErrNotFound
}
if len(values) == 0 {
return nil, utils.ErrNotFound
}
ub = &Account{ID: key}
err = ms.ms.Unmarshal(values, &ub)
if err != nil {
return nil, err
}
if len(values) == 0 {
return nil, utils.ErrNotFound
}
return
}
@@ -662,45 +662,20 @@ func (ms *MapStorage) GetAllActionPlans() (ats map[string]*ActionPlan, err error
return
}
func (ms *MapStorage) GetAccountActionPlans(acntID string,
skipCache bool, transactionID string) (apIDs []string, err error) {
func (ms *MapStorage) GetAccountActionPlansDrv(acntID string) (apIDs []string, err error) {
ms.mu.RLock()
defer ms.mu.RUnlock()
if !skipCache {
if x, ok := Cache.Get(utils.CacheAccountActionPlans, acntID); ok {
if x == nil {
return nil, utils.ErrNotFound
}
return x.([]string), nil
}
}
values, ok := ms.dict[utils.AccountActionPlansPrefix+acntID]
if !ok {
Cache.Set(utils.CacheAccountActionPlans, acntID, nil, nil,
cacheCommit(transactionID), transactionID)
err = utils.ErrNotFound
return nil, err
return nil, utils.ErrNotFound
}
if err = ms.ms.Unmarshal(values, &apIDs); err != nil {
return nil, err
}
Cache.Set(utils.CacheAccountActionPlans, acntID, apIDs, nil,
cacheCommit(transactionID), transactionID)
return
}
func (ms *MapStorage) SetAccountActionPlans(acntID string, apIDs []string, overwrite bool) (err error) {
if !overwrite {
if oldaPlIDs, err := ms.GetAccountActionPlans(acntID, true, utils.NonTransactional); err != nil && err != utils.ErrNotFound {
return err
} else {
for _, oldAPid := range oldaPlIDs {
if !utils.IsSliceMember(apIDs, oldAPid) {
apIDs = append(apIDs, oldAPid)
}
}
}
}
func (ms *MapStorage) SetAccountActionPlansDrv(acntID string, apIDs []string) (err error) {
ms.mu.Lock()
defer ms.mu.Unlock()
result, err := ms.ms.Marshal(apIDs)
@@ -708,17 +683,16 @@ func (ms *MapStorage) SetAccountActionPlans(acntID string, apIDs []string, overw
return err
}
ms.dict[utils.AccountActionPlansPrefix+acntID] = result
return
}
func (ms *MapStorage) RemAccountActionPlans(acntID string, apIDs []string) (err error) {
func (ms *MapStorage) RemAccountActionPlansDrv(acntID string, apIDs []string) (err error) {
key := utils.AccountActionPlansPrefix + acntID
if len(apIDs) == 0 {
delete(ms.dict, key)
return
}
oldaPlIDs, err := ms.GetAccountActionPlans(acntID, true, utils.NonTransactional)
oldaPlIDs, err := ms.GetAccountActionPlansDrv(acntID)
if err != nil {
return err
}