uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-20 06:38:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unecessary CacheDataFromDB

Browse Source
This commit is contained in:
TeoV
2018-01-12 13:12:37 +02:00
committed by Dan Christian Bogos
parent e26691eb9c
commit 63c496c1a1
5 changed files with 3 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
apier/v1/apier.go
View File

@@ -247,9 +247,6 @@ func (self *ApierV1) LoadRatingPlan(attrs AttrLoadRatingPlan, reply *string) err
} else if !loaded {
return utils.ErrNotFound
}
if err := self.DataManager.CacheDataFromDB(utils.RATING_PLAN_PREFIX, []string{attrs.RatingPlanId}, true); err != nil {
return utils.NewErrServerError(err)
}
*reply = OK
return nil
}
@@ -263,9 +260,6 @@ func (self *ApierV1) LoadRatingProfile(attrs utils.TPRatingProfile, reply *strin
if err := dbReader.LoadRatingProfilesFiltered(&attrs); err != nil {
return utils.NewErrServerError(err)
}
if err := self.DataManager.CacheDataFromDB(utils.RATING_PROFILE_PREFIX, []string{attrs.KeyId()}, true); err != nil {
return utils.NewErrServerError(err)
}
*reply = OK
return nil
}
@@ -284,9 +278,6 @@ func (self *ApierV1) LoadSharedGroup(attrs AttrLoadSharedGroup, reply *string) e
if err := dbReader.LoadSharedGroupsFiltered(attrs.SharedGroupId, true); err != nil {
return utils.NewErrServerError(err)
}
if err := self.DataManager.CacheDataFromDB(utils.SHARED_GROUP_PREFIX, []string{attrs.SharedGroupId}, true); err != nil {
return utils.NewErrServerError(err)
}
*reply = OK
return nil
}
@@ -342,24 +333,11 @@ func (self *ApierV1) LoadTariffPlanFromStorDb(attrs AttrLoadTpFromStorDb, reply
for _, prfx := range []string{
utils.DESTINATION_PREFIX,
utils.REVERSE_DESTINATION_PREFIX,
utils.RATING_PLAN_PREFIX,
utils.RATING_PROFILE_PREFIX,
utils.ACTION_PREFIX,
utils.ACTION_PLAN_PREFIX,
utils.AccountActionPlansPrefix,
utils.ACTION_TRIGGER_PREFIX,
utils.SHARED_GROUP_PREFIX,
utils.DERIVEDCHARGERS_PREFIX,
utils.LCR_PREFIX} {
loadedIDs, _ := dbReader.GetLoadedIds(prfx)
if err := self.DataManager.CacheDataFromDB(prfx, loadedIDs, true); err != nil {
return utils.NewErrServerError(err)
}
}
for _, prfx := range []string{
utils.ALIASES_PREFIX,
utils.REVERSE_ALIASES_PREFIX,
utils.ResourceProfilesPrefix} {
utils.REVERSE_ALIASES_PREFIX} {
loadedIDs, _ := dbReader.GetLoadedIds(prfx)
if err := self.DataManager.CacheDataFromDB(prfx, loadedIDs, true); err != nil {
return utils.NewErrServerError(err)
@@ -471,9 +449,6 @@ func (self *ApierV1) SetRatingProfile(attrs AttrSetRatingProfile, reply *string)
if err := self.DataManager.SetRatingProfile(rpfl, utils.NonTransactional); err != nil {
return utils.NewErrServerError(err)
}
if err = self.DataManager.CacheDataFromDB(utils.RATING_PROFILE_PREFIX, []string{keyId}, true); err != nil {
return
}
*reply = OK
return nil
}
@@ -557,9 +532,6 @@ func (self *ApierV1) SetActions(attrs V1AttrSetActions, reply *string) (err erro
if err := self.DataManager.SetActions(attrs.ActionsId, storeActions, utils.NonTransactional); err != nil {
return utils.NewErrServerError(err)
}
if err = self.DataManager.CacheDataFromDB(utils.ACTION_PREFIX, []string{attrs.ActionsId}, true); err != nil {
utils.NewErrServerError(err)
}
*reply = OK
return nil
}
@@ -1815,26 +1787,11 @@ func (self *ApierV1) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder,
for _, prfx := range []string{
utils.DESTINATION_PREFIX,
utils.REVERSE_DESTINATION_PREFIX,
utils.RATING_PLAN_PREFIX,
utils.RATING_PROFILE_PREFIX,
utils.ACTION_PREFIX,
utils.ACTION_PLAN_PREFIX,
utils.AccountActionPlansPrefix,
utils.ACTION_TRIGGER_PREFIX,
utils.SHARED_GROUP_PREFIX,
utils.DERIVEDCHARGERS_PREFIX,
utils.LCR_PREFIX,
utils.ALIASES_PREFIX,
utils.REVERSE_ALIASES_PREFIX,
utils.ResourceProfilesPrefix,
utils.ResourcesPrefix,
utils.StatQueuePrefix,
utils.StatQueueProfilePrefix,
utils.ThresholdPrefix,
utils.ThresholdProfilePrefix,
utils.FilterPrefix,
utils.SupplierProfilePrefix,
utils.AttributeProfilePrefix} {
utils.REVERSE_ALIASES_PREFIX} {
loadedIDs, _ := loader.GetLoadedIds(prfx)
if err := self.DataManager.CacheDataFromDB(prfx, loadedIDs, true); err != nil {
return utils.NewErrServerError(err)

3
apier/v1/triggers.go
View File

@@ -517,9 +517,6 @@ func (self *ApierV1) SetActionTrigger(attr AttrSetActionTrigger, reply *string)
if err = self.DataManager.SetActionTriggers(attr.GroupID, atrs, utils.NonTransactional); err != nil {
return
}
if err = self.DataManager.CacheDataFromDB(utils.ACTION_TRIGGER_PREFIX, []string{attr.GroupID}, true); err != nil {
return
}
//no cache for action triggers
*reply = utils.OK
return

23
apier/v2/apier.go
View File

@@ -52,9 +52,6 @@ func (self *ApierV2) LoadRatingProfile(attrs AttrLoadRatingProfile, reply *strin
if err := dbReader.LoadRatingProfilesFiltered(tpRpf); err != nil {
return utils.NewErrServerError(err)
}
if err := self.DataManager.CacheDataFromDB(utils.RATING_PROFILE_PREFIX, []string{attrs.RatingProfileId}, true); err != nil {
return utils.NewErrServerError(err)
}
*reply = v1.OK
return nil
}
@@ -170,26 +167,11 @@ func (self *ApierV2) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder,
for _, prfx := range []string{
utils.DESTINATION_PREFIX,
utils.REVERSE_DESTINATION_PREFIX,
utils.RATING_PLAN_PREFIX,
utils.RATING_PROFILE_PREFIX,
utils.ACTION_PREFIX,
utils.ACTION_PLAN_PREFIX,
utils.AccountActionPlansPrefix,
utils.ACTION_TRIGGER_PREFIX,
utils.SHARED_GROUP_PREFIX,
utils.DERIVEDCHARGERS_PREFIX,
utils.LCR_PREFIX,
utils.ALIASES_PREFIX,
utils.REVERSE_ALIASES_PREFIX,
utils.ResourceProfilesPrefix,
utils.ResourcesPrefix,
utils.StatQueuePrefix,
utils.StatQueueProfilePrefix,
utils.ThresholdPrefix,
utils.ThresholdProfilePrefix,
utils.FilterPrefix,
utils.SupplierProfilePrefix,
utils.SupplierProfilePrefix} {
utils.REVERSE_ALIASES_PREFIX} {
loadedIDs, _ := loader.GetLoadedIds(prfx)
if err := self.DataManager.CacheDataFromDB(prfx, loadedIDs, true); err != nil {
return utils.NewErrServerError(err)
@@ -381,9 +363,6 @@ func (self *ApierV2) SetActions(attrs utils.AttrSetActions, reply *string) error
if err := self.DataManager.SetActions(attrs.ActionsId, storeActions, utils.NonTransactional); err != nil {
return utils.NewErrServerError(err)
}
if err := self.DataManager.CacheDataFromDB(utils.ACTION_PREFIX, []string{attrs.ActionsId}, true); err != nil {
utils.NewErrServerError(err)
}
*reply = utils.OK
return nil
}

2
engine/account.go
View File

@@ -153,7 +153,6 @@ func (acc *Account) setBalanceAction(a *Action) error {
// modify if necessary the shared groups here
if !found || !previousSharedGroups.Equal(balance.SharedGroups) {
_, err := guardian.Guardian.Guard(func() (interface{}, error) {
sgs := make([]string, len(balance.SharedGroups))
i := 0
for sgID := range balance.SharedGroups {
// add shared group member
@@ -173,7 +172,6 @@ func (acc *Account) setBalanceAction(a *Action) error {
}
i++
}
dm.CacheDataFromDB(utils.SHARED_GROUP_PREFIX, sgs, true)
return 0, nil
}, 0, balance.SharedGroups.Slice()...)
if err != nil {

1
engine/datamanager.go
View File

@@ -906,7 +906,6 @@ func (dm *DataManager) GetRatingProfile(key string, skipCache bool, transactionI
}
cache.Set(cachekey, rpf, cacheCommit(transactionID), transactionID)
return
}
func (dm *DataManager) SetRatingProfile(rpf *RatingProfile, transactionID string) (err error) {