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

Update config for rateS

Browse Source
This commit is contained in:
TeoV
2020-06-15 18:02:33 +03:00
committed by Dan Christian Bogos
parent 6303a66d14
commit 704aa541c2
7 changed files with 97 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config_defaults.go
View File

@@ -926,6 +926,10 @@ const CGRATES_CFG_JSON = `
//"string_indexed_fields": [], // query indexes based on these fields for faster processing
"prefix_indexed_fields": [], // query indexes based on these fields for faster processing
"nested_fields": false, // determines which field is checked when matching indexed filters(true: all; false: only the one on the first level)
"rate_indexed_selects": true, // enable profile matching exclusively on indexes
//"rate_string_indexed_fields": [], // query indexes based on these fields for faster processing
"rate_prefix_indexed_fields": [], // query indexes based on these fields for faster processing
"rate_nested_fields": false, // determines which field is checked when matching indexed filters(true: all; false: only the one on the first level)
},
"sip_agent": { // SIP Agents, only used for redirections

14
config/config_json_test.go
View File

@@ -2035,11 +2035,15 @@ func TestDfEventExporterCfg(t *testing.T) {
func TestDfRateSJsonCfg(t *testing.T) {
eCfg := &RateSJsonCfg{
Enabled: utils.BoolPointer(false),
Indexed_selects: utils.BoolPointer(true),
String_indexed_fields: nil,
Prefix_indexed_fields: &[]string{},
Nested_fields: utils.BoolPointer(false),
Enabled: utils.BoolPointer(false),
Indexed_selects: utils.BoolPointer(true),
String_indexed_fields: nil,
Prefix_indexed_fields: &[]string{},
Nested_fields: utils.BoolPointer(false),
Rate_indexed_selects: utils.BoolPointer(true),
Rate_string_indexed_fields: nil,
Rate_prefix_indexed_fields: &[]string{},
Rate_nested_fields: utils.BoolPointer(false),
}
if cfg, err := dfCgrJsonCfg.RateCfgJson(); err != nil {
t.Error(err)

14
config/config_test.go
View File

@@ -1889,11 +1889,15 @@ func TestCgrCfgJSONDefaultApierCfg(t *testing.T) {
func TestCgrCfgJSONDefaultRateCfg(t *testing.T) {
eCfg := &RateSCfg{
Enabled: false,
IndexedSelects: true,
StringIndexedFields: nil,
PrefixIndexedFields: &[]string{},
NestedFields: false,
Enabled: false,
IndexedSelects: true,
StringIndexedFields: nil,
PrefixIndexedFields: &[]string{},
NestedFields: false,
RateIndexedSelects: true,
RateStringIndexedFields: nil,
RatePrefixIndexedFields: &[]string{},
RateNestedFields: false,
}
if !reflect.DeepEqual(cgrCfg.rateSCfg, eCfg) {
t.Errorf("received: %+v, expecting: %+v", cgrCfg.rateSCfg, eCfg)

14
config/libconfig_json.go
View File

@@ -608,11 +608,15 @@ type STIRJsonCfg struct {
}
type RateSJsonCfg struct {
Enabled *bool
Indexed_selects *bool
String_indexed_fields *[]string
Prefix_indexed_fields *[]string
Nested_fields *bool // applies when indexed fields is not defined
Enabled *bool
Indexed_selects *bool
String_indexed_fields *[]string
Prefix_indexed_fields *[]string
Nested_fields *bool // applies when indexed fields is not defined
Rate_indexed_selects *bool
Rate_string_indexed_fields *[]string
Rate_prefix_indexed_fields *[]string
Rate_nested_fields *bool // applies when indexed fields is not defined
}
// SIPAgentJsonCfg

63
config/ratescfg.go
View File

@@ -23,11 +23,15 @@ import (
)
type RateSCfg struct {
Enabled bool
IndexedSelects bool
StringIndexedFields *[]string
PrefixIndexedFields *[]string
NestedFields bool
Enabled bool
IndexedSelects bool
StringIndexedFields *[]string
PrefixIndexedFields *[]string
NestedFields bool
RateIndexedSelects bool
RateStringIndexedFields *[]string
RatePrefixIndexedFields *[]string
RateNestedFields bool
}
func (rCfg *RateSCfg) loadFromJsonCfg(jsnCfg *RateSJsonCfg) (err error) {
@@ -57,6 +61,27 @@ func (rCfg *RateSCfg) loadFromJsonCfg(jsnCfg *RateSJsonCfg) (err error) {
if jsnCfg.Nested_fields != nil {
rCfg.NestedFields = *jsnCfg.Nested_fields
}
if jsnCfg.Rate_indexed_selects != nil {
rCfg.RateIndexedSelects = *jsnCfg.Rate_indexed_selects
}
if jsnCfg.Rate_string_indexed_fields != nil {
sif := make([]string, len(*jsnCfg.Rate_string_indexed_fields))
for i, fID := range *jsnCfg.Rate_string_indexed_fields {
sif[i] = fID
}
rCfg.RateStringIndexedFields = &sif
}
if jsnCfg.Rate_prefix_indexed_fields != nil {
pif := make([]string, len(*jsnCfg.Rate_prefix_indexed_fields))
for i, fID := range *jsnCfg.Rate_prefix_indexed_fields {
pif[i] = fID
}
rCfg.RatePrefixIndexedFields = &pif
}
if jsnCfg.Rate_nested_fields != nil {
rCfg.RateNestedFields = *jsnCfg.Rate_nested_fields
}
return
}
@@ -75,11 +100,29 @@ func (rCfg *RateSCfg) AsMapInterface() map[string]interface{} {
prefixIndexedFields[i] = item
}
}
rateStringIndexedFields := []string{}
if rCfg.RateStringIndexedFields != nil {
rateStringIndexedFields = make([]string, len(*rCfg.RateStringIndexedFields))
for i, item := range *rCfg.RateStringIndexedFields {
rateStringIndexedFields[i] = item
}
}
ratePrefixIndexedFields := []string{}
if rCfg.RatePrefixIndexedFields != nil {
ratePrefixIndexedFields = make([]string, len(*rCfg.RatePrefixIndexedFields))
for i, item := range *rCfg.RatePrefixIndexedFields {
ratePrefixIndexedFields[i] = item
}
}
return map[string]interface{}{
utils.EnabledCfg: rCfg.Enabled,
utils.IndexedSelectsCfg: rCfg.IndexedSelects,
utils.StringIndexedFieldsCfg: stringIndexedFields,
utils.PrefixIndexedFieldsCfg: prefixIndexedFields,
utils.NestedFieldsCfg: rCfg.NestedFields,
utils.EnabledCfg: rCfg.Enabled,
utils.IndexedSelectsCfg: rCfg.IndexedSelects,
utils.StringIndexedFieldsCfg: stringIndexedFields,
utils.PrefixIndexedFieldsCfg: prefixIndexedFields,
utils.NestedFieldsCfg: rCfg.NestedFields,
utils.RateIndexedSelectsCfg: rCfg.RateIndexedSelects,
utils.RateStringIndexedFieldsCfg: rateStringIndexedFields,
utils.RatePrefixIndexedFieldsCfg: ratePrefixIndexedFields,
utils.RateNestedFieldsCfg: rCfg.RateNestedFields,
}
}

14
rates/rates.go
View File

@@ -83,8 +83,8 @@ func (rS *RateS) matchingRateProfileForEvent(args *ArgsCostForEvent) (rtPfl *eng
rS.dm,
utils.CacheRateProfilesFilterIndexes,
args.CGREvent.Tenant,
rS.cfg.RouteSCfg().IndexedSelects,
rS.cfg.RouteSCfg().NestedFields,
rS.cfg.RateSCfg().IndexedSelects,
rS.cfg.RateSCfg().NestedFields,
); err != nil {
return
}
@@ -129,13 +129,13 @@ func (rS *RateS) matchingRatesForEvent(rtPfl *engine.RateProfile, cgrEv *utils.C
var rtIDs utils.StringMap
if rtIDs, err = engine.MatchingItemIDsForEvent(
cgrEv.Event,
rS.cfg.RateSCfg().StringIndexedFields,
rS.cfg.RateSCfg().PrefixIndexedFields,
rS.cfg.RateSCfg().RateStringIndexedFields,
rS.cfg.RateSCfg().RatePrefixIndexedFields,
rS.dm,
utils.CacheRateProfilesFilterIndexes,
utils.CacheRateFilterIndexes,
cgrEv.Tenant,
rS.cfg.RouteSCfg().IndexedSelects,
rS.cfg.RouteSCfg().NestedFields,
rS.cfg.RateSCfg().RateIndexedSelects,
rS.cfg.RateSCfg().RateNestedFields,
); err != nil {
return
}

6
utils/consts.go
View File

@@ -1971,6 +1971,12 @@ const (
TransportCfg = "transport"
StrategyCfg = "strategy"
Dynaprepaid_actionplansCfg = "dynaprepaid_actionplans"
//RateSCfg
RateIndexedSelectsCfg = "rate_indexed_selects"
RateNestedFieldsCfg = "rate_nested_fields"
RateStringIndexedFieldsCfg = "rate_string_indexed_fields"
RatePrefixIndexedFieldsCfg = "rate_prefix_indexed_fields"
)
// FC Template