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

changing db type constants with leading *

Browse Source
This commit is contained in:
gezimbll
2023-03-03 11:11:58 -05:00
committed by Dan Christian Bogos
parent f9b8fe38b8
commit 5c4bf0e538
31 changed files with 132 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
migrator/accounts2_it_test.go
View File

@@ -124,13 +124,13 @@ func testAcc2ITFlush(t *testing.T) {
if err := engine.SetDBVersions(acc2Migrator.dmIN.DataManager().DataDB()); err != nil {
t.Error("Error ", err.Error())
}
if acc2Migrator.dmOut.DataManager().DataDB().GetStorageType() != utils.Redis {
if acc2Migrator.dmOut.DataManager().DataDB().GetStorageType() != utils.MetaRedis {
t.Errorf("Unexpected datadb type : %+v", acc2Migrator.dmOut.DataManager().DataDB().GetStorageType())
}
if acc2Migrator.storDBIn.StorDB().GetStorageType() != utils.Internal {
if acc2Migrator.storDBIn.StorDB().GetStorageType() != utils.MetaInternal {
t.Errorf("Unexpected datadb type : %+v", acc2Migrator.storDBIn.StorDB().GetStorageType())
}
if acc2Migrator.storDBOut.StorDB().GetStorageType() != utils.Internal {
if acc2Migrator.storDBOut.StorDB().GetStorageType() != utils.MetaInternal {
t.Errorf("Unexpected datadb type : %+v", acc2Migrator.storDBOut.StorDB().GetStorageType())
}
}

2
migrator/action_plan.go
View File

@@ -102,7 +102,7 @@ func (m *Migrator) migrateActionPlans() (err error) {
if vrs, err = m.getVersions(utils.ActionPlans); err != nil {
return
}
if m.dmIN.DataManager().DataDB().GetStorageType() == utils.Redis { // if redis rebuild action plans indexes
if m.dmIN.DataManager().DataDB().GetStorageType() == utils.MetaRedis { // if redis rebuild action plans indexes
redisDB, can := m.dmIN.DataManager().DataDB().(*engine.RedisStorage)
if !can {
return fmt.Errorf("Storage type %s could not be casted to <*engine.RedisStorage>", m.dmIN.DataManager().DataDB().GetStorageType())

12
migrator/migrator.go
View File

@@ -88,22 +88,22 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
fmt.Sprintf("error: <%s> when seting versions for StorDB", err.Error())), nil
}
case utils.MetaEnsureIndexes:
if m.storDBOut.StorDB().GetStorageType() == utils.Mongo {
if m.storDBOut.StorDB().GetStorageType() == utils.MetaMongo {
mgo := m.storDBOut.StorDB().(*engine.MongoStorage)
if err = mgo.EnsureIndexes(); err != nil {
return
}
} else {
log.Printf("The StorDB type has to be %s .\n ", utils.Mongo)
log.Printf("The StorDB type has to be %s .\n ", utils.MetaMongo)
}
if m.dmOut.DataManager().DataDB().GetStorageType() == utils.Mongo {
if m.dmOut.DataManager().DataDB().GetStorageType() == utils.MetaMongo {
mgo := m.dmOut.DataManager().DataDB().(*engine.MongoStorage)
if err = mgo.EnsureIndexes(); err != nil {
return
}
} else {
log.Printf("The DataDB type has to be %s .\n ", utils.Mongo)
log.Printf("The DataDB type has to be %s .\n ", utils.MetaMongo)
}
case utils.MetaCDRs:
err = m.migrateCDRs()
@@ -333,7 +333,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
}
func (m *Migrator) ensureIndexesDataDB(cols ...string) error {
if m.dmOut.DataManager().DataDB().GetStorageType() != utils.Mongo {
if m.dmOut.DataManager().DataDB().GetStorageType() != utils.MetaMongo {
return nil
}
mgo := m.dmOut.DataManager().DataDB().(*engine.MongoStorage)
@@ -341,7 +341,7 @@ func (m *Migrator) ensureIndexesDataDB(cols ...string) error {
}
func (m *Migrator) ensureIndexesStorDB(cols ...string) error {
if m.storDBOut.StorDB().GetStorageType() != utils.Mongo {
if m.storDBOut.StorDB().GetStorageType() != utils.MetaMongo {
return nil
}
mgo := m.storDBOut.StorDB().(*engine.MongoStorage)

18
migrator/migrator_utils.go
View File

@@ -41,15 +41,15 @@ func NewMigratorDataDB(db_type, host, port, name, user, pass,
}
dm := engine.NewDataManager(dbCon, cacheCfg, nil)
switch db_type {
case utils.Redis:
case utils.MetaRedis:
db = newRedisMigrator(dm)
case utils.Mongo:
case utils.MetaMongo:
db = newMongoMigrator(dm)
case utils.Internal:
case utils.MetaInternal:
db = newInternalMigrator(dm)
default:
err = fmt.Errorf("unknown db '%s' valid options are '%s' or '%s or '%s'",
db_type, utils.Redis, utils.Mongo, utils.Internal)
db_type, utils.MetaRedis, utils.MetaMongo, utils.MetaInternal)
}
return
}
@@ -63,17 +63,17 @@ func NewMigratorStorDB(db_type, host, port, name, user, pass, marshaler string,
return
}
switch db_type {
case utils.Mongo:
case utils.MetaMongo:
db = newMongoStorDBMigrator(storDb)
case utils.MySQL:
case utils.MetaMySQL:
db = newMigratorSQL(storDb)
case utils.Postgres:
case utils.MetaPostgres:
db = newMigratorSQL(storDb)
case utils.Internal:
case utils.MetaInternal:
db = newInternalStorDBMigrator(storDb)
default:
err = fmt.Errorf("Unknown db '%s' valid options are [%s, %s, %s, %s]",
db_type, utils.MySQL, utils.Mongo, utils.Postgres, utils.Internal)
db_type, utils.MetaMySQL, utils.MetaMongo, utils.MetaPostgres, utils.MetaInternal)
}
return
}

4
migrator/storage_sql.go
View File

@@ -97,7 +97,7 @@ func (mgSQL *migratorSQL) remV1CDRs(v1Cdr *v1Cdrs) (err error) {
func (mgSQL *migratorSQL) renameV1SMCosts() (err error) {
qry := "RENAME TABLE sm_costs TO session_costs;"
if mgSQL.StorDB().GetStorageType() == utils.Postgres {
if mgSQL.StorDB().GetStorageType() == utils.MetaPostgres {
qry = "ALTER TABLE sm_costs RENAME TO session_costs"
}
if _, err := mgSQL.sqlStorage.Db.Exec(qry); err != nil {
@@ -108,7 +108,7 @@ func (mgSQL *migratorSQL) renameV1SMCosts() (err error) {
func (mgSQL *migratorSQL) createV1SMCosts() (err error) {
qry := "CREATE TABLE sm_costs ( id int(11) NOT NULL AUTO_INCREMENT, cgrid varchar(40) NOT NULL, run_id varchar(64) NOT NULL, origin_host varchar(64) NOT NULL, origin_id varchar(128) NOT NULL, cost_source varchar(64) NOT NULL, `usage` BIGINT NOT NULL, cost_details MEDIUMTEXT, created_at TIMESTAMP NULL,deleted_at TIMESTAMP NULL, PRIMARY KEY (`id`),UNIQUE KEY costid (cgrid, run_id),KEY origin_idx (origin_host, origin_id),KEY run_origin_idx (run_id, origin_id),KEY deleted_at_idx (deleted_at));"
if mgSQL.StorDB().GetStorageType() == utils.Postgres {
if mgSQL.StorDB().GetStorageType() == utils.MetaPostgres {
qry = `
CREATE TABLE sm_costs (
id SERIAL PRIMARY KEY,