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

Added exists/notExists indexed on necessary subsystems

Browse Source
This commit is contained in:
porosnicuadrian
2022-01-17 12:48:38 +02:00
committed by Dan Christian Bogos
parent f1c2c66309
commit a7d4348b43
12 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/accounts.go
View File

@@ -78,6 +78,8 @@ func (aS *AccountS) matchingAccountsForEvent(ctx *context.Context, tnt string, c
aS.cfg.AccountSCfg().StringIndexedFields,
aS.cfg.AccountSCfg().PrefixIndexedFields,
aS.cfg.AccountSCfg().SuffixIndexedFields,
aS.cfg.AccountSCfg().ExistsIndexedFields,
aS.cfg.AccountSCfg().NotExistsIndexedFields,
aS.dm,
utils.CacheAccountsFilterIndexes,
tnt,

2
actions/actions.go
View File

@@ -154,6 +154,8 @@ func (aS *ActionS) matchingActionProfilesForEvent(ctx *context.Context, tnt stri
aS.cfg.ActionSCfg().StringIndexedFields,
aS.cfg.ActionSCfg().PrefixIndexedFields,
aS.cfg.ActionSCfg().SuffixIndexedFields,
aS.cfg.ActionSCfg().ExistsIndexedFields,
aS.cfg.ActionSCfg().NotExistsIndexedFields,
aS.dm,
utils.CacheActionProfilesFilterIndexes,
tnt,

2
dispatchers/dispatchers.go
View File

@@ -107,6 +107,8 @@ func (dS *DispatcherService) dispatcherProfilesForEvent(ctx *context.Context, tn
dS.cfg.DispatcherSCfg().StringIndexedFields,
dS.cfg.DispatcherSCfg().PrefixIndexedFields,
dS.cfg.DispatcherSCfg().SuffixIndexedFields,
dS.cfg.DispatcherSCfg().ExistsIndexedFields,
dS.cfg.DispatcherSCfg().NotExistsIndexedFields,
dS.dm, utils.CacheDispatcherFilterIndexes, tnt,
dS.cfg.DispatcherSCfg().IndexedSelects,
dS.cfg.DispatcherSCfg().NestedFields,

2
engine/attributes.go
View File

@@ -63,6 +63,8 @@ func (alS *AttributeS) attributeProfileForEvent(ctx *context.Context, tnt string
alS.cfg.AttributeSCfg().StringIndexedFields,
alS.cfg.AttributeSCfg().PrefixIndexedFields,
alS.cfg.AttributeSCfg().SuffixIndexedFields,
alS.cfg.AccountSCfg().ExistsIndexedFields,
alS.cfg.AccountSCfg().NotExistsIndexedFields,
alS.dm, utils.CacheAttributeFilterIndexes, tnt,
alS.cfg.AttributeSCfg().IndexedSelects,
alS.cfg.AttributeSCfg().NestedFields,

2
engine/chargers.go
View File

@@ -56,6 +56,8 @@ func (cS *ChargerS) matchingChargerProfilesForEvent(ctx *context.Context, tnt st
cS.cfg.ChargerSCfg().StringIndexedFields,
cS.cfg.ChargerSCfg().PrefixIndexedFields,
cS.cfg.ChargerSCfg().SuffixIndexedFields,
cS.cfg.ChargerSCfg().ExistsIndexedFields,
cS.cfg.ChargerSCfg().NotExistsIndexedFields,
cS.dm, utils.CacheChargerFilterIndexes, tnt,
cS.cfg.ChargerSCfg().IndexedSelects,
cS.cfg.ChargerSCfg().NestedFields,

10
engine/filterhelpers.go
View File

@@ -28,11 +28,11 @@ import (
// MatchingItemIDsForEvent returns the list of item IDs matching fieldName/fieldValue for an event
// fieldIDs limits the fields which are checked against indexes
// helper on top of dataDB.GetIndexes, adding utils.MetaAny to list of fields queried
func MatchingItemIDsForEvent(ctx *context.Context, ev utils.MapStorage, stringFldIDs, prefixFldIDs, suffixFldIDs *[]string,
func MatchingItemIDsForEvent(ctx *context.Context, ev utils.MapStorage, stringFldIDs, prefixFldIDs, suffixFldIDs, existsFldIDs, notExistsFldIDs *[]string,
dm *DataManager, cacheID, itemIDPrefix string, indexedSelects, nestedFields bool) (itemIDs utils.StringSet, err error) {
itemIDs = make(utils.StringSet)
var allFieldIDs []string
if indexedSelects && (stringFldIDs == nil || prefixFldIDs == nil || suffixFldIDs == nil) {
if indexedSelects && (stringFldIDs == nil || prefixFldIDs == nil || suffixFldIDs == nil || existsFldIDs == nil || notExistsFldIDs == nil) {
allFieldIDs = ev.GetKeys(nestedFields, 2, utils.EmptyString)
}
// Guard will protect the function with automatic locking
@@ -50,9 +50,9 @@ func MatchingItemIDsForEvent(ctx *context.Context, ev utils.MapStorage, stringFl
itemIDs = utils.NewStringSet(sliceIDs)
return
}
stringFieldVals := map[string]string{utils.MetaAny: utils.MetaAny} // cache here field string values, start with default one
filterIndexTypes := []string{utils.MetaString, utils.MetaPrefix, utils.MetaSuffix, utils.MetaNone} // the MetaNone is used for all items that do not have filters
for i, fieldIDs := range []*[]string{stringFldIDs, prefixFldIDs, suffixFldIDs, {utils.MetaAny}} { // same routine for both string and prefix filter types
stringFieldVals := map[string]string{utils.MetaAny: utils.MetaAny} // cache here field string values, start with default one
filterIndexTypes := []string{utils.MetaString, utils.MetaPrefix, utils.MetaSuffix, utils.MetaExists, utils.MetaNotExists, utils.MetaNone} // the MetaNone is used for all items that do not have filters
for i, fieldIDs := range []*[]string{stringFldIDs, prefixFldIDs, suffixFldIDs, existsFldIDs, notExistsFldIDs, {utils.MetaAny}} { // same routine for both string and prefix filter types
if fieldIDs == nil {
fieldIDs = &allFieldIDs
}

2
engine/resources.go
View File

@@ -581,6 +581,8 @@ func (rS *ResourceS) matchingResourcesForEvent(ctx *context.Context, tnt string,
rS.cfg.ResourceSCfg().StringIndexedFields,
rS.cfg.ResourceSCfg().PrefixIndexedFields,
rS.cfg.ResourceSCfg().SuffixIndexedFields,
rS.cfg.ResourceSCfg().ExistsIndexedFields,
rS.cfg.ResourceSCfg().NotExistsIndexedFields,
rS.dm, utils.CacheResourceFilterIndexes, tnt,
rS.cfg.ResourceSCfg().IndexedSelects,
rS.cfg.ResourceSCfg().NestedFields,

2
engine/routes.go
View File

@@ -146,6 +146,8 @@ func (rpS *RouteS) matchingRouteProfilesForEvent(ctx *context.Context, tnt strin
rpS.cfg.RouteSCfg().StringIndexedFields,
rpS.cfg.RouteSCfg().PrefixIndexedFields,
rpS.cfg.RouteSCfg().SuffixIndexedFields,
rpS.cfg.RouteSCfg().ExistsIndexedFields,
rpS.cfg.RouteSCfg().NotExistsIndexedFields,
rpS.dm, utils.CacheRouteFilterIndexes, tnt,
rpS.cfg.RouteSCfg().IndexedSelects,
rpS.cfg.RouteSCfg().NestedFields,

2
engine/stats.go
View File

@@ -165,6 +165,8 @@ func (sS *StatS) matchingStatQueuesForEvent(ctx *context.Context, tnt string, st
sS.cfg.StatSCfg().StringIndexedFields,
sS.cfg.StatSCfg().PrefixIndexedFields,
sS.cfg.StatSCfg().SuffixIndexedFields,
sS.cfg.StatSCfg().ExistsIndexedFields,
sS.cfg.StatSCfg().NotExistsIndexedFields,
sS.dm, utils.CacheStatFilterIndexes, tnt,
sS.cfg.StatSCfg().IndexedSelects,
sS.cfg.StatSCfg().NestedFields,

2
engine/thresholds.go
View File

@@ -347,6 +347,8 @@ func (tS *ThresholdS) matchingThresholdsForEvent(ctx *context.Context, tnt strin
tS.cfg.ThresholdSCfg().StringIndexedFields,
tS.cfg.ThresholdSCfg().PrefixIndexedFields,
tS.cfg.ThresholdSCfg().SuffixIndexedFields,
tS.cfg.ThresholdSCfg().ExistsIndexedFields,
tS.cfg.ThresholdSCfg().NotExistsIndexedFields,
tS.dm, utils.CacheThresholdFilterIndexes, tnt,
tS.cfg.ThresholdSCfg().IndexedSelects,
tS.cfg.ThresholdSCfg().NestedFields,

10
engine/z_filterhelpers_test.go
View File

@@ -101,7 +101,7 @@ func TestFilterMatchingItemIDsForEvent(t *testing.T) {
utils.AnswerTime: time.Date(2014, 7, 14, 14, 30, 0, 0, time.UTC),
"Field": "profile",
}}
aPrflIDs, err := MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil,
aPrflIDs, err := MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil, nil, nil,
dmMatch, utils.CacheAttributeFilterIndexes, tntCtx, true, false)
if err != nil {
t.Errorf("Error: %+v", err)
@@ -114,7 +114,7 @@ func TestFilterMatchingItemIDsForEvent(t *testing.T) {
matchEV = utils.MapStorage{utils.MetaReq: map[string]interface{}{
"Field": "profilePrefix",
}}
aPrflIDs, err = MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil,
aPrflIDs, err = MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil, nil, nil,
dmMatch, utils.CacheAttributeFilterIndexes, tntCtx, true, false)
if err != nil {
t.Errorf("Error: %+v", err)
@@ -127,7 +127,7 @@ func TestFilterMatchingItemIDsForEvent(t *testing.T) {
matchEV = utils.MapStorage{utils.MetaReq: map[string]interface{}{
"Field": "profilePrefix",
}}
aPrflIDs, err = MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil,
aPrflIDs, err = MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil, nil, nil,
dmMatch, utils.CacheAttributeFilterIndexes, tntCtx, true, false)
if err != nil {
t.Errorf("Error: %+v", err)
@@ -194,7 +194,7 @@ func TestFilterMatchingItemIDsForEvent2(t *testing.T) {
utils.AnswerTime: time.Date(2014, 7, 14, 14, 30, 0, 0, time.UTC),
"CallCost": map[string]interface{}{"Account": 1001},
}}
aPrflIDs, err := MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil,
aPrflIDs, err := MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil, nil, nil,
dmMatch, utils.CacheAttributeFilterIndexes, tntCtx, true, true)
if err != nil {
t.Errorf("Error: %+v", err)
@@ -206,7 +206,7 @@ func TestFilterMatchingItemIDsForEvent2(t *testing.T) {
matchEV = utils.MapStorage{utils.MetaReq: map[string]interface{}{
"CallCost": map[string]interface{}{"Field": "profilePrefix"},
}}
aPrflIDs, err = MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil,
aPrflIDs, err = MatchingItemIDsForEvent(context.TODO(), matchEV, nil, nil, nil, nil, nil,
dmMatch, utils.CacheAttributeFilterIndexes, tntCtx, true, true)
if err != nil {
t.Errorf("Error: %+v", err)

4
rates/rates.go
View File

@@ -80,6 +80,8 @@ func (rS *RateS) matchingRateProfileForEvent(ctx *context.Context, tnt string, r
rS.cfg.RateSCfg().StringIndexedFields,
rS.cfg.RateSCfg().PrefixIndexedFields,
rS.cfg.RateSCfg().SuffixIndexedFields,
rS.cfg.RateSCfg().ExistsIndexedFields,
rS.cfg.RateSCfg().NotExistsIndexedFields,
rS.dm,
utils.CacheRateProfilesFilterIndexes,
tnt,
@@ -138,6 +140,8 @@ func (rS *RateS) rateProfileCostForEvent(ctx *context.Context, rtPfl *utils.Rate
rS.cfg.RateSCfg().RateStringIndexedFields,
rS.cfg.RateSCfg().RatePrefixIndexedFields,
rS.cfg.RateSCfg().RateSuffixIndexedFields,
rS.cfg.RateSCfg().RateExistsIndexedFields,
rS.cfg.RateSCfg().RateNotExistsIndexedFields,
rS.dm,
utils.CacheRateFilterIndexes,
utils.ConcatenatedKey(args.Tenant, rtPfl.ID),