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

Optimized matchingItemIDsForEvent

Browse Source
This commit is contained in:
DanB
2018-01-23 19:16:24 +01:00
parent 8df8f85afc
commit bb2ea2ddcf
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/attributes_test.go
View File

@@ -122,6 +122,7 @@ func testPopulateAttrService(t *testing.T) {
dm: dmAtr,
filterS: &FilterS{dm: dmAtr},
stringIndexedFields: utils.StringSlicePointer([]string{"attributeprofile1", "attributeprofile2"}),
//prefixIndexedFields: &[]string{},
}
sev = &utils.CGREvent{
Tenant: "cgrates.org",

39
engine/reqfilterhelpers.go → engine/filterhelpers.go
View File

@@ -36,23 +36,32 @@ func matchingItemIDsForEvent(ev map[string]interface{}, stringFldIDs, prefixFldI
allFieldIDs[i] = fldID
i += 1
}
filterIndexTypes := []string{MetaString, MetaPrefix}
for i, fieldIDs := range []*[]string{stringFldIDs, prefixFldIDs} { // same routine for both string and prefix filter types
stringFieldVals := map[string]string{utils.ANY: utils.ANY} // cache here field string values, start with default one
filterIndexTypes := []string{MetaString, MetaPrefix, utils.MetaDefault}
for i, fieldIDs := range []*[]string{stringFldIDs, prefixFldIDs, nil} { // same routine for both string and prefix filter types
if filterIndexTypes[i] == utils.MetaDefault {
fieldIDs = &[]string{utils.ANY} // so we can query DB for unindexed filters
}
if fieldIDs == nil {
fieldIDs = &allFieldIDs
}
for _, fldName := range *fieldIDs {
fieldValIf, has := ev[fldName]
if !has {
if !has && filterIndexTypes[i] != utils.MetaDefault {
continue
}
fldVal, canCast := utils.CastFieldIfToString(fieldValIf)
if !canCast {
utils.Logger.Warning(
fmt.Sprintf("<%s> cannot cast field: %s into string", utils.FilterS, fldName))
continue
if _, cached := stringFieldVals[fldName]; !cached {
strVal, canCast := utils.CastFieldIfToString(fieldValIf)
if !canCast {
utils.Logger.Warning(
fmt.Sprintf("<%s> cannot cast field: %s into string", utils.FilterS, fldName))
continue
}
stringFieldVals[fldName] = strVal
}
fldVals := []string{fldVal} // default is only one fieldValue checked
fldVal := stringFieldVals[fldName]
fldVals := []string{fldVal}
// default is only one fieldValue checked
if filterIndexTypes[i] == MetaPrefix {
fldVals = utils.SplitPrefix(fldVal, 1) // all prefixes till last digit
}
@@ -74,17 +83,5 @@ func matchingItemIDsForEvent(ev map[string]interface{}, stringFldIDs, prefixFldI
}
}
}
dbItemIDs, err := dm.MatchFilterIndex(dbIdxKey, utils.MetaDefault, utils.ANY, utils.ANY) // add unindexed itemIDs to be checked
if err != nil {
if err != utils.ErrNotFound {
return nil, err
}
err = nil // not found is ignored
}
for itemID := range dbItemIDs {
if _, hasIt := itemIDs[itemID]; !hasIt {
itemIDs[itemID] = dbItemIDs[itemID]
}
}
return
}