From 33ac8781156f8fe1bf0630d0f16bc7ed52b2f03b Mon Sep 17 00:00:00 2001 From: Trial97 Date: Wed, 26 May 2021 12:43:45 +0300 Subject: [PATCH] Updated datamanager methods --- apier/v1/apier.go | 8 ++--- apier/v1/attributes.go | 3 +- apier/v1/chargers.go | 2 +- apier/v1/debit_test.go | 4 +-- apier/v1/dispatcher.go | 4 +-- apier/v1/filters.go | 2 +- apier/v1/resourcesv1.go | 2 +- apier/v1/routes.go | 2 +- apier/v1/stats.go | 2 +- apier/v1/thresholds.go | 2 +- apier/v1/triggers.go | 4 +-- apier/v2/apier.go | 2 +- engine/account.go | 4 +-- engine/account_test.go | 4 +-- engine/actions_test.go | 2 +- engine/calldesc_test.go | 8 ++--- engine/datamanager.go | 53 +++++++++++++----------------- engine/ratingplan_test.go | 2 +- engine/sharedgroup_test.go | 2 +- engine/stats_test.go | 4 +-- engine/thresholds.go | 2 +- engine/thresholds_test.go | 4 +-- engine/tpreader.go | 46 ++++++++++++-------------- engine/z_datamanager_it_test.go | 2 +- engine/z_filterindexer_it_test.go | 10 +++--- engine/z_onstor_it_test.go | 50 ++++++++++++++-------------- engine/z_resources_test.go | 4 +-- loaders/loader.go | 18 +++++----- loaders/loader_it_test.go | 2 +- migrator/action.go | 4 +-- migrator/action_it_test.go | 2 +- migrator/action_trigger.go | 4 +-- migrator/action_trigger_it_test.go | 2 +- migrator/attributes.go | 2 +- migrator/chargers.go | 2 +- migrator/dispatchers.go | 4 +-- migrator/filters.go | 2 +- migrator/rating_plan.go | 2 +- migrator/rating_plan_it_test.go | 2 +- migrator/rating_profile.go | 4 +-- migrator/rating_profile_it_test.go | 2 +- migrator/resource.go | 2 +- migrator/routes.go | 2 +- migrator/sharedgroup.go | 4 +-- migrator/sharedgroup_it_test.go | 2 +- migrator/stats.go | 2 +- migrator/thresholds.go | 2 +- 47 files changed, 142 insertions(+), 158 deletions(-) diff --git a/apier/v1/apier.go b/apier/v1/apier.go index a83be4a08..1bc19bce9 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -491,7 +491,7 @@ func (apierSv1 *APIerSv1) SetRatingProfile(attrs *utils.AttrSetRatingProfile, re FallbackKeys: utils.FallbackSubjKeys(tnt, attrs.Category, ra.FallbackSubjects)}) } - if err := apierSv1.DataManager.SetRatingProfile(rpfl, utils.NonTransactional); err != nil { + if err := apierSv1.DataManager.SetRatingProfile(rpfl); err != nil { return utils.NewErrServerError(err) } //CacheReload @@ -642,7 +642,7 @@ func (apierSv1 *APIerSv1) SetActions(attrs *V1AttrSetActions, reply *string) (er } storeActions[idx] = a } - if err := apierSv1.DataManager.SetActions(attrs.ActionsId, storeActions, utils.NonTransactional); err != nil { + if err := apierSv1.DataManager.SetActions(attrs.ActionsId, storeActions); err != nil { return utils.NewErrServerError(err) } //CacheReload @@ -1251,7 +1251,7 @@ func (apierSv1 *APIerSv1) RemoveRatingProfile(attr *AttrRemoveRatingProfile, rep return utils.ErrMandatoryIeMissing } _, err := guardian.Guardian.Guard(func() (interface{}, error) { - return 0, apierSv1.DataManager.RemoveRatingProfile(attr.GetId(), utils.NonTransactional) + return 0, apierSv1.DataManager.RemoveRatingProfile(attr.GetId()) }, config.CgrConfig().GeneralCfg().LockingTimeout, "RemoveRatingProfile") if err != nil { *reply = err.Error() @@ -1348,7 +1348,7 @@ func (apierSv1 *APIerSv1) RemoveActions(attr *AttrRemoveActions, reply *string) } */ for _, aID := range attr.ActionIDs { - if err := apierSv1.DataManager.RemoveActions(aID, utils.NonTransactional); err != nil { + if err := apierSv1.DataManager.RemoveActions(aID); err != nil { *reply = err.Error() return err } diff --git a/apier/v1/attributes.go b/apier/v1/attributes.go index 8a5791d84..c70d0b5a1 100644 --- a/apier/v1/attributes.go +++ b/apier/v1/attributes.go @@ -132,8 +132,7 @@ func (apierSv1 *APIerSv1) RemoveAttributeProfile(arg *utils.TenantIDWithAPIOpts, if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - if err := apierSv1.DataManager.RemoveAttributeProfile(tnt, arg.ID, - utils.NonTransactional, true); err != nil { + if err := apierSv1.DataManager.RemoveAttributeProfile(tnt, arg.ID, true); err != nil { return utils.APIErrorHandler(err) } //generate a loadID for CacheAttributeProfiles and store it in database diff --git a/apier/v1/chargers.go b/apier/v1/chargers.go index 5a1d1da32..00a4dc724 100644 --- a/apier/v1/chargers.go +++ b/apier/v1/chargers.go @@ -103,7 +103,7 @@ func (apierSv1 *APIerSv1) RemoveChargerProfile(arg *utils.TenantIDWithAPIOpts, r tnt = apierSv1.Config.GeneralCfg().DefaultTenant } if err := apierSv1.DataManager.RemoveChargerProfile(tnt, - arg.ID, utils.NonTransactional, true); err != nil { + arg.ID, true); err != nil { return utils.APIErrorHandler(err) } //generate a loadID for CacheChargerProfiles and store it in database diff --git a/apier/v1/debit_test.go b/apier/v1/debit_test.go index aadcdd38b..044f7d1a7 100644 --- a/apier/v1/debit_test.go +++ b/apier/v1/debit_test.go @@ -119,7 +119,7 @@ func TestDebitUsageWithOptions(t *testing.T) { }, }, } - if err := dm.SetRatingPlan(rp1, utils.NonTransactional); err != nil { + if err := dm.SetRatingPlan(rp1); err != nil { t.Error(err) } @@ -130,7 +130,7 @@ func TestDebitUsageWithOptions(t *testing.T) { FallbackKeys: []string{}, }}, } - if err := dm.SetRatingProfile(rpfl, utils.NonTransactional); err != nil { + if err := dm.SetRatingProfile(rpfl); err != nil { t.Error(err) } diff --git a/apier/v1/dispatcher.go b/apier/v1/dispatcher.go index 249b7f3cb..9eba2dd8d 100644 --- a/apier/v1/dispatcher.go +++ b/apier/v1/dispatcher.go @@ -107,7 +107,7 @@ func (apierSv1 *APIerSv1) RemoveDispatcherProfile(arg *utils.TenantIDWithAPIOpts tnt = apierSv1.Config.GeneralCfg().DefaultTenant } if err := apierSv1.DataManager.RemoveDispatcherProfile(tnt, - arg.ID, utils.NonTransactional, true); err != nil { + arg.ID, true); err != nil { return utils.APIErrorHandler(err) } //generate a loadID for CacheDispatcherProfiles and store it in database @@ -196,7 +196,7 @@ func (apierSv1 *APIerSv1) RemoveDispatcherHost(arg *utils.TenantIDWithAPIOpts, r tnt = apierSv1.Config.GeneralCfg().DefaultTenant } if err := apierSv1.DataManager.RemoveDispatcherHost(tnt, - arg.ID, utils.NonTransactional); err != nil { + arg.ID); err != nil { return utils.APIErrorHandler(err) } //generate a loadID for CacheDispatcherHosts and store it in database diff --git a/apier/v1/filters.go b/apier/v1/filters.go index 1396ceea9..73781886d 100644 --- a/apier/v1/filters.go +++ b/apier/v1/filters.go @@ -112,7 +112,7 @@ func (apierSv1 *APIerSv1) RemoveFilter(arg *utils.TenantIDWithAPIOpts, reply *st if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - if err := apierSv1.DataManager.RemoveFilter(tnt, arg.ID, utils.NonTransactional, true); err != nil { + if err := apierSv1.DataManager.RemoveFilter(tnt, arg.ID, true); err != nil { return utils.APIErrorHandler(err) } //generate a loadID for CacheFilters and store it in database diff --git a/apier/v1/resourcesv1.go b/apier/v1/resourcesv1.go index 79bca900c..3a47e5963 100644 --- a/apier/v1/resourcesv1.go +++ b/apier/v1/resourcesv1.go @@ -144,7 +144,7 @@ func (apierSv1 *APIerSv1) RemoveResourceProfile(arg *utils.TenantIDWithAPIOpts, if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - if err := apierSv1.DataManager.RemoveResourceProfile(tnt, arg.ID, utils.NonTransactional, true); err != nil { + if err := apierSv1.DataManager.RemoveResourceProfile(tnt, arg.ID, true); err != nil { return utils.APIErrorHandler(err) } //handle caching for ResourceProfile diff --git a/apier/v1/routes.go b/apier/v1/routes.go index afbbc13db..8afee86f2 100644 --- a/apier/v1/routes.go +++ b/apier/v1/routes.go @@ -102,7 +102,7 @@ func (apierSv1 *APIerSv1) RemoveRouteProfile(args *utils.TenantIDWithAPIOpts, re if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - if err := apierSv1.DataManager.RemoveRouteProfile(tnt, args.ID, utils.NonTransactional, true); err != nil { + if err := apierSv1.DataManager.RemoveRouteProfile(tnt, args.ID, true); err != nil { return utils.APIErrorHandler(err) } //generate a loadID for CacheRouteProfiles and store it in database diff --git a/apier/v1/stats.go b/apier/v1/stats.go index afeeaa74e..83272d26f 100644 --- a/apier/v1/stats.go +++ b/apier/v1/stats.go @@ -100,7 +100,7 @@ func (apierSv1 *APIerSv1) RemoveStatQueueProfile(args *utils.TenantIDWithAPIOpts if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - if err := apierSv1.DataManager.RemoveStatQueueProfile(tnt, args.ID, utils.NonTransactional, true); err != nil { + if err := apierSv1.DataManager.RemoveStatQueueProfile(tnt, args.ID, true); err != nil { return utils.APIErrorHandler(err) } //handle caching for StatQueueProfile diff --git a/apier/v1/thresholds.go b/apier/v1/thresholds.go index 44222fc04..a8ffc8e85 100644 --- a/apier/v1/thresholds.go +++ b/apier/v1/thresholds.go @@ -158,7 +158,7 @@ func (apierSv1 *APIerSv1) RemoveThresholdProfile(args *utils.TenantIDWithAPIOpts if tnt == utils.EmptyString { tnt = apierSv1.Config.GeneralCfg().DefaultTenant } - if err := apierSv1.DataManager.RemoveThresholdProfile(tnt, args.ID, utils.NonTransactional, true); err != nil { + if err := apierSv1.DataManager.RemoveThresholdProfile(tnt, args.ID, true); err != nil { return utils.APIErrorHandler(err) } //handle caching for ThresholdProfile diff --git a/apier/v1/triggers.go b/apier/v1/triggers.go index 49f8b88f2..4eb300d3b 100644 --- a/apier/v1/triggers.go +++ b/apier/v1/triggers.go @@ -424,7 +424,7 @@ func (apierSv1 *APIerSv1) RemoveActionTrigger(attr *AttrRemoveActionTrigger, rep } } // set the cleared list back - if err = apierSv1.DataManager.SetActionTriggers(attr.GroupID, remainingAtrs, utils.NonTransactional); err != nil { + if err = apierSv1.DataManager.SetActionTriggers(attr.GroupID, remainingAtrs); err != nil { return } // CacheReload @@ -474,7 +474,7 @@ func (apierSv1 *APIerSv1) SetActionTrigger(attr *AttrSetActionTrigger, reply *st return } - if err = apierSv1.DataManager.SetActionTriggers(attr.GroupID, atrs, utils.NonTransactional); err != nil { + if err = apierSv1.DataManager.SetActionTriggers(attr.GroupID, atrs); err != nil { return } // CacheReload diff --git a/apier/v2/apier.go b/apier/v2/apier.go index 50bad02f1..61988df74 100644 --- a/apier/v2/apier.go +++ b/apier/v2/apier.go @@ -350,7 +350,7 @@ func (apiv2 *APIerSv2) SetActions(attrs *utils.AttrSetActions, reply *string) er } storeActions[idx] = a } - if err := apiv2.DataManager.SetActions(attrs.ActionsId, storeActions, utils.NonTransactional); err != nil { + if err := apiv2.DataManager.SetActions(attrs.ActionsId, storeActions); err != nil { return utils.NewErrServerError(err) } //CacheReload diff --git a/engine/account.go b/engine/account.go index bb7c2c665..50e392236 100644 --- a/engine/account.go +++ b/engine/account.go @@ -172,7 +172,7 @@ func (acc *Account) setBalanceAction(a *Action) error { sg.MemberIds = make(utils.StringMap) } sg.MemberIds[acc.ID] = true - dm.SetSharedGroup(sg, utils.NonTransactional) + dm.SetSharedGroup(sg) } } i++ @@ -263,7 +263,7 @@ func (acc *Account) debitBalanceAction(a *Action, reset, resetIfNegative bool) e sg.MemberIds = make(utils.StringMap) } sg.MemberIds[acc.ID] = true - dm.SetSharedGroup(sg, utils.NonTransactional) + dm.SetSharedGroup(sg) } } i++ diff --git a/engine/account_test.go b/engine/account_test.go index 14e0a1361..bb1cc612a 100644 --- a/engine/account_test.go +++ b/engine/account_test.go @@ -1474,7 +1474,7 @@ func TestDebitShared(t *testing.T) { sg := &SharedGroup{Id: "SG_TEST", MemberIds: utils.NewStringMap(rif.ID, groupie.ID), AccountParameters: map[string]*SharingParameters{"*any": {Strategy: STRATEGY_MINE_RANDOM}}} dm.SetAccount(groupie) - dm.SetSharedGroup(sg, utils.NonTransactional) + dm.SetSharedGroup(sg) cc, err := rif.debitCreditBalance(cd, false, false, true) if err != nil { t.Error("Error debiting balance: ", err) @@ -1545,7 +1545,7 @@ func TestMaxDurationShared(t *testing.T) { sg := &SharedGroup{Id: "SG_TEST", MemberIds: utils.NewStringMap(rif.ID, groupie.ID), AccountParameters: map[string]*SharingParameters{"*any": {Strategy: STRATEGY_MINE_RANDOM}}} dm.SetAccount(groupie) - dm.SetSharedGroup(sg, utils.NonTransactional) + dm.SetSharedGroup(sg) duration, err := cd.getMaxSessionDuration(rif) if err != nil { t.Error("Error getting max session duration from shared group: ", err) diff --git a/engine/actions_test.go b/engine/actions_test.go index 746a8bcef..ffbf7c705 100644 --- a/engine/actions_test.go +++ b/engine/actions_test.go @@ -607,7 +607,7 @@ func TestActionPlansRemoveMember(t *testing.T) { }, } - dm.SetActions(actions[0].Id, actions, utils.NonTransactional) + dm.SetActions(actions[0].Id, actions) at := &ActionTiming{ accountIDs: utils.StringMap{account1.ID: true}, diff --git a/engine/calldesc_test.go b/engine/calldesc_test.go index f1d0dee20..8cb27799c 100644 --- a/engine/calldesc_test.go +++ b/engine/calldesc_test.go @@ -116,8 +116,8 @@ func populateDB() { }}, } if dm.dataDB != nil { - dm.SetActions("TEST_ACTIONS", ats, utils.NonTransactional) - dm.SetActions("TEST_ACTIONS_ORDER", ats1, utils.NonTransactional) + dm.SetActions("TEST_ACTIONS", ats) + dm.SetActions("TEST_ACTIONS_ORDER", ats1) dm.SetAccount(broker) dm.SetAccount(minu) dm.SetAccount(minitsboy) @@ -1777,7 +1777,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { }, } for _, rpl := range []*RatingPlan{rpSubj, rpDflt} { - dm.SetRatingPlan(rpl, utils.NonTransactional) + dm.SetRatingPlan(rpl) } rpfTCDDBSWF := &RatingProfile{Id: "*out:TCDDBSWF:call:SubjTCDDBSWF", RatingPlanActivations: RatingPlanActivations{&RatingPlanActivation{ @@ -1792,7 +1792,7 @@ func TestCDDebitBalanceSubjectWithFallback(t *testing.T) { }}, } for _, rpf := range []*RatingProfile{rpfTCDDBSWF, rpfAny} { - dm.SetRatingProfile(rpf, utils.NonTransactional) + dm.SetRatingProfile(rpf) } cd1 := &CallDescriptor{ // test the cost for subject within balance setup Category: "call", diff --git a/engine/datamanager.go b/engine/datamanager.go index 8ba36168c..5037a357e 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -696,7 +696,7 @@ func (dm *DataManager) SetFilter(fltr *Filter, withIndex bool) (err error) { return } -func (dm *DataManager) RemoveFilter(tenant, id, transactionID string, withIndex bool) (err error) { +func (dm *DataManager) RemoveFilter(tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -807,7 +807,7 @@ func (dm *DataManager) SetThreshold(th *Threshold) (err error) { return } -func (dm *DataManager) RemoveThreshold(tenant, id, transactionID string) (err error) { +func (dm *DataManager) RemoveThreshold(tenant, id string) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -938,8 +938,7 @@ func (dm *DataManager) SetThresholdProfile(th *ThresholdProfile, withIndex bool) return } -func (dm *DataManager) RemoveThresholdProfile(tenant, id, - transactionID string, withIndex bool) (err error) { +func (dm *DataManager) RemoveThresholdProfile(tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -972,7 +971,7 @@ func (dm *DataManager) RemoveThresholdProfile(tenant, id, APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } - return dm.RemoveThreshold(tenant, id, transactionID) // remove the thrshold + return dm.RemoveThreshold(tenant, id) // remove the thrshold } // GetStatQueue retrieves a StatQueue from dataDB @@ -1061,7 +1060,7 @@ func (dm *DataManager) SetStatQueue(sq *StatQueue) (err error) { } // RemoveStatQueue removes the StoredStatQueue -func (dm *DataManager) RemoveStatQueue(tenant, id string, transactionID string) (err error) { +func (dm *DataManager) RemoveStatQueue(tenant, id string) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -1224,8 +1223,7 @@ func (dm *DataManager) SetStatQueueProfile(sqp *StatQueueProfile, withIndex bool return } -func (dm *DataManager) RemoveStatQueueProfile(tenant, id, - transactionID string, withIndex bool) (err error) { +func (dm *DataManager) RemoveStatQueueProfile(tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -1258,7 +1256,7 @@ func (dm *DataManager) RemoveStatQueueProfile(tenant, id, APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } - return dm.RemoveStatQueue(tenant, id, transactionID) + return dm.RemoveStatQueue(tenant, id) } func (dm *DataManager) GetTiming(id string, skipCache bool, @@ -1422,7 +1420,7 @@ func (dm *DataManager) SetResource(rs *Resource) (err error) { return } -func (dm *DataManager) RemoveResource(tenant, id, transactionID string) (err error) { +func (dm *DataManager) RemoveResource(tenant, id string) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -1552,7 +1550,7 @@ func (dm *DataManager) SetResourceProfile(rp *ResourceProfile, withIndex bool) ( return } -func (dm *DataManager) RemoveResourceProfile(tenant, id, transactionID string, withIndex bool) (err error) { +func (dm *DataManager) RemoveResourceProfile(tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -1585,7 +1583,7 @@ func (dm *DataManager) RemoveResourceProfile(tenant, id, transactionID string, w APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } - return dm.RemoveResource(tenant, id, transactionID) + return dm.RemoveResource(tenant, id) } func (dm *DataManager) GetActionTriggers(id string, skipCache bool, @@ -1667,8 +1665,7 @@ type SetActionTriggersArgWithAPIOpts struct { APIOpts map[string]interface{} } -func (dm *DataManager) SetActionTriggers(key string, attr ActionTriggers, - transactionID string) (err error) { +func (dm *DataManager) SetActionTriggers(key string, attr ActionTriggers) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -1739,8 +1736,7 @@ func (dm *DataManager) GetSharedGroup(key string, skipCache bool, return } -func (dm *DataManager) SetSharedGroup(sg *SharedGroup, - transactionID string) (err error) { +func (dm *DataManager) SetSharedGroup(sg *SharedGroup) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -1846,7 +1842,7 @@ type SetActionsArgsWithAPIOpts struct { APIOpts map[string]interface{} } -func (dm *DataManager) SetActions(key string, as Actions, transactionID string) (err error) { +func (dm *DataManager) SetActions(key string, as Actions) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -1868,7 +1864,7 @@ func (dm *DataManager) SetActions(key string, as Actions, transactionID string) return } -func (dm *DataManager) RemoveActions(key, transactionID string) (err error) { +func (dm *DataManager) RemoveActions(key string) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -2127,7 +2123,7 @@ func (dm *DataManager) GetRatingPlan(key string, skipCache bool, return } -func (dm *DataManager) SetRatingPlan(rp *RatingPlan, transactionID string) (err error) { +func (dm *DataManager) SetRatingPlan(rp *RatingPlan) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -2226,8 +2222,7 @@ func (dm *DataManager) GetRatingProfile(key string, skipCache bool, return } -func (dm *DataManager) SetRatingProfile(rpf *RatingProfile, - transactionID string) (err error) { +func (dm *DataManager) SetRatingProfile(rpf *RatingProfile) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -2248,8 +2243,7 @@ func (dm *DataManager) SetRatingProfile(rpf *RatingProfile, return } -func (dm *DataManager) RemoveRatingProfile(key string, - transactionID string) (err error) { +func (dm *DataManager) RemoveRatingProfile(key string) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -2372,7 +2366,7 @@ func (dm *DataManager) SetRouteProfile(rpp *RouteProfile, withIndex bool) (err e return } -func (dm *DataManager) RemoveRouteProfile(tenant, id, transactionID string, withIndex bool) (err error) { +func (dm *DataManager) RemoveRouteProfile(tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -2508,7 +2502,7 @@ func (dm *DataManager) SetAttributeProfile(ap *AttributeProfile, withIndex bool) return } -func (dm *DataManager) RemoveAttributeProfile(tenant, id string, transactionID string, withIndex bool) (err error) { +func (dm *DataManager) RemoveAttributeProfile(tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -2637,8 +2631,7 @@ func (dm *DataManager) SetChargerProfile(cpp *ChargerProfile, withIndex bool) (e return } -func (dm *DataManager) RemoveChargerProfile(tenant, id string, - transactionID string, withIndex bool) (err error) { +func (dm *DataManager) RemoveChargerProfile(tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -2767,8 +2760,7 @@ func (dm *DataManager) SetDispatcherProfile(dpp *DispatcherProfile, withIndex bo return } -func (dm *DataManager) RemoveDispatcherProfile(tenant, id string, - transactionID string, withIndex bool) (err error) { +func (dm *DataManager) RemoveDispatcherProfile(tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } @@ -2876,8 +2868,7 @@ func (dm *DataManager) SetDispatcherHost(dpp *DispatcherHost) (err error) { return } -func (dm *DataManager) RemoveDispatcherHost(tenant, id string, - transactionID string) (err error) { +func (dm *DataManager) RemoveDispatcherHost(tenant, id string) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } diff --git a/engine/ratingplan_test.go b/engine/ratingplan_test.go index 988704175..61ae7e77e 100644 --- a/engine/ratingplan_test.go +++ b/engine/ratingplan_test.go @@ -445,7 +445,7 @@ func BenchmarkRatingPlanRestore(b *testing.B) { EndTime: "15:00:00"}} rp := &RatingPlan{Id: "test"} rp.AddRateInterval("NAT", i) - dm.SetRatingPlan(rp, utils.NonTransactional) + dm.SetRatingPlan(rp) b.ResetTimer() for i := 0; i < b.N; i++ { dm.GetRatingPlan(rp.Id, true, utils.NonTransactional) diff --git a/engine/sharedgroup_test.go b/engine/sharedgroup_test.go index d939c4184..b40fc1b10 100644 --- a/engine/sharedgroup_test.go +++ b/engine/sharedgroup_test.go @@ -118,7 +118,7 @@ func TestSharedSetGet(t *testing.T) { }, MemberIds: utils.NewStringMap("1", "2", "3"), } - err := dm.SetSharedGroup(sg, utils.NonTransactional) + err := dm.SetSharedGroup(sg) if err != nil { t.Error("Error storing Shared groudp: ", err) } diff --git a/engine/stats_test.go b/engine/stats_test.go index 65b7679da..cec4bf121 100644 --- a/engine/stats_test.go +++ b/engine/stats_test.go @@ -1065,7 +1065,7 @@ func TestStatQueuesUpdateStatQueue(t *testing.T) { t.Errorf("Expected: %s, received: %s", utils.ToJSON(expTh), utils.ToJSON(th)) } - if err := dm.RemoveStatQueue(sqp.Tenant, sqp.ID, utils.NonTransactional); err != nil { + if err := dm.RemoveStatQueue(sqp.Tenant, sqp.ID); err != nil { t.Fatal(err) } if err := dm.SetStatQueueProfile(sqp, true); err != nil { @@ -1217,7 +1217,7 @@ func TestStatQueuesUpdateStatQueue(t *testing.T) { t.Errorf("Expected: %s, received: %s", utils.ToJSON(expTh), utils.ToJSON(th)) } - if err := dm.RemoveStatQueueProfile(sqp.Tenant, sqp.ID, utils.NonTransactional, true); err != nil { + if err := dm.RemoveStatQueueProfile(sqp.Tenant, sqp.ID, true); err != nil { t.Fatal(err) } if _, err := dm.GetStatQueue(sqp.Tenant, sqp.ID, false, false, utils.NonTransactional); err != utils.ErrNotFound { diff --git a/engine/thresholds.go b/engine/thresholds.go index 0364b61b7..eebed4b24 100644 --- a/engine/thresholds.go +++ b/engine/thresholds.go @@ -340,7 +340,7 @@ func (tS *ThresholdService) processEvent(tnt string, args *ThresholdsArgsProcess continue } if t.dirty == nil || t.Hits == t.tPrfl.MaxHits { // one time threshold - if err = tS.dm.RemoveThreshold(t.Tenant, t.ID, utils.NonTransactional); err != nil { + if err = tS.dm.RemoveThreshold(t.Tenant, t.ID, ); err != nil { utils.Logger.Warning( fmt.Sprintf(" failed removing from database non-recurrent threshold: %s, error: %s", t.TenantID(), err.Error())) diff --git a/engine/thresholds_test.go b/engine/thresholds_test.go index c31e8f876..3d174bb0f 100644 --- a/engine/thresholds_test.go +++ b/engine/thresholds_test.go @@ -1097,7 +1097,7 @@ func TestThresholdsUpdateThreshold(t *testing.T) { t.Errorf("Expected: %s, received: %s", utils.ToJSON(expTh), utils.ToJSON(th)) } - if err := dm.RemoveThreshold(th.Tenant, th.ID, utils.NonTransactional); err != nil { + if err := dm.RemoveThreshold(th.Tenant, th.ID); err != nil { t.Fatal(err) } if err := dm.SetThresholdProfile(thp, true); err != nil { @@ -1169,7 +1169,7 @@ func TestThresholdsUpdateThreshold(t *testing.T) { } else if !reflect.DeepEqual(expTh, th) { t.Errorf("Expected: %s, received: %s", utils.ToJSON(expTh), utils.ToJSON(th)) } - if err := dm.RemoveThresholdProfile(thp.Tenant, thp.ID, utils.NonTransactional, true); err != nil { + if err := dm.RemoveThresholdProfile(thp.Tenant, thp.ID, true); err != nil { t.Fatal(err) } if _, err := dm.GetThreshold(thp.Tenant, thp.ID, false, false, utils.NonTransactional); err != utils.ErrNotFound { diff --git a/engine/tpreader.go b/engine/tpreader.go index b93e24a40..51ecd960d 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -274,7 +274,7 @@ func (tpr *TpReader) LoadRatingPlansFiltered(tag string) (bool, error) { } } } - if err := tpr.dm.SetRatingPlan(ratingPlan, utils.NonTransactional); err != nil { + if err := tpr.dm.SetRatingPlan(ratingPlan); err != nil { return false, err } } @@ -346,7 +346,7 @@ func (tpr *TpReader) LoadRatingProfilesFiltered(qriedRpf *utils.TPRatingProfile) tpRpf.Category, tpRa.FallbackSubjects), }) } - if err := tpr.dm.SetRatingProfile(resultRatingProfile, utils.NonTransactional); err != nil { + if err := tpr.dm.SetRatingProfile(resultRatingProfile); err != nil { return err } tpr.ratingProfiles[tpRpf.KeyId()] = resultRatingProfile @@ -416,7 +416,7 @@ func (tpr *TpReader) LoadSharedGroupsFiltered(tag string, save bool) (err error) } if save { for _, sg := range tpr.sharedGroups { - if err := tpr.dm.SetSharedGroup(sg, utils.NonTransactional); err != nil { + if err := tpr.dm.SetSharedGroup(sg); err != nil { return err } } @@ -888,7 +888,7 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *utils.TPAccountActions) } // write action triggers if err = tpr.dm.SetActionTriggers(accountAction.ActionTriggersId, - actionTriggers, utils.NonTransactional); err != nil { + actionTriggers); err != nil { return errors.New(err.Error() + " (SetActionTriggers): " + accountAction.ActionTriggersId) } var reply string @@ -1006,7 +1006,7 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *utils.TPAccountActions) } // write actions for k, as := range facts { - if err = tpr.dm.SetActions(k, as, utils.NonTransactional); err != nil { + if err = tpr.dm.SetActions(k, as); err != nil { return err } var reply string @@ -1385,7 +1385,7 @@ func (tpr *TpReader) WriteToDatabase(verbose, disableReverse bool) (err error) { log.Print("Rating Plans:") } for _, rp := range tpr.ratingPlans { - if err = tpr.dm.SetRatingPlan(rp, utils.NonTransactional); err != nil { + if err = tpr.dm.SetRatingPlan(rp); err != nil { return } if verbose { @@ -1399,7 +1399,7 @@ func (tpr *TpReader) WriteToDatabase(verbose, disableReverse bool) (err error) { log.Print("Rating Profiles:") } for _, rp := range tpr.ratingProfiles { - if err = tpr.dm.SetRatingProfile(rp, utils.NonTransactional); err != nil { + if err = tpr.dm.SetRatingProfile(rp); err != nil { return } if verbose { @@ -1469,7 +1469,7 @@ func (tpr *TpReader) WriteToDatabase(verbose, disableReverse bool) (err error) { log.Print("Action Triggers:") } for k, atrs := range tpr.actionsTriggers { - if err = tpr.dm.SetActionTriggers(k, atrs, utils.NonTransactional); err != nil { + if err = tpr.dm.SetActionTriggers(k, atrs); err != nil { return } if verbose { @@ -1483,7 +1483,7 @@ func (tpr *TpReader) WriteToDatabase(verbose, disableReverse bool) (err error) { log.Print("Shared Groups:") } for k, sg := range tpr.sharedGroups { - if err = tpr.dm.SetSharedGroup(sg, utils.NonTransactional); err != nil { + if err = tpr.dm.SetSharedGroup(sg); err != nil { return } if verbose { @@ -1497,7 +1497,7 @@ func (tpr *TpReader) WriteToDatabase(verbose, disableReverse bool) (err error) { log.Print("Actions:") } for k, as := range tpr.actions { - if err = tpr.dm.SetActions(k, as, utils.NonTransactional); err != nil { + if err = tpr.dm.SetActions(k, as); err != nil { return } if verbose { @@ -1962,7 +1962,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("Rating Profiles:") } for _, rp := range tpr.ratingProfiles { - if err = tpr.dm.RemoveRatingProfile(rp.Id, utils.NonTransactional); err != nil { + if err = tpr.dm.RemoveRatingProfile(rp.Id); err != nil { return } if verbose { @@ -2010,7 +2010,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("Actions:") } for k := range tpr.actions { - if err = tpr.dm.RemoveActions(k, utils.NonTransactional); err != nil { + if err = tpr.dm.RemoveActions(k); err != nil { return } if verbose { @@ -2032,7 +2032,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("ResourceProfiles:") } for _, tpRsp := range tpr.resProfiles { - if err = tpr.dm.RemoveResourceProfile(tpRsp.Tenant, tpRsp.ID, utils.NonTransactional, true); err != nil { + if err = tpr.dm.RemoveResourceProfile(tpRsp.Tenant, tpRsp.ID, true); err != nil { return } if verbose { @@ -2043,7 +2043,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("StatQueueProfiles:") } for _, tpST := range tpr.sqProfiles { - if err = tpr.dm.RemoveStatQueueProfile(tpST.Tenant, tpST.ID, utils.NonTransactional, true); err != nil { + if err = tpr.dm.RemoveStatQueueProfile(tpST.Tenant, tpST.ID, true); err != nil { return } if verbose { @@ -2054,7 +2054,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("ThresholdProfiles:") } for _, tpTH := range tpr.thProfiles { - if err = tpr.dm.RemoveThresholdProfile(tpTH.Tenant, tpTH.ID, utils.NonTransactional, true); err != nil { + if err = tpr.dm.RemoveThresholdProfile(tpTH.Tenant, tpTH.ID, true); err != nil { return } if verbose { @@ -2065,7 +2065,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("RouteProfiles:") } for _, tpSpl := range tpr.routeProfiles { - if err = tpr.dm.RemoveRouteProfile(tpSpl.Tenant, tpSpl.ID, utils.NonTransactional, true); err != nil { + if err = tpr.dm.RemoveRouteProfile(tpSpl.Tenant, tpSpl.ID, true); err != nil { return } if verbose { @@ -2077,8 +2077,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("AttributeProfiles:") } for _, tpAttr := range tpr.attributeProfiles { - if err = tpr.dm.RemoveAttributeProfile(tpAttr.Tenant, tpAttr.ID, - utils.NonTransactional, true); err != nil { + if err = tpr.dm.RemoveAttributeProfile(tpAttr.Tenant, tpAttr.ID, true); err != nil { return } if verbose { @@ -2090,8 +2089,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("ChargerProfiles:") } for _, tpChr := range tpr.chargerProfiles { - if err = tpr.dm.RemoveChargerProfile(tpChr.Tenant, tpChr.ID, - utils.NonTransactional, true); err != nil { + if err = tpr.dm.RemoveChargerProfile(tpChr.Tenant, tpChr.ID, true); err != nil { return } if verbose { @@ -2103,8 +2101,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("DispatcherProfiles:") } for _, tpDsp := range tpr.dispatcherProfiles { - if err = tpr.dm.RemoveDispatcherProfile(tpDsp.Tenant, tpDsp.ID, - utils.NonTransactional, true); err != nil { + if err = tpr.dm.RemoveDispatcherProfile(tpDsp.Tenant, tpDsp.ID, true); err != nil { return } if verbose { @@ -2115,8 +2112,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("DispatcherHosts:") } for _, tpDsh := range tpr.dispatcherHosts { - if err = tpr.dm.RemoveDispatcherHost(tpDsh.Tenant, tpDsh.ID, - utils.NonTransactional); err != nil { + if err = tpr.dm.RemoveDispatcherHost(tpDsh.Tenant, tpDsh.ID); err != nil { return } if verbose { @@ -2159,7 +2155,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error } for _, tpFltr := range tpr.filters { if err = tpr.dm.RemoveFilter(tpFltr.Tenant, tpFltr.ID, - utils.NonTransactional, true); err != nil { + true); err != nil { return } if verbose { diff --git a/engine/z_datamanager_it_test.go b/engine/z_datamanager_it_test.go index 722e5fb09..51c4bc9a4 100644 --- a/engine/z_datamanager_it_test.go +++ b/engine/z_datamanager_it_test.go @@ -131,7 +131,7 @@ func testDMitCRUDStatQueue(t *testing.T) { if _, ok := Cache.Get(utils.CacheStatQueues, sq.TenantID()); ok != true { t.Error("should be in cache") } - if err := dm2.RemoveStatQueue(sq.Tenant, sq.ID, utils.EmptyString); err != nil { + if err := dm2.RemoveStatQueue(sq.Tenant, sq.ID); err != nil { t.Error(err) } Cache.Clear(nil) diff --git a/engine/z_filterindexer_it_test.go b/engine/z_filterindexer_it_test.go index d249776bb..ab7f47e14 100644 --- a/engine/z_filterindexer_it_test.go +++ b/engine/z_filterindexer_it_test.go @@ -473,11 +473,11 @@ func testITTestThresholdFilterIndexes(t *testing.T) { //remove thresholds if err := dataManager.RemoveThresholdProfile(th.Tenant, - th.ID, utils.NonTransactional, true); err != nil { + th.ID, true); err != nil { t.Error(err) } if err := dataManager.RemoveThresholdProfile(th2.Tenant, - th2.ID, utils.NonTransactional, true); err != nil { + th2.ID, true); err != nil { t.Error(err) } if _, err := dataManager.GetIndexes( @@ -638,7 +638,7 @@ func testITTestAttributeProfileFilterIndexes(t *testing.T) { } if err := dataManager.RemoveAttributeProfile(attrProfile.Tenant, - attrProfile.ID, utils.NonTransactional, true); err != nil { + attrProfile.ID, true); err != nil { t.Error(err) } //check if index is removed @@ -803,7 +803,7 @@ func testITTestAttributeProfileFilterIndexes2(t *testing.T) { } if err := dataManager.RemoveAttributeProfile(attrProfile.Tenant, - attrProfile.ID, utils.NonTransactional, true); err != nil { + attrProfile.ID, true); err != nil { t.Error(err) } //check if index is removed @@ -906,7 +906,7 @@ func testITTestThresholdInlineFilterIndexing(t *testing.T) { } //remove threshold if err := dataManager.RemoveThresholdProfile(th.Tenant, - th.ID, utils.NonTransactional, true); err != nil { + th.ID, true); err != nil { t.Error(err) } if _, err := dataManager.GetIndexes( diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index 67e8c26d1..f520c8d9b 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -297,7 +297,7 @@ func testOnStorITCacheActionTriggers(t *testing.T) { ActivationDate: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)}, } atsID := ats[0].ID - if err := onStor.SetActionTriggers(atsID, ats, utils.NonTransactional); err != nil { + if err := onStor.SetActionTriggers(atsID, ats); err != nil { t.Error(err) } expectedCAt := []string{"atr_testOnStorITCacheActionTrigger"} @@ -357,7 +357,7 @@ func testOnStorITHasData(t *testing.T) { }, }, } - if err := onStor.SetRatingPlan(rp, utils.NonTransactional); err != nil { + if err := onStor.SetRatingPlan(rp); err != nil { t.Error(err) } expectedRP := []string{"rpl_HasData"} @@ -444,7 +444,7 @@ func testOnStorITRatingPlan(t *testing.T) { utils.NonTransactional); rcvErr != utils.ErrNotFound { t.Error(rcvErr) } - if err := onStor.SetRatingPlan(rp, utils.NonTransactional); err != nil { + if err := onStor.SetRatingPlan(rp); err != nil { t.Error(err) } if onStor.dataDB.GetStorageType() != utils.INTERNAL { @@ -484,7 +484,7 @@ func testOnStorITRatingPlan(t *testing.T) { StartTime: "00:00:00", }, } - if err := onStor.SetRatingPlan(rp, utils.NonTransactional); err != nil { + if err := onStor.SetRatingPlan(rp); err != nil { t.Error(err) } @@ -529,7 +529,7 @@ func testOnStorITRatingProfile(t *testing.T) { utils.NonTransactional); rcvErr != utils.ErrNotFound { t.Error(rcvErr) } - if err := onStor.SetRatingProfile(rpf, utils.NonTransactional); err != nil { + if err := onStor.SetRatingProfile(rpf); err != nil { t.Error(err) } @@ -565,7 +565,7 @@ func testOnStorITRatingProfile(t *testing.T) { FallbackKeys: []string{"*out:test:1:danb", "*out:test:1:teo"}, }, } - if err := onStor.SetRatingProfile(rpf, utils.NonTransactional); err != nil { + if err := onStor.SetRatingProfile(rpf); err != nil { t.Error(err) } //get from database @@ -585,7 +585,7 @@ func testOnStorITRatingProfile(t *testing.T) { } } - if err = onStor.RemoveRatingProfile(rpf.Id, utils.NonTransactional); err != nil { + if err = onStor.RemoveRatingProfile(rpf.Id); err != nil { t.Error(err) } //check database if removed @@ -742,7 +742,7 @@ func testOnStorITActions(t *testing.T) { t.Error(rcvErr) } if err := onStor.SetActions(acts[0].Id, - acts, utils.NonTransactional); err != nil { + acts); err != nil { t.Error(err) } if rcv, err := onStor.HasData(utils.ActionPrefix, acts[0].Id, ""); err != nil { @@ -852,7 +852,7 @@ func testOnStorITActions(t *testing.T) { }, } if err := onStor.SetActions(acts[0].Id, - acts, utils.NonTransactional); err != nil { + acts); err != nil { t.Error(err) } @@ -872,7 +872,7 @@ func testOnStorITActions(t *testing.T) { t.Errorf("Expecting: %v, received: %v", utils.ToJSON(acts[0]), utils.ToJSON(rcv[0])) } } - if err := onStor.RemoveActions(acts[0].Id, utils.NonTransactional); err != nil { + if err := onStor.RemoveActions(acts[0].Id); err != nil { t.Error(err) } //check database if removed @@ -902,7 +902,7 @@ func testOnStorITSharedGroup(t *testing.T) { utils.NonTransactional); rcvErr != utils.ErrNotFound { t.Error(rcvErr) } - if err := onStor.SetSharedGroup(sg, utils.NonTransactional); err != nil { + if err := onStor.SetSharedGroup(sg); err != nil { t.Error(err) } if onStor.dataDB.GetStorageType() != utils.INTERNAL { @@ -932,7 +932,7 @@ func testOnStorITSharedGroup(t *testing.T) { RatingSubject: "", }, } - if err := onStor.SetSharedGroup(sg, utils.NonTransactional); err != nil { + if err := onStor.SetSharedGroup(sg); err != nil { t.Error(err) } if onStor.dataDB.GetStorageType() != utils.INTERNAL { @@ -983,7 +983,7 @@ func testOnStorITCRUDActionTriggers(t *testing.T) { if _, rcvErr := onStor.GetActionTriggers(atsID, true, utils.NonTransactional); rcvErr != utils.ErrNotFound { t.Error(rcvErr) } - if err := onStor.SetActionTriggers(atsID, ats, utils.NonTransactional); err != nil { + if err := onStor.SetActionTriggers(atsID, ats); err != nil { t.Error(err) } if rcv, err := onStor.GetActionTriggers(atsID, true, utils.NonTransactional); err != nil { @@ -1216,8 +1216,7 @@ func testOnStorITResourceProfile(t *testing.T) { t.Errorf("Expecting: %v, received: %v", utils.ToJSON(rL), utils.ToJSON(rcv)) } - if err := onStor.RemoveResourceProfile(rL.Tenant, rL.ID, - utils.NonTransactional, false); err != nil { + if err := onStor.RemoveResourceProfile(rL.Tenant, rL.ID, false); err != nil { t.Error(err) } //check database if removed @@ -1274,7 +1273,7 @@ func testOnStorITResource(t *testing.T) { t.Errorf("Expecting: %v, received: %v", utils.ToJSON(res), utils.ToJSON(rcv)) } - if err := onStor.RemoveResource(res.Tenant, res.ID, utils.NonTransactional); err != nil { + if err := onStor.RemoveResource(res.Tenant, res.ID); err != nil { t.Error(err) } //check database if removed @@ -1482,7 +1481,7 @@ func testOnStorITStatQueueProfile(t *testing.T) { t.Errorf("Expecting: %v, received: %v", utils.ToJSON(sq), utils.ToJSON(rcv)) } if err := onStor.RemoveStatQueueProfile(sq.Tenant, sq.ID, - utils.NonTransactional, false); err != nil { + false); err != nil { t.Error(err) } //check database if removed @@ -1557,8 +1556,7 @@ func testOnStorITStatQueue(t *testing.T) { } else if !reflect.DeepEqual(sq, rcv) { t.Errorf("Expecting: %v, received: %v", utils.ToJSON(sq), utils.ToJSON(rcv)) } - if err := onStor.RemoveStatQueue(sq.Tenant, sq.ID, - utils.NonTransactional); err != nil { + if err := onStor.RemoveStatQueue(sq.Tenant, sq.ID); err != nil { t.Error(err) } //check database if removed @@ -1632,7 +1630,7 @@ func testOnStorITThresholdProfile(t *testing.T) { t.Errorf("Expecting: %v, received: %v", utils.ToJSON(th), utils.ToJSON(rcv)) } if err := onStor.RemoveThresholdProfile(th.Tenant, - th.ID, utils.NonTransactional, false); err != nil { + th.ID, false); err != nil { t.Error(err) } //check database if removed @@ -1682,7 +1680,7 @@ func testOnStorITThreshold(t *testing.T) { } else if !(reflect.DeepEqual(th, rcv)) { t.Errorf("Expecting: %v, received: %v", utils.ToJSON(th), utils.ToJSON(rcv)) } - if err := onStor.RemoveThreshold(th.Tenant, th.ID, utils.NonTransactional); err != nil { + if err := onStor.RemoveThreshold(th.Tenant, th.ID); err != nil { t.Error(err) } //check database if removed @@ -1772,7 +1770,7 @@ func testOnStorITFilter(t *testing.T) { } else if !(reflect.DeepEqual(fp, rcv)) { t.Errorf("Expecting: %v, received: %v", fp, rcv) } - if err := onStor.RemoveFilter(fp.Tenant, fp.ID, utils.NonTransactional, true); err != nil { + if err := onStor.RemoveFilter(fp.Tenant, fp.ID, true); err != nil { t.Error(err) } //check cache if removed @@ -1880,7 +1878,7 @@ func testOnStorITRouteProfile(t *testing.T) { t.Errorf("Expecting: %v, received: %v", splProfile, rcv) } if err := onStor.RemoveRouteProfile(splProfile.Tenant, splProfile.ID, - utils.NonTransactional, false); err != nil { + false); err != nil { t.Error(err) } //check cache if removed @@ -1960,7 +1958,7 @@ func testOnStorITAttributeProfile(t *testing.T) { t.Errorf("Expecting: %v, received: %v", attrProfile, rcv) } if err := onStor.RemoveAttributeProfile(attrProfile.Tenant, - attrProfile.ID, utils.NonTransactional, false); err != nil { + attrProfile.ID, false); err != nil { t.Error(err) } //check cache if removed @@ -2086,7 +2084,7 @@ func testOnStorITChargerProfile(t *testing.T) { t.Errorf("Expecting: %v, received: %v", cpp, rcv) } if err := onStor.RemoveChargerProfile(cpp.Tenant, cpp.ID, - utils.NonTransactional, false); err != nil { + false); err != nil { t.Error(err) } //check database if removed @@ -2142,7 +2140,7 @@ func testOnStorITDispatcherProfile(t *testing.T) { t.Errorf("Expecting: %v, received: %v", dpp, rcv) } if err := onStor.RemoveDispatcherProfile(dpp.Tenant, dpp.ID, - utils.NonTransactional, false); err != nil { + false); err != nil { t.Error(err) } //check database if removed diff --git a/engine/z_resources_test.go b/engine/z_resources_test.go index 9e0cd6fd0..fdb91075b 100644 --- a/engine/z_resources_test.go +++ b/engine/z_resources_test.go @@ -3684,7 +3684,7 @@ func TestResourcesUpdateResource(t *testing.T) { t.Errorf("Expected: %s, received: %s", utils.ToJSON(expR), utils.ToJSON(r)) } - if err := dm.RemoveResource(r.Tenant, r.ID, utils.NonTransactional); err != nil { + if err := dm.RemoveResource(r.Tenant, r.ID); err != nil { t.Fatal(err) } @@ -3758,7 +3758,7 @@ func TestResourcesUpdateResource(t *testing.T) { t.Errorf("Expected: %s, received: %s", utils.ToJSON(expR), utils.ToJSON(r)) } - if err := dm.RemoveResourceProfile(res.Tenant, res.ID, utils.NonTransactional, true); err != nil { + if err := dm.RemoveResourceProfile(res.Tenant, res.ID, true); err != nil { t.Fatal(err) } diff --git a/loaders/loader.go b/loaders/loader.go index 2c528f383..83af6d6e0 100644 --- a/loaders/loader.go +++ b/loaders/loader.go @@ -631,7 +631,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveAttributeProfile(tntIDStruct.Tenant, tntIDStruct.ID, - utils.NonTransactional, true); err != nil { + true); err != nil { return err } cacheArgs[utils.AttributeProfileIDs] = ids @@ -651,7 +651,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveResourceProfile(tntIDStruct.Tenant, - tntIDStruct.ID, utils.NonTransactional, true); err != nil { + tntIDStruct.ID, true); err != nil { return err } cacheArgs[utils.ResourceProfileIDs] = ids @@ -669,7 +669,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveFilter(tntIDStruct.Tenant, tntIDStruct.ID, - utils.NonTransactional, true); err != nil { + true); err != nil { return err } cacheArgs[utils.FilterIDs] = ids @@ -687,7 +687,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveStatQueueProfile(tntIDStruct.Tenant, - tntIDStruct.ID, utils.NonTransactional, true); err != nil { + tntIDStruct.ID, true); err != nil { return err } cacheArgs[utils.StatsQueueProfileIDs] = ids @@ -706,7 +706,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveThresholdProfile(tntIDStruct.Tenant, - tntIDStruct.ID, utils.NonTransactional, true); err != nil { + tntIDStruct.ID, true); err != nil { return err } cacheArgs[utils.ThresholdProfileIDs] = ids @@ -725,7 +725,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveRouteProfile(tntIDStruct.Tenant, - tntIDStruct.ID, utils.NonTransactional, true); err != nil { + tntIDStruct.ID, true); err != nil { return err } cacheArgs[utils.RouteProfileIDs] = ids @@ -743,7 +743,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveChargerProfile(tntIDStruct.Tenant, - tntIDStruct.ID, utils.NonTransactional, true); err != nil { + tntIDStruct.ID, true); err != nil { return err } cacheArgs[utils.ChargerProfileIDs] = ids @@ -761,7 +761,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveDispatcherProfile(tntIDStruct.Tenant, - tntIDStruct.ID, utils.NonTransactional, true); err != nil { + tntIDStruct.ID, true); err != nil { return err } cacheArgs[utils.DispatcherProfileIDs] = ids @@ -778,7 +778,7 @@ func (ldr *Loader) removeLoadedData(loaderType string, lds map[string][]LoaderDa // get IDs so we can reload in cache ids = append(ids, tntID) if err := ldr.dm.RemoveDispatcherHost(tntIDStruct.Tenant, - tntIDStruct.ID, utils.NonTransactional); err != nil { + tntIDStruct.ID); err != nil { return err } cacheArgs[utils.DispatcherHostIDs] = ids diff --git a/loaders/loader_it_test.go b/loaders/loader_it_test.go index 756a5c34c..080bffc7d 100644 --- a/loaders/loader_it_test.go +++ b/loaders/loader_it_test.go @@ -488,7 +488,7 @@ cgrates.org,NewRes1 t.Errorf("Expected %+v, received %+v", utils.ToJSON(expRes), utils.ToJSON(rcv)) } - if err := ldr.dm.RemoveResourceProfile(expRes.Tenant, expRes.ID, utils.NonTransactional, true); err != nil { + if err := ldr.dm.RemoveResourceProfile(expRes.Tenant, expRes.ID, true); err != nil { t.Error(err) } diff --git a/migrator/action.go b/migrator/action.go index 2695c0284..770af7edb 100644 --- a/migrator/action.go +++ b/migrator/action.go @@ -54,7 +54,7 @@ func (m *Migrator) migrateCurrentActions() (err error) { if acts == nil || m.dryRun { continue } - if err := m.dmOut.DataManager().SetActions(idg, acts, utils.NonTransactional); err != nil { + if err := m.dmOut.DataManager().SetActions(idg, acts); err != nil { return err } m.stats[utils.Actions]++ @@ -116,7 +116,7 @@ func (m *Migrator) migrateActions() (err error) { break } if !m.dryRun { - if err = m.dmOut.DataManager().SetActions(acts[0].Id, acts, utils.NonTransactional); err != nil { + if err = m.dmOut.DataManager().SetActions(acts[0].Id, acts); err != nil { return } } diff --git a/migrator/action_it_test.go b/migrator/action_it_test.go index 30818499c..b15eea0e6 100644 --- a/migrator/action_it_test.go +++ b/migrator/action_it_test.go @@ -271,7 +271,7 @@ func testActITMigrateAndMove(t *testing.T) { t.Errorf("Expecting: 1, received: %+v", actMigrator.stats[utils.Actions]) } case utils.Move: - if err := actMigrator.dmIN.DataManager().SetActions(v1act.Id, *act, utils.NonTransactional); err != nil { + if err := actMigrator.dmIN.DataManager().SetActions(v1act.Id, *act); err != nil { t.Error("Error when setting ActionPlan ", err.Error()) } currentVersion := engine.CurrentDataDBVersions() diff --git a/migrator/action_trigger.go b/migrator/action_trigger.go index 6a3f9452f..315d60283 100644 --- a/migrator/action_trigger.go +++ b/migrator/action_trigger.go @@ -66,7 +66,7 @@ func (m *Migrator) migrateCurrentActionTrigger() (err error) { if acts == nil || m.dryRun { continue } - if err := m.dmOut.DataManager().SetActionTriggers(idg, acts, utils.NonTransactional); err != nil { + if err := m.dmOut.DataManager().SetActionTriggers(idg, acts); err != nil { return err } m.stats[utils.ActionTriggers]++ @@ -148,7 +148,7 @@ func (m *Migrator) migrateActionTriggers() (err error) { } if !m.dryRun { //set action triggers - if err = m.dmOut.DataManager().SetActionTriggers(v2[0].ID, v2, utils.NonTransactional); err != nil { + if err = m.dmOut.DataManager().SetActionTriggers(v2[0].ID, v2); err != nil { return } } diff --git a/migrator/action_trigger_it_test.go b/migrator/action_trigger_it_test.go index c846b7f04..2574738f6 100644 --- a/migrator/action_trigger_it_test.go +++ b/migrator/action_trigger_it_test.go @@ -235,7 +235,7 @@ func testActTrgITMigrateAndMove(t *testing.T) { t.Errorf("Expecting: 1, received: %+v", actTrgMigrator.stats[utils.ActionTriggers]) } case utils.Move: - if err := actTrgMigrator.dmIN.DataManager().SetActionTriggers((*v1actTrg)[0].Id, actTrg, utils.NonTransactional); err != nil { + if err := actTrgMigrator.dmIN.DataManager().SetActionTriggers((*v1actTrg)[0].Id, actTrg); err != nil { t.Error("Error when setting ActionTriggers ", err.Error()) } currentVersion := engine.CurrentDataDBVersions() diff --git a/migrator/attributes.go b/migrator/attributes.go index 4e381693a..e2c9a2ed1 100644 --- a/migrator/attributes.go +++ b/migrator/attributes.go @@ -67,7 +67,7 @@ func (m *Migrator) migrateCurrentAttributeProfile() (err error) { return err } if err := m.dmIN.DataManager().RemoveAttributeProfile(tntID[0], - tntID[1], utils.NonTransactional, false); err != nil { + tntID[1], false); err != nil { return err } m.stats[utils.Attributes]++ diff --git a/migrator/chargers.go b/migrator/chargers.go index 5b83ed1b7..938b96f2d 100644 --- a/migrator/chargers.go +++ b/migrator/chargers.go @@ -49,7 +49,7 @@ func (m *Migrator) migrateCurrentCharger() (err error) { return err } if err := m.dmIN.DataManager().RemoveChargerProfile(tntID[0], - tntID[1], utils.NonTransactional, false); err != nil { + tntID[1], false); err != nil { return err } m.stats[utils.Chargers]++ diff --git a/migrator/dispatchers.go b/migrator/dispatchers.go index 4c63c60bf..9ca4ae5df 100644 --- a/migrator/dispatchers.go +++ b/migrator/dispatchers.go @@ -49,7 +49,7 @@ func (m *Migrator) migrateCurrentDispatcher() (err error) { return err } if err := m.dmIN.DataManager().RemoveDispatcherProfile(tntID[0], - tntID[1], utils.NonTransactional, false); err != nil { + tntID[1], false); err != nil { return err } m.stats[utils.Dispatchers]++ @@ -79,7 +79,7 @@ func (m *Migrator) migrateCurrentDispatcherHost() (err error) { return err } if err := m.dmIN.DataManager().RemoveDispatcherHost(tntID[0], - tntID[1], utils.NonTransactional); err != nil { + tntID[1]); err != nil { return err } } diff --git a/migrator/filters.go b/migrator/filters.go index 09c41b813..247f5c0c2 100644 --- a/migrator/filters.go +++ b/migrator/filters.go @@ -50,7 +50,7 @@ func (m *Migrator) migrateCurrentRequestFilter() (err error) { return } if err = m.dmIN.DataManager().RemoveFilter(tntID[0], tntID[1], - utils.NonTransactional, true); err != nil { + true); err != nil { return } m.stats[utils.RQF]++ diff --git a/migrator/rating_plan.go b/migrator/rating_plan.go index 812ffb53d..42e4132e6 100644 --- a/migrator/rating_plan.go +++ b/migrator/rating_plan.go @@ -41,7 +41,7 @@ func (m *Migrator) migrateCurrentRatingPlans() (err error) { if rp == nil || m.dryRun { continue } - if err := m.dmOut.DataManager().SetRatingPlan(rp, utils.NonTransactional); err != nil { + if err := m.dmOut.DataManager().SetRatingPlan(rp); err != nil { return err } if err := m.dmIN.DataManager().RemoveRatingPlan(idg, utils.NonTransactional); err != nil { diff --git a/migrator/rating_plan_it_test.go b/migrator/rating_plan_it_test.go index 1b0aeebce..da4d61657 100644 --- a/migrator/rating_plan_it_test.go +++ b/migrator/rating_plan_it_test.go @@ -193,7 +193,7 @@ func testRtPlITMigrateAndMove(t *testing.T) { switch rtplAction { case utils.Migrate: // for the momment only one version of rating plans exists case utils.Move: - if err := rtplMigrator.dmIN.DataManager().SetRatingPlan(rtplPlan, utils.NonTransactional); err != nil { + if err := rtplMigrator.dmIN.DataManager().SetRatingPlan(rtplPlan); err != nil { t.Error(err) } currentVersion := engine.CurrentDataDBVersions() diff --git a/migrator/rating_profile.go b/migrator/rating_profile.go index 961e60d39..be1851163 100644 --- a/migrator/rating_profile.go +++ b/migrator/rating_profile.go @@ -41,10 +41,10 @@ func (m *Migrator) migrateCurrentRatingProfiles() (err error) { if rp == nil || m.dryRun { continue } - if err := m.dmOut.DataManager().SetRatingProfile(rp, utils.NonTransactional); err != nil { + if err := m.dmOut.DataManager().SetRatingProfile(rp); err != nil { return err } - if err := m.dmIN.DataManager().RemoveRatingProfile(idg, utils.NonTransactional); err != nil { + if err := m.dmIN.DataManager().RemoveRatingProfile(idg); err != nil { return err } m.stats[utils.RatingProfile]++ diff --git a/migrator/rating_profile_it_test.go b/migrator/rating_profile_it_test.go index f40ccaa8d..7454fbd5c 100644 --- a/migrator/rating_profile_it_test.go +++ b/migrator/rating_profile_it_test.go @@ -191,7 +191,7 @@ func testRtPrfITMigrateAndMove(t *testing.T) { switch rtprflAction { case utils.Migrate: // for the momment only one version of rating plans exists case utils.Move: - if err := rtprflMigrator.dmIN.DataManager().SetRatingProfile(rtprfl, utils.NonTransactional); err != nil { + if err := rtprflMigrator.dmIN.DataManager().SetRatingProfile(rtprfl); err != nil { t.Error(err) } currentVersion := engine.CurrentDataDBVersions() diff --git a/migrator/resource.go b/migrator/resource.go index 10ad9721f..9ebe5d362 100644 --- a/migrator/resource.go +++ b/migrator/resource.go @@ -47,7 +47,7 @@ func (m *Migrator) migrateCurrentResource() (err error) { if err := m.dmOut.DataManager().SetResourceProfile(res, true); err != nil { return err } - if err := m.dmIN.DataManager().RemoveResourceProfile(tntID[0], tntID[1], utils.NonTransactional, false); err != nil { + if err := m.dmIN.DataManager().RemoveResourceProfile(tntID[0], tntID[1], false); err != nil { return err } m.stats[utils.Resource]++ diff --git a/migrator/routes.go b/migrator/routes.go index 82f79de52..c6f19ba78 100644 --- a/migrator/routes.go +++ b/migrator/routes.go @@ -129,7 +129,7 @@ func (m *Migrator) migrateCurrentRouteProfile() (err error) { if err := m.dmOut.DataManager().SetRouteProfile(rPrf, true); err != nil { return err } - if err := m.dmIN.DataManager().RemoveRouteProfile(tntID[0], tntID[1], utils.NonTransactional, true); err != nil { + if err := m.dmIN.DataManager().RemoveRouteProfile(tntID[0], tntID[1], true); err != nil { return err } m.stats[utils.Routes]++ diff --git a/migrator/sharedgroup.go b/migrator/sharedgroup.go index 5a106237e..d6534cef9 100644 --- a/migrator/sharedgroup.go +++ b/migrator/sharedgroup.go @@ -47,7 +47,7 @@ func (m *Migrator) migrateCurrentSharedGroups() (err error) { if sgs == nil || m.dryRun { continue } - if err := m.dmOut.DataManager().SetSharedGroup(sgs, utils.NonTransactional); err != nil { + if err := m.dmOut.DataManager().SetSharedGroup(sgs); err != nil { return err } m.stats[utils.SharedGroups]++ @@ -69,7 +69,7 @@ func (m *Migrator) migrateV1SharedGroups() (err error) { continue } acnt := v1SG.AsSharedGroup() - if err = m.dmOut.DataManager().SetSharedGroup(acnt, utils.NonTransactional); err != nil { + if err = m.dmOut.DataManager().SetSharedGroup(acnt); err != nil { return err } m.stats[utils.SharedGroups]++ diff --git a/migrator/sharedgroup_it_test.go b/migrator/sharedgroup_it_test.go index 5ba897f16..0581a7fa5 100644 --- a/migrator/sharedgroup_it_test.go +++ b/migrator/sharedgroup_it_test.go @@ -226,7 +226,7 @@ func testShrGrpITMigrateAndMove(t *testing.T) { t.Errorf("Expected 1, received: %v", shrGrpMigrator.stats[utils.SharedGroups]) } case utils.Move: - if err := shrGrpMigrator.dmIN.DataManager().SetSharedGroup(shrGrp, utils.NonTransactional); err != nil { + if err := shrGrpMigrator.dmIN.DataManager().SetSharedGroup(shrGrp); err != nil { t.Error("Error when setting SharedGroup ", err.Error()) } currentVersion := engine.CurrentDataDBVersions() diff --git a/migrator/stats.go b/migrator/stats.go index 00919e6dc..923145dc2 100644 --- a/migrator/stats.go +++ b/migrator/stats.go @@ -89,7 +89,7 @@ func (m *Migrator) migrateCurrentStats() (err error) { return err } } - if err := m.dmIN.DataManager().RemoveStatQueueProfile(tntID[0], tntID[1], utils.NonTransactional, false); err != nil { + if err := m.dmIN.DataManager().RemoveStatQueueProfile(tntID[0], tntID[1], false); err != nil { return err } m.stats[utils.StatS]++ diff --git a/migrator/thresholds.go b/migrator/thresholds.go index 4ccac40af..80070720f 100644 --- a/migrator/thresholds.go +++ b/migrator/thresholds.go @@ -85,7 +85,7 @@ func (m *Migrator) migrateCurrentThresholds() (err error) { return err } } - if err := m.dmIN.DataManager().RemoveThresholdProfile(tntID[0], tntID[1], utils.NonTransactional, false); err != nil { + if err := m.dmIN.DataManager().RemoveThresholdProfile(tntID[0], tntID[1], false); err != nil { return err } m.stats[utils.Thresholds]++