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

Rename ItemOpt structs to ItemOpts and repair its diff function

Browse Source
This commit is contained in:
ionutboangiu
2022-01-14 17:27:46 +02:00
committed by Dan Christian Bogos
parent a1c7b9a8bd
commit a927220fdb
12 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.go
View File

@@ -100,11 +100,11 @@ func newCGRConfig(config []byte) (cfg *CGRConfig, err error) {
templates: make(FCTemplates),
generalCfg: &GeneralCfg{NodeID: utils.UUIDSha1Prefix()},
dataDbCfg: &DataDbCfg{
Items: make(map[string]*ItemOpt),
Items: make(map[string]*ItemOpts),
Opts: &DataDBOpts{},
},
storDbCfg: &StorDbCfg{
Items: make(map[string]*ItemOpt),
Items: make(map[string]*ItemOpts),
Opts: &StorDBOpts{},
},
tlsCfg: new(TLSCfg),

4
config/config_json_test.go
View File

@@ -285,7 +285,7 @@ func TestDfDataDbJsonCfg(t *testing.T) {
RedisClusterOndownDelay: utils.StringPointer("0"),
RedisClusterSync: utils.StringPointer("5s"),
},
Items: map[string]*ItemOptJson{
Items: map[string]*ItemOptsJson{
utils.MetaAccounts: {
Ttl: utils.StringPointer(utils.EmptyString),
Static_ttl: utils.BoolPointer(false),
@@ -529,7 +529,7 @@ func TestDfStorDBJsonCfg(t *testing.T) {
SSLMode: utils.StringPointer(utils.PostgressSSLModeDisable),
MySQLLocation: utils.StringPointer("Local"),
},
Items: map[string]*ItemOptJson{
Items: map[string]*ItemOptsJson{
utils.CacheTBLTPResources: {
Limit: utils.IntPointer(-1),
Ttl: utils.StringPointer(utils.EmptyString),

6
config/configsanity_test.go
View File

@@ -1632,7 +1632,7 @@ func TestConfigSanityDataDB(t *testing.T) {
}
cfg.thresholdSCfg.Enabled = false
cfg.dataDbCfg.Items = map[string]*ItemOpt{
cfg.dataDbCfg.Items = map[string]*ItemOpts{
"test1": {
Remote: true,
},
@@ -1642,7 +1642,7 @@ func TestConfigSanityDataDB(t *testing.T) {
t.Errorf("Expecting: %+q received: %+q", expected, err)
}
cfg.dataDbCfg.Items = map[string]*ItemOpt{
cfg.dataDbCfg.Items = map[string]*ItemOpts{
"test2": {
Remote: false,
Replicate: true,
@@ -1669,7 +1669,7 @@ func TestConfigSanityDataDB(t *testing.T) {
t.Errorf("Expecting: %+q received: %+q", expected, err)
}
cfg.dataDbCfg.RplConns = []string{}
cfg.dataDbCfg.Items = map[string]*ItemOpt{}
cfg.dataDbCfg.Items = map[string]*ItemOpts{}
//RmtConns
cfg.dataDbCfg.RmtConns = []string{"test2"}
expected = "<data_db> connection with id: <test2> not defined"

36
config/datadbcfg.go
View File

@@ -71,7 +71,7 @@ type DataDbCfg struct {
RplConns []string // Replication connIDs
RplFiltered bool
RplCache string
Items map[string]*ItemOpt
Items map[string]*ItemOpts
Opts *DataDBOpts
}
@@ -186,7 +186,7 @@ func (dbcfg *DataDbCfg) loadFromJSONCfg(jsnDbCfg *DbJsonCfg) (err error) {
for kJsn, vJsn := range jsnDbCfg.Items {
val, has := dbcfg.Items[kJsn]
if val == nil || !has {
val = &ItemOpt{Limit: -1}
val = &ItemOpts{Limit: -1}
}
if err = val.loadFromJSONCfg(vJsn); err != nil {
return
@@ -238,7 +238,7 @@ func (dbcfg DataDbCfg) Clone() (cln *DataDbCfg) {
RplFiltered: dbcfg.RplFiltered,
RplCache: dbcfg.RplCache,
RmtConnID: dbcfg.RmtConnID,
Items: make(map[string]*ItemOpt),
Items: make(map[string]*ItemOpts),
Opts: dbcfg.Opts.Clone(),
}
for k, itm := range dbcfg.Items {
@@ -292,8 +292,8 @@ func (dbcfg DataDbCfg) AsMapInterface(string) interface{} {
return mp
}
// ItemOpt the options for the stored items
type ItemOpt struct {
// ItemOpts the options for the stored items
type ItemOpts struct {
Limit int
TTL time.Duration
StaticTTL bool
@@ -305,7 +305,7 @@ type ItemOpt struct {
}
// AsMapInterface returns the config as a map[string]interface{}
func (itm *ItemOpt) AsMapInterface() (initialMP map[string]interface{}) {
func (itm *ItemOpts) AsMapInterface() (initialMP map[string]interface{}) {
initialMP = map[string]interface{}{
utils.RemoteCfg: itm.Remote,
utils.ReplicateCfg: itm.Replicate,
@@ -324,7 +324,7 @@ func (itm *ItemOpt) AsMapInterface() (initialMP map[string]interface{}) {
return
}
func (itm *ItemOpt) loadFromJSONCfg(jsonItm *ItemOptJson) (err error) {
func (itm *ItemOpts) loadFromJSONCfg(jsonItm *ItemOptsJson) (err error) {
if jsonItm == nil {
return
}
@@ -353,8 +353,8 @@ func (itm *ItemOpt) loadFromJSONCfg(jsonItm *ItemOptJson) (err error) {
}
// Clone returns a deep copy of ItemOpt
func (itm *ItemOpt) Clone() *ItemOpt {
return &ItemOpt{
func (itm *ItemOpts) Clone() *ItemOpts {
return &ItemOpts{
Limit: itm.Limit,
TTL: itm.TTL,
StaticTTL: itm.StaticTTL,
@@ -365,7 +365,7 @@ func (itm *ItemOpt) Clone() *ItemOpt {
}
}
func (itm *ItemOpt) Equals(itm2 *ItemOpt) bool {
func (itm *ItemOpts) Equals(itm2 *ItemOpts) bool {
return (itm == nil && itm2 == nil) ||
(itm != nil && itm2 != nil &&
itm.Remote == itm2.Remote &&
@@ -377,7 +377,7 @@ func (itm *ItemOpt) Equals(itm2 *ItemOpt) bool {
itm.StaticTTL == itm2.StaticTTL)
}
type ItemOptJson struct {
type ItemOptsJson struct {
Limit *int
Ttl *string
Static_ttl *bool
@@ -388,9 +388,9 @@ type ItemOptJson struct {
Api_key *string
}
func diffItemOptJson(d *ItemOptJson, v1, v2 *ItemOpt) *ItemOptJson {
func diffItemOptJson(d *ItemOptsJson, v1, v2 *ItemOpts) *ItemOptsJson {
if d == nil {
d = new(ItemOptJson)
d = new(ItemOptsJson)
}
if v2.Remote != v1.Remote {
d.Remote = utils.BoolPointer(v2.Remote)
@@ -405,7 +405,7 @@ func diffItemOptJson(d *ItemOptJson, v1, v2 *ItemOpt) *ItemOptJson {
d.Static_ttl = utils.BoolPointer(v2.StaticTTL)
}
if v2.TTL != v1.TTL {
d.Route_id = utils.StringPointer(v2.TTL.String())
d.Ttl = utils.StringPointer(v2.TTL.String())
}
if v2.RouteID != v1.RouteID {
d.Route_id = utils.StringPointer(v2.RouteID)
@@ -416,13 +416,13 @@ func diffItemOptJson(d *ItemOptJson, v1, v2 *ItemOpt) *ItemOptJson {
return d
}
func diffMapItemOptJson(d map[string]*ItemOptJson, v1, v2 map[string]*ItemOpt) map[string]*ItemOptJson {
func diffMapItemOptJson(d map[string]*ItemOptsJson, v1, v2 map[string]*ItemOpts) map[string]*ItemOptsJson {
if d == nil {
d = make(map[string]*ItemOptJson)
d = make(map[string]*ItemOptsJson)
}
for k, val2 := range v2 {
if val1, has := v1[k]; !has {
d[k] = diffItemOptJson(d[k], new(ItemOpt), val2)
d[k] = diffItemOptJson(d[k], new(ItemOpts), val2)
} else if !val1.Equals(val2) {
d[k] = diffItemOptJson(d[k], val1, val2)
}
@@ -463,7 +463,7 @@ type DbJsonCfg struct {
Replication_conns *[]string
Replication_filtered *bool
Replication_cache *string
Items map[string]*ItemOptJson
Items map[string]*ItemOptsJson
Opts *DBOptsJson
}

64
config/datadbcfg_test.go
View File

@@ -36,7 +36,7 @@ func TestDataDbCfgloadFromJsonCfg(t *testing.T) {
Db_password: utils.StringPointer("password"),
Remote_conns: &[]string{"*conn1"},
Replication_conns: &[]string{"*conn1"},
Items: map[string]*ItemOptJson{
Items: map[string]*ItemOptsJson{
utils.MetaAccounts: {
Replicate: utils.BoolPointer(true),
Remote: utils.BoolPointer(true),
@@ -55,7 +55,7 @@ func TestDataDbCfgloadFromJsonCfg(t *testing.T) {
Password: "password",
RmtConns: []string{"*conn1"},
RplConns: []string{"*conn1"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
utils.MetaAccounts: {
Limit: -1,
Replicate: true,
@@ -136,19 +136,19 @@ func TestConnsloadFromJsonCfg(t *testing.T) {
}
func TestItemCfgloadFromJson(t *testing.T) {
jsonCfg := &ItemOptJson{
jsonCfg := &ItemOptsJson{
Remote: utils.BoolPointer(true),
Replicate: utils.BoolPointer(true),
Api_key: utils.StringPointer("randomVal"),
Route_id: utils.StringPointer("randomID"),
}
expected := &ItemOpt{
expected := &ItemOpts{
Remote: true,
Replicate: true,
APIKey: "randomVal",
RouteID: "randomID",
}
rcv := new(ItemOpt)
rcv := new(ItemOpts)
rcv.loadFromJSONCfg(nil)
rcv.loadFromJSONCfg(jsonCfg)
if !reflect.DeepEqual(rcv, expected) {
@@ -339,7 +339,7 @@ func TestDataDbCfgloadFromJsonCfgItems(t *testing.T) {
User: "cgrates",
Password: "password",
RmtConns: []string{"Conn1"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
utils.MetaAccounts: {
Limit: -1,
Replicate: true,
@@ -349,7 +349,7 @@ func TestDataDbCfgloadFromJsonCfgItems(t *testing.T) {
RedisSentinel: "sentinel",
},
}
dbcfg.Items = make(map[string]*ItemOpt)
dbcfg.Items = make(map[string]*ItemOpts)
dbcfg.Opts = &DataDBOpts{}
if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil {
t.Error(err)
@@ -390,7 +390,7 @@ func TestDataDbCfgloadFromJsonCfgItems(t *testing.T) {
RedisSentinel: "sentinel",
},
RmtConns: []string{"Conn1"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
utils.MetaDispatcherHosts: {
Limit: -1,
Remote: true,
@@ -403,7 +403,7 @@ func TestDataDbCfgloadFromJsonCfgItems(t *testing.T) {
},
},
}
dbcfg.Items = make(map[string]*ItemOpt)
dbcfg.Items = make(map[string]*ItemOpts)
if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil {
t.Error(err)
} else if err = dbcfg.Load(context.Background(), jsnCfg, NewDefaultCGRConfig()); err != nil {
@@ -443,13 +443,13 @@ func TestDataDbCfgloadFromJsonCfgItems(t *testing.T) {
RedisSentinel: "sentinel",
},
RmtConns: []string{"Conn1"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
utils.MetaResourceProfile: {Limit: -1},
utils.MetaResources: {Limit: -1},
utils.MetaStatQueueProfiles: {Limit: -1},
},
}
dbcfg.Items = make(map[string]*ItemOpt)
dbcfg.Items = make(map[string]*ItemOpts)
if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil {
t.Error(err)
} else if err = dbcfg.Load(context.Background(), jsnCfg, NewDefaultCGRConfig()); err != nil {
@@ -519,7 +519,7 @@ func TestCloneDataDB(t *testing.T) {
Db_password: utils.StringPointer("password"),
Remote_conns: &[]string{"*conn1"},
Replication_conns: &[]string{"*conn1"},
Items: map[string]*ItemOptJson{
Items: map[string]*ItemOptsJson{
utils.MetaAccounts: {
Replicate: utils.BoolPointer(true),
Remote: utils.BoolPointer(true),
@@ -547,14 +547,14 @@ func TestCloneDataDB(t *testing.T) {
}
func TestDataDbEqualsTrue(t *testing.T) {
itm := &ItemOpt{
itm := &ItemOpts{
Remote: true,
Replicate: false,
RouteID: "RouteID",
APIKey: "APIKey",
}
itm2 := &ItemOpt{
itm2 := &ItemOpts{
Remote: true,
Replicate: false,
RouteID: "RouteID",
@@ -567,14 +567,14 @@ func TestDataDbEqualsTrue(t *testing.T) {
}
func TestDataDbEqualsFalse(t *testing.T) {
itm := &ItemOpt{
itm := &ItemOpts{
Remote: true,
Replicate: false,
RouteID: "RouteID",
APIKey: "APIKey",
}
itm2 := &ItemOpt{
itm2 := &ItemOpts{
Remote: false,
Replicate: true,
RouteID: "RouteID2",
@@ -587,23 +587,23 @@ func TestDataDbEqualsFalse(t *testing.T) {
}
func TestDiffItemOptJson(t *testing.T) {
var d *ItemOptJson
var d *ItemOptsJson
v1 := &ItemOpt{
v1 := &ItemOpts{
Remote: true,
Replicate: false,
RouteID: "RouteID",
APIKey: "APIKey",
}
v2 := &ItemOpt{
v2 := &ItemOpts{
Remote: false,
Replicate: true,
RouteID: "RouteID2",
APIKey: "APIKey2",
}
expected := &ItemOptJson{
expected := &ItemOptsJson{
Remote: utils.BoolPointer(false),
Replicate: utils.BoolPointer(true),
Route_id: utils.StringPointer("RouteID2"),
@@ -616,7 +616,7 @@ func TestDiffItemOptJson(t *testing.T) {
}
v2_2 := v1
expected2 := &ItemOptJson{}
expected2 := &ItemOptsJson{}
rcv = diffItemOptJson(d, v1, v2_2)
if !reflect.DeepEqual(rcv, expected2) {
t.Errorf("Expected %v \n but received \n %v", utils.ToJSON(expected2), utils.ToJSON(rcv))
@@ -624,9 +624,9 @@ func TestDiffItemOptJson(t *testing.T) {
}
func TestDiffMapItemOptJson(t *testing.T) {
var d map[string]*ItemOptJson
var d map[string]*ItemOptsJson
v1 := map[string]*ItemOpt{
v1 := map[string]*ItemOpts{
"ITEM_OPT1": {
Remote: true,
Replicate: false,
@@ -635,7 +635,7 @@ func TestDiffMapItemOptJson(t *testing.T) {
},
}
v2 := map[string]*ItemOpt{
v2 := map[string]*ItemOpts{
"ITEM_OPT1": {
Remote: false,
Replicate: true,
@@ -644,7 +644,7 @@ func TestDiffMapItemOptJson(t *testing.T) {
},
}
expected := map[string]*ItemOptJson{
expected := map[string]*ItemOptsJson{
"ITEM_OPT1": {
Remote: utils.BoolPointer(false),
Replicate: utils.BoolPointer(true),
@@ -659,7 +659,7 @@ func TestDiffMapItemOptJson(t *testing.T) {
}
v2_2 := v1
expected2 := map[string]*ItemOptJson{}
expected2 := map[string]*ItemOptsJson{}
rcv = diffMapItemOptJson(d, v1, v2_2)
if !reflect.DeepEqual(rcv, expected2) {
t.Errorf("Expected %v \n but received \n %v", utils.ToJSON(expected2), utils.ToJSON(rcv))
@@ -681,7 +681,7 @@ func TestDiffDataDbJsonCfg(t *testing.T) {
RplConns: []string{},
RplFiltered: true,
RplCache: "RplCache",
Items: map[string]*ItemOpt{},
Items: map[string]*ItemOpts{},
Opts: &DataDBOpts{
RedisSentinel: "sentinel1",
},
@@ -699,7 +699,7 @@ func TestDiffDataDbJsonCfg(t *testing.T) {
RplConns: []string{"RplConn1"},
RplFiltered: false,
RplCache: "RplCache2",
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
"ITEM_1": {
Remote: true,
Replicate: true,
@@ -724,7 +724,7 @@ func TestDiffDataDbJsonCfg(t *testing.T) {
Replication_conns: &[]string{"RplConn1"},
Replication_filtered: utils.BoolPointer(false),
Replication_cache: utils.StringPointer("RplCache2"),
Items: map[string]*ItemOptJson{
Items: map[string]*ItemOptsJson{
"ITEM_1": {
Remote: utils.BoolPointer(true),
Replicate: utils.BoolPointer(true),
@@ -744,7 +744,7 @@ func TestDiffDataDbJsonCfg(t *testing.T) {
v2_2 := v1
expected2 := &DbJsonCfg{
Items: map[string]*ItemOptJson{},
Items: map[string]*ItemOptsJson{},
Opts: &DBOptsJson{},
}
rcv = diffDataDbJsonCfg(d, v1, v2_2)
@@ -817,7 +817,7 @@ func TestDataDbDiff(t *testing.T) {
RplConns: []string{},
RplFiltered: true,
RplCache: "RplCache",
Items: map[string]*ItemOpt{},
Items: map[string]*ItemOpts{},
Opts: &DataDBOpts{
RedisSentinel: "sentinel1",
},
@@ -835,7 +835,7 @@ func TestDataDbDiff(t *testing.T) {
RplConns: []string{},
RplFiltered: true,
RplCache: "RplCache",
Items: map[string]*ItemOpt{},
Items: map[string]*ItemOpts{},
Opts: &DataDBOpts{
RedisSentinel: "sentinel1",
},

6
config/stordbcfg.go
View File

@@ -51,7 +51,7 @@ type StorDbCfg struct {
PrefixIndexedFields []string
RmtConns []string // Remote DataDB connIDs
RplConns []string // Replication connIDs
Items map[string]*ItemOpt
Items map[string]*ItemOpts
Opts *StorDBOpts
}
@@ -150,7 +150,7 @@ func (dbcfg *StorDbCfg) loadFromJSONCfg(jsnDbCfg *DbJsonCfg) (err error) {
}
if jsnDbCfg.Items != nil {
for kJsn, vJsn := range jsnDbCfg.Items {
val := new(ItemOpt)
val := new(ItemOpts)
if err = val.loadFromJSONCfg(vJsn); err != nil {
return
}
@@ -188,7 +188,7 @@ func (dbcfg StorDbCfg) Clone() (cln *StorDbCfg) {
User: dbcfg.User,
Password: dbcfg.Password,
Items: make(map[string]*ItemOpt),
Items: make(map[string]*ItemOpts),
Opts: dbcfg.Opts.Clone(),
}
for key, item := range dbcfg.Items {

18
config/stordbcfg_test.go
View File

@@ -38,7 +38,7 @@ func TestStoreDbCfgloadFromJsonCfgCase1(t *testing.T) {
Prefix_indexed_fields: &[]string{"*req.index1"},
Remote_conns: &[]string{"*conn1"},
Replication_conns: &[]string{"*conn1"},
Items: map[string]*ItemOptJson{
Items: map[string]*ItemOptsJson{
utils.MetaCDRs: {
Remote: utils.BoolPointer(true),
Replicate: utils.BoolPointer(false),
@@ -63,7 +63,7 @@ func TestStoreDbCfgloadFromJsonCfgCase1(t *testing.T) {
PrefixIndexedFields: []string{"*req.index1"},
RmtConns: []string{"*conn1"},
RplConns: []string{"*conn1"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
utils.MetaCDRs: {
Remote: true,
Replicate: false,
@@ -303,7 +303,7 @@ func TestStorDbCfgClone(t *testing.T) {
PrefixIndexedFields: []string{"*req.index1"},
RmtConns: []string{"*conn1"},
RplConns: []string{"*conn1"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
utils.MetaCDRs: {
Remote: true,
Replicate: false,
@@ -357,7 +357,7 @@ func TestDiffStorDBJsonCfg(t *testing.T) {
PrefixIndexedFields: []string{"*req.index2"},
RmtConns: []string{"*rmt_conn"},
RplConns: []string{"*rpl_conns"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
"ITEM_1": {
Remote: false,
},
@@ -378,7 +378,7 @@ func TestDiffStorDBJsonCfg(t *testing.T) {
PrefixIndexedFields: []string{"*req.index22"},
RmtConns: []string{"*rmt_conn2"},
RplConns: []string{"*rpl_conn2"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
"ITEM_1": {
Remote: true,
},
@@ -399,7 +399,7 @@ func TestDiffStorDBJsonCfg(t *testing.T) {
Db_password: utils.StringPointer("itsyscom_password"),
Remote_conns: &[]string{"*rmt_conn2"},
Replication_conns: &[]string{"*rpl_conn2"},
Items: map[string]*ItemOptJson{
Items: map[string]*ItemOptsJson{
"ITEM_1": {
Remote: utils.BoolPointer(true),
},
@@ -416,7 +416,7 @@ func TestDiffStorDBJsonCfg(t *testing.T) {
v1 = v2
expected = &DbJsonCfg{
Items: map[string]*ItemOptJson{},
Items: map[string]*ItemOptsJson{},
Opts: &DBOptsJson{},
}
rcv = diffStorDBDbJsonCfg(d, v1, v2)
@@ -474,7 +474,7 @@ func TestStorDbCloneSection(t *testing.T) {
PrefixIndexedFields: []string{"*req.index2"},
RmtConns: []string{"*rmt_conn"},
RplConns: []string{"*rpl_conns"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
"ITEM_1": {
Remote: false,
},
@@ -495,7 +495,7 @@ func TestStorDbCloneSection(t *testing.T) {
PrefixIndexedFields: []string{"*req.index2"},
RmtConns: []string{"*rmt_conn"},
RplConns: []string{"*rpl_conns"},
Items: map[string]*ItemOpt{
Items: map[string]*ItemOpts{
"ITEM_1": {
Remote: false,
},

2
engine/storage_internal_datadb.go
View File

@@ -44,7 +44,7 @@ type InternalDB struct {
// NewInternalDB constructs an InternalDB
func NewInternalDB(stringIndexedFields, prefixIndexedFields []string,
itmsCfg map[string]*config.ItemOpt) *InternalDB {
itmsCfg map[string]*config.ItemOpts) *InternalDB {
tcCfg := make(map[string]*ltcache.CacheConfig, len(itmsCfg))
for k, cPcfg := range itmsCfg {
tcCfg[k] = &ltcache.CacheConfig{

4
engine/storage_utils.go
View File

@@ -32,7 +32,7 @@ import (
// NewDataDBConn creates a DataDB connection
func NewDataDBConn(dbType, host, port, name, user,
pass, marshaler string, opts *config.DataDBOpts,
itmsCfg map[string]*config.ItemOpt) (d DataDBDriver, err error) {
itmsCfg map[string]*config.ItemOpts) (d DataDBDriver, err error) {
switch dbType {
case utils.Redis:
var dbNo int
@@ -60,7 +60,7 @@ func NewDataDBConn(dbType, host, port, name, user,
// NewStorDBConn returns a StorDB(implements Storage interface) based on dbType
func NewStorDBConn(dbType, host, port, name, user, pass, marshaler string,
stringIndexedFields, prefixIndexedFields []string,
opts *config.StorDBOpts, itmsCfg map[string]*config.ItemOpt) (db StorDB, err error) {
opts *config.StorDBOpts, itmsCfg map[string]*config.ItemOpts) (db StorDB, err error) {
switch dbType {
case utils.Mongo:
db, err = NewMongoStorage(host, port, name, user, pass, marshaler, utils.StorDB, stringIndexedFields, opts.MongoQueryTimeout)

4
migrator/migrator_utils.go
View File

@@ -33,7 +33,7 @@ var (
func NewMigratorDataDB(db_type, host, port, name, user, pass,
marshaler string, cacheCfg *config.CacheCfg,
opts *config.DataDBOpts, itmsCfg map[string]*config.ItemOpt) (db MigratorDataDB, err error) {
opts *config.DataDBOpts, itmsCfg map[string]*config.ItemOpts) (db MigratorDataDB, err error) {
dbCon, err := engine.NewDataDBConn(db_type, host,
port, name, user, pass, marshaler, opts, itmsCfg)
if err != nil {
@@ -59,7 +59,7 @@ func NewMigratorDataDB(db_type, host, port, name, user, pass,
func NewMigratorStorDB(db_type, host, port, name, user, pass, marshaler string,
stringIndexedFields, prefixIndexedFields []string,
opts *config.StorDBOpts, itmsCfg map[string]*config.ItemOpt) (db MigratorStorDB, err error) {
opts *config.StorDBOpts, itmsCfg map[string]*config.ItemOpts) (db MigratorStorDB, err error) {
storDb, err := engine.NewStorDBConn(db_type, host, port, name, user,
pass, marshaler, stringIndexedFields, prefixIndexedFields, opts, itmsCfg)
if err != nil {

10
services/datadb_it_test.go
View File

@@ -88,7 +88,7 @@ func TestDataDBReload(t *testing.T) {
},
RmtConns: []string{},
RplConns: []string{},
Items: map[string]*config.ItemOpt{
Items: map[string]*config.ItemOpts{
utils.MetaAccounts: {Limit: -1},
utils.MetaActions: {Limit: -1},
utils.MetaResourceProfile: {Limit: -1},
@@ -196,7 +196,7 @@ func TestDataDBReloadBadType(t *testing.T) {
},
RmtConns: []string{},
RplConns: []string{},
Items: map[string]*config.ItemOpt{
Items: map[string]*config.ItemOpts{
utils.MetaAccounts: {},
utils.MetaActions: {},
utils.MetaCronExp: {},
@@ -253,7 +253,7 @@ func TestDataDBReloadErrorMarsheler(t *testing.T) {
},
RmtConns: []string{},
RplConns: []string{},
Items: map[string]*config.ItemOpt{
Items: map[string]*config.ItemOpts{
utils.MetaAccounts: {},
utils.MetaActions: {},
utils.MetaCronExp: {},
@@ -390,7 +390,7 @@ func TestDataDBReloadCastError(t *testing.T) {
},
RmtConns: []string{},
RplConns: []string{},
Items: map[string]*config.ItemOpt{
Items: map[string]*config.ItemOpts{
utils.MetaAccounts: {},
utils.MetaActions: {},
utils.MetaCronExp: {},
@@ -456,7 +456,7 @@ func TestDataDBReloadError(t *testing.T) {
},
RmtConns: []string{},
RplConns: []string{},
Items: map[string]*config.ItemOpt{
Items: map[string]*config.ItemOpts{
utils.MetaAccounts: {},
utils.MetaActions: {},
utils.MetaCronExp: {},

2
services/datadb_test.go
View File

@@ -59,7 +59,7 @@ func TestDataDBCoverage(t *testing.T) {
},
RmtConns: []string{},
RplConns: []string{},
Items: map[string]*config.ItemOpt{
Items: map[string]*config.ItemOpts{
utils.MetaAccounts: {},
utils.MetaActions: {},
utils.MetaCronExp: {},