diff --git a/apier/v1/versions.go b/apier/v1/versions.go index 0d840a48b..fb3f85696 100644 --- a/apier/v1/versions.go +++ b/apier/v1/versions.go @@ -23,9 +23,9 @@ import ( "github.com/cgrates/cgrates/utils" ) -// Queries all versions from stordb -func (self *ApierV1) GetStorDBVersions(arg string, reply *engine.Versions) error { - if vrs, err := self.StorDb.GetVersions(utils.TBLVersions); err != nil { +// Queries all versions from dataDB +func (self *ApierV1) GetDataDBVersions(arg string, reply *engine.Versions) error { + if vrs, err := self.DataManager.DataDB().GetVersions(""); err != nil { return utils.NewErrServerError(err) } else if len(vrs) == 0 { return utils.ErrNotFound @@ -36,8 +36,8 @@ func (self *ApierV1) GetStorDBVersions(arg string, reply *engine.Versions) error } // Queries all versions from stordb -func (self *ApierV1) GetDataDBVersions(arg string, reply *engine.Versions) error { - if vrs, err := self.DataManager.DataDB().GetVersions(utils.TBLVersions); err != nil { +func (self *ApierV1) GetStorDBVersions(arg string, reply *engine.Versions) error { + if vrs, err := self.StorDb.GetVersions(""); err != nil { return utils.NewErrServerError(err) } else if len(vrs) == 0 { return utils.ErrNotFound diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index b10d0aa1b..cac5eb14b 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -172,7 +172,7 @@ func main() { log.Fatal(err) } if *datadb_versions { - vrs, _ := dmOUT.DataDB().GetVersions(utils.TBLVersions) + vrs, _ := dmOUT.DataDB().GetVersions("") if len(vrs) != 0 { log.Printf("DataDB versions : %+v\n", vrs) } else { @@ -180,7 +180,7 @@ func main() { } } if *stordb_versions { - vrs, _ := storDB.GetVersions(utils.TBLVersions) + vrs, _ := storDB.GetVersions("") if len(vrs) != 0 { log.Printf("StorDB versions : %+v\n", vrs) } else { diff --git a/config/config_json.go b/config/config_json.go index e43db4f2e..c9958f0f4 100644 --- a/config/config_json.go +++ b/config/config_json.go @@ -24,7 +24,6 @@ import ( "os" "github.com/DisposaBoy/JsonConfigReader" - "github.com/cgrates/cgrates/utils" ) const ( @@ -367,7 +366,7 @@ func (self CgrJsonCfg) ResourceSJsonCfg() (*ResourceSJsonCfg, error) { } func (self CgrJsonCfg) StatSJsonCfg() (*StatServJsonCfg, error) { - rawCfg, hasKey := self[utils.StatS] + rawCfg, hasKey := self[STATS_JSON] if !hasKey { return nil, nil } diff --git a/engine/actions_it_test.go b/engine/actions_it_test.go index fbac11db3..7b0ce32d5 100644 --- a/engine/actions_it_test.go +++ b/engine/actions_it_test.go @@ -50,6 +50,9 @@ func TestActionsitInitCfg(t *testing.T) { } func TestActionsitInitCdrDb(t *testing.T) { + if err := InitDataDb(actsLclCfg); err != nil { // need it for versions + t.Fatal(err) + } if err := InitStorDb(actsLclCfg); err != nil { t.Fatal(err) } diff --git a/engine/onstor_it_test.go b/engine/onstor_it_test.go index 32f998927..3b512bce3 100644 --- a/engine/onstor_it_test.go +++ b/engine/onstor_it_test.go @@ -49,6 +49,7 @@ var sTestsOnStorIT = []func(t *testing.T){ testOnStorITCacheActionPlan, testOnStorITCacheAccountActionPlans, testOnStorITCacheDerivedChargers, + // ToDo: test cache flush for a prefix // ToDo: testOnStorITLoadAccountingCache testOnStorITHasData, @@ -1868,22 +1869,61 @@ func testOnStorITCRUDHistory(t *testing.T) { } func testOnStorITCRUDStructVersion(t *testing.T) { - CurrentVersion := Versions{utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2} - if _, rcvErr := onStor.DataDB().GetVersions(utils.TBLVersions); rcvErr != utils.ErrNotFound { - t.Error(rcvErr) - } - if err := onStor.DataDB().SetVersions(CurrentVersion, false); err != nil { + if _, err := onStor.DataDB().GetVersions(utils.Accounts); err != utils.ErrNotFound { t.Error(err) } - if rcv, err := onStor.DataDB().GetVersions(utils.TBLVersions); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(CurrentVersion, rcv) { - t.Errorf("Expecting: %v, received: %v", CurrentVersion, rcv) - } else if err = onStor.DataDB().RemoveVersions(rcv); err != nil { + vrs := Versions{utils.Accounts: 3, utils.Actions: 2, utils.ActionTriggers: 2, + utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 1} + if err := onStor.DataDB().SetVersions(vrs, false); err != nil { t.Error(err) } - if _, rcvErr := onStor.DataDB().GetVersions(utils.TBLVersions); rcvErr != utils.ErrNotFound { - t.Error(rcvErr) + if rcv, err := onStor.DataDB().GetVersions(""); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(vrs, rcv) { + t.Errorf("Expecting: %v, received: %v", vrs, rcv) + } + delete(vrs, utils.SharedGroups) + if err := onStor.DataDB().SetVersions(vrs, true); err != nil { // overwrite + t.Error(err) + } + if rcv, err := onStor.DataDB().GetVersions(""); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(vrs, rcv) { + t.Errorf("Expecting: %v, received: %v", vrs, rcv) + } + eAcnts := Versions{utils.Accounts: vrs[utils.Accounts]} + if rcv, err := onStor.DataDB().GetVersions(utils.Accounts); err != nil { //query one element + t.Error(err) + } else if !reflect.DeepEqual(eAcnts, rcv) { + t.Errorf("Expecting: %v, received: %v", eAcnts, rcv) + } + if _, err := onStor.DataDB().GetVersions(utils.NOT_AVAILABLE); err != utils.ErrNotFound { //query non-existent + t.Error(err) + } + eAcnts[utils.Accounts] = 2 + vrs[utils.Accounts] = eAcnts[utils.Accounts] + if err := onStor.DataDB().SetVersions(eAcnts, false); err != nil { // change one element + t.Error(err) + } + if rcv, err := onStor.DataDB().GetVersions(""); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(vrs, rcv) { + t.Errorf("Expecting: %v, received: %v", vrs, rcv) + } + if err = onStor.DataDB().RemoveVersions(eAcnts); err != nil { // remove one element + t.Error(err) + } + delete(vrs, utils.Accounts) + if rcv, err := onStor.DataDB().GetVersions(""); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(vrs, rcv) { + t.Errorf("Expecting: %v, received: %v", vrs, rcv) + } + if err = onStor.DataDB().RemoveVersions(nil); err != nil { // remove one element + t.Error(err) + } + if _, err := onStor.DataDB().GetVersions(""); err != utils.ErrNotFound { //query non-existent + t.Error(err) } } diff --git a/engine/storage_map.go b/engine/storage_map.go index cbbee6296..83ad6286c 100644 --- a/engine/storage_map.go +++ b/engine/storage_map.go @@ -1669,7 +1669,7 @@ func (ms *MapStorage) SetVersions(vrs Versions, overwrite bool) (err error) { var result []byte var x Versions if !overwrite { - x, err = ms.GetVersions(utils.TBLVersions) + x, err = ms.GetVersions("") if err != nil { return err } diff --git a/engine/storage_mongo_stordb.go b/engine/storage_mongo_stordb.go index 364e8ea27..8ea1f289e 100644 --- a/engine/storage_mongo_stordb.go +++ b/engine/storage_mongo_stordb.go @@ -1294,12 +1294,19 @@ func (ms *MongoStorage) SetTPAttributes(tpSPs []*utils.TPAttributeProfile) (err func (ms *MongoStorage) GetVersions(itm string) (vrs Versions, err error) { session, col := ms.conn(colVer) defer session.Close() - if err = col.Find(bson.M{}).One(&vrs); err != nil { + proj := bson.M{} // projection params + if itm != "" { + proj[itm] = 1 + } + if err = col.Find(bson.M{}).Select(proj).One(&vrs); err != nil { if err == mgo.ErrNotFound { err = utils.ErrNotFound } return nil, err } + if len(vrs) == 0 { + return nil, utils.ErrNotFound + } return } @@ -1307,27 +1314,33 @@ func (ms *MongoStorage) SetVersions(vrs Versions, overwrite bool) (err error) { session, col := ms.conn(colVer) defer session.Close() if overwrite { - if err = ms.RemoveVersions(vrs); err != nil { - return err - } + _, err = col.Upsert(bson.M{}, &vrs) + return } - if _, err = col.Upsert(bson.M{}, &vrs); err != nil { - return err - } - + _, err = col.Upsert(bson.M{}, bson.M{"$set": &vrs}) return } func (ms *MongoStorage) RemoveVersions(vrs Versions) (err error) { session, col := ms.conn(colVer) defer session.Close() - err = col.Remove(bson.M{}) + if len(vrs) != 0 { + var pairs []interface{} + for k := range vrs { + pairs = append(pairs, bson.M{}) // match first + pairs = append(pairs, bson.M{"$unset": bson.M{k: 1}}) + } + bulk := col.Bulk() + bulk.Unordered() + bulk.Upsert(pairs...) + _, err = bulk.Run() + } else { + err = col.Remove(bson.M{}) + } if err == mgo.ErrNotFound { err = utils.ErrNotFound - } else { - return err } - return nil + return } func (ms *MongoStorage) GetStorageType() string { diff --git a/engine/storage_redis.go b/engine/storage_redis.go index 2d21ec929..852a74aac 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -24,6 +24,7 @@ import ( "errors" "fmt" "io/ioutil" + "strconv" "strings" "github.com/cgrates/cgrates/config" @@ -1544,11 +1545,25 @@ func (rs *RedisStorage) MatchFilterIndexDrv(cacheID, itemIDPrefix, } func (rs *RedisStorage) GetVersions(itm string) (vrs Versions, err error) { - x, err := rs.Cmd("HGETALL", itm).Map() + if itm != "" { + fldVal, err := rs.Cmd("HGET", utils.TBLVersions, itm).Str() + if err != nil { + if err == redis.ErrRespNil { + err = utils.ErrNotFound + } + return nil, err + } + intVal, err := strconv.ParseInt(fldVal, 10, 64) + if err != nil { + return nil, err + } + return Versions{itm: intVal}, nil + } + mp, err := rs.Cmd("HGETALL", utils.TBLVersions).Map() if err != nil { return nil, err } - vrs, err = utils.MapStringToInt64(x) + vrs, err = utils.MapStringToInt64(mp) if err != nil { return nil, err } @@ -1560,7 +1575,7 @@ func (rs *RedisStorage) GetVersions(itm string) (vrs Versions, err error) { func (rs *RedisStorage) SetVersions(vrs Versions, overwrite bool) (err error) { if overwrite { - if err = rs.RemoveVersions(vrs); err != nil { + if err = rs.RemoveVersions(nil); err != nil { return } } @@ -1568,14 +1583,16 @@ func (rs *RedisStorage) SetVersions(vrs Versions, overwrite bool) (err error) { } func (rs *RedisStorage) RemoveVersions(vrs Versions) (err error) { - for key, _ := range vrs { - err = rs.Cmd("HDEL", utils.TBLVersions, key).Err - if err != nil { - return err + if len(vrs) != 0 { + for key, _ := range vrs { + err = rs.Cmd("HDEL", utils.TBLVersions, key).Err + if err != nil { + return err + } } + return } - - return + return rs.Cmd("DEL", utils.TBLVersions).Err } // GetStatQueueProfileDrv retrieves a StatQueueProfile from dataDB diff --git a/engine/version.go b/engine/version.go index ab6e49077..89375f02e 100644 --- a/engine/version.go +++ b/engine/version.go @@ -32,7 +32,7 @@ func CheckVersions(storage Storage) error { // get current db version storType := storage.GetStorageType() x := CurrentDBVersions(storType) - dbVersion, err := storage.GetVersions(utils.TBLVersions) + dbVersion, err := storage.GetVersions("") if err == utils.ErrNotFound { empty, err := storage.IsDBEmpty() if err != nil { diff --git a/engine/versions_it_test.go b/engine/versions_it_test.go index 2d1eeecb5..a6c4c68d1 100644 --- a/engine/versions_it_test.go +++ b/engine/versions_it_test.go @@ -153,13 +153,13 @@ func testVersion(t *testing.T) { } //dataDB - if _, rcvErr := dm3.DataDB().GetVersions(utils.TBLVersions); rcvErr != utils.ErrNotFound { + if _, rcvErr := dm3.DataDB().GetVersions(""); rcvErr != utils.ErrNotFound { t.Error(rcvErr) } if err := CheckVersions(dm3.DataDB()); err != nil { t.Error(err) } - if rcv, err := dm3.DataDB().GetVersions(utils.TBLVersions); err != nil { + if rcv, err := dm3.DataDB().GetVersions(""); err != nil { t.Error(err) } else if len(currentVersion) != len(rcv) { t.Errorf("Expecting: %v, received: %v", currentVersion, rcv) @@ -167,7 +167,7 @@ func testVersion(t *testing.T) { if err = dm3.DataDB().RemoveVersions(currentVersion); err != nil { t.Error(err) } - if _, rcvErr := dm3.DataDB().GetVersions(utils.TBLVersions); rcvErr != utils.ErrNotFound { + if _, rcvErr := dm3.DataDB().GetVersions(""); rcvErr != utils.ErrNotFound { t.Error(rcvErr) } if err := dm3.DataDB().SetVersions(testVersion, false); err != nil { @@ -197,7 +197,7 @@ func testVersion(t *testing.T) { if err := CheckVersions(storageDb); err != nil { t.Error(err) } - if rcv, err := storageDb.GetVersions(utils.TBLVersions); err != nil { + if rcv, err := storageDb.GetVersions(""); err != nil { t.Error(err) } else if len(currentVersion) != len(rcv) { t.Errorf("Expecting: %v, received: %v", currentVersion, rcv) @@ -205,7 +205,7 @@ func testVersion(t *testing.T) { if err = storageDb.RemoveVersions(currentVersion); err != nil { t.Error(err) } - if _, rcvErr := storageDb.GetVersions(utils.TBLVersions); rcvErr != utils.ErrNotFound { + if _, rcvErr := storageDb.GetVersions(""); rcvErr != utils.ErrNotFound { t.Error(rcvErr) } if err := storageDb.SetVersions(testVersion, false); err != nil { diff --git a/migrator/accounts.go b/migrator/accounts.go index 17275d9f4..e741fc9af 100755 --- a/migrator/accounts.go +++ b/migrator/accounts.go @@ -126,7 +126,7 @@ func (m *Migrator) migrateV2Accounts() (err error) { func (m *Migrator) migrateAccounts() (err error) { var vrs engine.Versions - vrs, err = m.dmIN.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmIN.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/action.go b/migrator/action.go index b8cd673aa..dc550c8a3 100644 --- a/migrator/action.go +++ b/migrator/action.go @@ -104,7 +104,7 @@ func (m *Migrator) migrateV1Actions() (err error) { func (m *Migrator) migrateActions() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/action_plan.go b/migrator/action_plan.go index 77a25b8e2..5a454b6bf 100644 --- a/migrator/action_plan.go +++ b/migrator/action_plan.go @@ -109,7 +109,7 @@ func (m *Migrator) migrateV1ActionPlans() (err error) { func (m *Migrator) migrateActionPlans() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/action_trigger.go b/migrator/action_trigger.go index 749eaa9cd..6fe294540 100644 --- a/migrator/action_trigger.go +++ b/migrator/action_trigger.go @@ -116,7 +116,7 @@ func (m *Migrator) migrateV1ActionTrigger() (err error) { func (m *Migrator) migrateActionTriggers() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/alias.go b/migrator/alias.go index 775d0039a..4f31f9ec7 100644 --- a/migrator/alias.go +++ b/migrator/alias.go @@ -92,7 +92,7 @@ func (m *Migrator) migrateCurrentAlias() (err error) { func (m *Migrator) migrateAlias() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, @@ -120,7 +120,7 @@ func (m *Migrator) migrateAlias() (err error) { func (m *Migrator) migrateReverseAlias() (err error) { // var vrs engine.Versions // current := engine.CurrentDataDBVersions() - // vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + // vrs, err = m.dmOut.DataDB().GetVersions("") // if err != nil { // return utils.NewCGRError(utils.Migrator, // utils.ServerErrorCaps, diff --git a/migrator/attributes.go b/migrator/attributes.go index 7cacdd1a8..001ee7942 100644 --- a/migrator/attributes.go +++ b/migrator/attributes.go @@ -111,7 +111,7 @@ func (m *Migrator) migrateV1Attributes() (err error) { func (m *Migrator) migrateAttributeProfile() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/cdrstats.go b/migrator/cdrstats.go index 837253c75..2907b456a 100644 --- a/migrator/cdrstats.go +++ b/migrator/cdrstats.go @@ -46,7 +46,7 @@ func (m *Migrator) migrateCurrentCdrStats() (err error) { func (m *Migrator) migrateCdrStats() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/derived_chargers.go b/migrator/derived_chargers.go index b8996ef29..7f4bc8201 100644 --- a/migrator/derived_chargers.go +++ b/migrator/derived_chargers.go @@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentDerivedChargers() (err error) { func (m *Migrator) migrateDerivedChargers() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/destinations.go b/migrator/destinations.go index 24a32b123..33f45c3a5 100644 --- a/migrator/destinations.go +++ b/migrator/destinations.go @@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentDestinations() (err error) { func (m *Migrator) migrateDestinations() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, @@ -116,7 +116,7 @@ func (m *Migrator) migrateCurrentReverseDestinations() (err error) { func (m *Migrator) migrateReverseDestinations() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/filters.go b/migrator/filters.go index e30941f43..d20b556f9 100644 --- a/migrator/filters.go +++ b/migrator/filters.go @@ -55,7 +55,7 @@ func (m *Migrator) migrateCurrentRequestFilter() (err error) { func (m *Migrator) migrateRequestFilter() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/lcr.go b/migrator/lcr.go index 84d59cd63..123c7a9ef 100644 --- a/migrator/lcr.go +++ b/migrator/lcr.go @@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentLCR() (err error) { func (m *Migrator) migrateLCR() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/migrator.go b/migrator/migrator.go index 6d5c5c05a..17acac15b 100755 --- a/migrator/migrator.go +++ b/migrator/migrator.go @@ -95,7 +95,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) { fmt.Sprintf("error: <%s> when updating CostDetails version into StorDB", err.Error())), nil } if m.datadb_versions { - vrs, err := m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err := m.dmOut.DataDB().GetVersions("") if err != nil { return err, nil } @@ -109,7 +109,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) { fmt.Sprintf("error: <%s> when updating CostDetails version into StorDB", err.Error())), nil } if m.stordb_versions { - vrs, err := m.storDB.GetVersions(utils.TBLVersions) + vrs, err := m.storDB.GetVersions("") if err != nil { return err, nil } diff --git a/migrator/rating_plan.go b/migrator/rating_plan.go index 6aeaa457d..eeb98791f 100644 --- a/migrator/rating_plan.go +++ b/migrator/rating_plan.go @@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentRatingPlans() (err error) { func (m *Migrator) migrateRatingPlans() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/rating_profile.go b/migrator/rating_profile.go index ceabafb1e..c673b7ee0 100644 --- a/migrator/rating_profile.go +++ b/migrator/rating_profile.go @@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentRatingProfiles() (err error) { func (m *Migrator) migrateRatingProfiles() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/resource.go b/migrator/resource.go index b63b040b2..dcebd013c 100644 --- a/migrator/resource.go +++ b/migrator/resource.go @@ -55,7 +55,7 @@ func (m *Migrator) migrateCurrentResource() (err error) { func (m *Migrator) migrateResources() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/sessions_costs.go b/migrator/sessions_costs.go index 739d250a8..99d2d8670 100644 --- a/migrator/sessions_costs.go +++ b/migrator/sessions_costs.go @@ -29,7 +29,7 @@ import ( func (m *Migrator) migrateSessionsCosts() (err error) { var vrs engine.Versions - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/sharedgroup.go b/migrator/sharedgroup.go index 3f64df3b0..320e0a7c9 100644 --- a/migrator/sharedgroup.go +++ b/migrator/sharedgroup.go @@ -89,7 +89,7 @@ func (m *Migrator) migrateV1SharedGroups() (err error) { func (m *Migrator) migrateSharedGroups() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/stats.go b/migrator/stats.go index bcbd0af2b..94ca5425a 100644 --- a/migrator/stats.go +++ b/migrator/stats.go @@ -158,7 +158,7 @@ func (m *Migrator) migrateV1CDRSTATS() (err error) { func (m *Migrator) migrateStats() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/subscribers.go b/migrator/subscribers.go index a02874d17..60c57b2b2 100644 --- a/migrator/subscribers.go +++ b/migrator/subscribers.go @@ -46,7 +46,7 @@ func (m *Migrator) migrateCurrentSubscribers() (err error) { func (m *Migrator) migrateSubscribers() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/suppliers.go b/migrator/suppliers.go index 56508bddb..24b1835c5 100644 --- a/migrator/suppliers.go +++ b/migrator/suppliers.go @@ -55,7 +55,7 @@ func (m *Migrator) migrateCurrentSupplierProfile() (err error) { func (m *Migrator) migrateSupplierProfiles() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/thresholds.go b/migrator/thresholds.go index b03e1180f..08e541485 100644 --- a/migrator/thresholds.go +++ b/migrator/thresholds.go @@ -137,7 +137,7 @@ func (m *Migrator) migrateV2ActionTriggers() (err error) { func (m *Migrator) migrateThresholds() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/timings.go b/migrator/timings.go index d68b89c4e..889cf3d5b 100644 --- a/migrator/timings.go +++ b/migrator/timings.go @@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentTiming() (err error) { func (m *Migrator) migrateTimings() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_account_actions.go b/migrator/tp_account_actions.go index e5876fea9..2155f9061 100644 --- a/migrator/tp_account_actions.go +++ b/migrator/tp_account_actions.go @@ -50,7 +50,7 @@ func (m *Migrator) migrateCurrentTPaccountAcction() (err error) { func (m *Migrator) migrateTPaccountacction() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_action_plans.go b/migrator/tp_action_plans.go index a15fca660..c65851a09 100644 --- a/migrator/tp_action_plans.go +++ b/migrator/tp_action_plans.go @@ -56,7 +56,7 @@ func (m *Migrator) migrateCurrentTPactionplans() (err error) { func (m *Migrator) migrateTPactionplans() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_action_triggers.go b/migrator/tp_action_triggers.go index 99cee4191..df9e419b6 100644 --- a/migrator/tp_action_triggers.go +++ b/migrator/tp_action_triggers.go @@ -56,7 +56,7 @@ func (m *Migrator) migrateCurrentTPactiontriggers() (err error) { func (m *Migrator) migrateTPactiontriggers() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_actions.go b/migrator/tp_actions.go index ba720943a..b6282daa1 100644 --- a/migrator/tp_actions.go +++ b/migrator/tp_actions.go @@ -56,7 +56,7 @@ func (m *Migrator) migrateCurrentTPactions() (err error) { func (m *Migrator) migrateTPactions() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_aliases.go b/migrator/tp_aliases.go index c4c4f5e2e..c6911165a 100644 --- a/migrator/tp_aliases.go +++ b/migrator/tp_aliases.go @@ -54,7 +54,7 @@ func (m *Migrator) migrateCurrentTPaliases() (err error) { func (m *Migrator) migrateTPaliases() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_cdr_stats.go b/migrator/tp_cdr_stats.go index 6e456965c..4aa02c3ab 100644 --- a/migrator/tp_cdr_stats.go +++ b/migrator/tp_cdr_stats.go @@ -56,7 +56,7 @@ func (m *Migrator) migrateCurrentTPcdrstats() (err error) { func (m *Migrator) migrateTPcdrstats() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_derived_chargers.go b/migrator/tp_derived_chargers.go index 082842749..211f3a720 100644 --- a/migrator/tp_derived_chargers.go +++ b/migrator/tp_derived_chargers.go @@ -52,7 +52,7 @@ func (m *Migrator) migrateCurrentTPderivedchargers() (err error) { func (m *Migrator) migrateTPderivedchargers() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_destination_rates.go b/migrator/tp_destination_rates.go index 2bb661a14..a6ad3b825 100644 --- a/migrator/tp_destination_rates.go +++ b/migrator/tp_destination_rates.go @@ -56,7 +56,7 @@ func (m *Migrator) migrateCurrentTPdestinationrates() (err error) { func (m *Migrator) migrateTPdestinationrates() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_destinations.go b/migrator/tp_destinations.go index 308e61d9a..d0f73a959 100644 --- a/migrator/tp_destinations.go +++ b/migrator/tp_destinations.go @@ -56,7 +56,7 @@ func (m *Migrator) migrateCurrentTPDestinations() (err error) { func (m *Migrator) migrateTPDestinations() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_filters.go b/migrator/tp_filters.go index f563fb3f8..b985bcc22 100644 --- a/migrator/tp_filters.go +++ b/migrator/tp_filters.go @@ -57,7 +57,7 @@ func (m *Migrator) migrateCurrentTPfilters() (err error) { func (m *Migrator) migrateTPfilters() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_rates.go b/migrator/tp_rates.go index 03a14b705..1743a8a5b 100644 --- a/migrator/tp_rates.go +++ b/migrator/tp_rates.go @@ -57,7 +57,7 @@ func (m *Migrator) migrateCurrentTPrates() (err error) { func (m *Migrator) migrateTPrates() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_rating_plans.go b/migrator/tp_rating_plans.go index d029abbc4..d2901ec91 100644 --- a/migrator/tp_rating_plans.go +++ b/migrator/tp_rating_plans.go @@ -58,7 +58,7 @@ func (m *Migrator) migrateCurrentTPratingplans() (err error) { func (m *Migrator) migrateTPratingplans() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_rating_profiles.go b/migrator/tp_rating_profiles.go index cd0f729a6..1a509f903 100644 --- a/migrator/tp_rating_profiles.go +++ b/migrator/tp_rating_profiles.go @@ -52,7 +52,7 @@ func (m *Migrator) migrateCurrentTPratingprofiles() (err error) { func (m *Migrator) migrateTPratingprofiles() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_resources.go b/migrator/tp_resources.go index db31417b8..250860083 100644 --- a/migrator/tp_resources.go +++ b/migrator/tp_resources.go @@ -58,7 +58,7 @@ func (m *Migrator) migrateCurrentTPresources() (err error) { func (m *Migrator) migrateTPresources() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_shared_groups.go b/migrator/tp_shared_groups.go index 8f0c4c9f3..ac828c894 100644 --- a/migrator/tp_shared_groups.go +++ b/migrator/tp_shared_groups.go @@ -58,7 +58,7 @@ func (m *Migrator) migrateCurrentTPsharedgroups() (err error) { func (m *Migrator) migrateTPsharedgroups() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_stats.go b/migrator/tp_stats.go index 4f99d7089..bc3baca9a 100644 --- a/migrator/tp_stats.go +++ b/migrator/tp_stats.go @@ -58,7 +58,7 @@ func (m *Migrator) migrateCurrentTPstats() (err error) { func (m *Migrator) migrateTPstats() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_thresholds.go b/migrator/tp_thresholds.go index 7c982e15a..10e03ca8b 100644 --- a/migrator/tp_thresholds.go +++ b/migrator/tp_thresholds.go @@ -58,7 +58,7 @@ func (m *Migrator) migrateCurrentTPthresholds() (err error) { func (m *Migrator) migrateTPthresholds() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_timings.go b/migrator/tp_timings.go index 4b8ee5113..96b45746d 100644 --- a/migrator/tp_timings.go +++ b/migrator/tp_timings.go @@ -58,7 +58,7 @@ func (m *Migrator) migrateCurrentTPTiming() (err error) { func (m *Migrator) migrateTpTimings() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/tp_users.go b/migrator/tp_users.go index ed8fd8416..c84178f4f 100644 --- a/migrator/tp_users.go +++ b/migrator/tp_users.go @@ -52,7 +52,7 @@ func (m *Migrator) migrateCurrentTPusers() (err error) { func (m *Migrator) migrateTPusers() (err error) { var vrs engine.Versions current := engine.CurrentStorDBVersions() - vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions) + vrs, err = m.OutStorDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/migrator/user.go b/migrator/user.go index cccfd3f32..761e90b95 100644 --- a/migrator/user.go +++ b/migrator/user.go @@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentUser() (err error) { func (m *Migrator) migrateUser() (err error) { var vrs engine.Versions current := engine.CurrentDataDBVersions() - vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions) + vrs, err = m.dmOut.DataDB().GetVersions("") if err != nil { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, diff --git a/utils/consts.go b/utils/consts.go index a9a79c347..31644265d 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -426,7 +426,7 @@ const ( Thresholds = "Thresholds" Suppliers = "Suppliers" Attributes = "Attributes" - StatS = "stats" + StatS = "Stats" RALService = "RALs" CostSource = "CostSource" ExtraInfo = "ExtraInfo"