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

refactor profile sorting for routes

Browse Source
This commit is contained in:
ionutboangiu
2025-03-24 16:29:20 +02:00
committed by Dan Christian Bogos
parent b00b2f07ae
commit 4244ba2cdf
3 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/libroutes.go
View File

@@ -271,20 +271,6 @@ func (sRs SortedRoutesList) AsNavigableMap() (nm *utils.DataNode) {
return
}
// RouteProfileWithWeight attaches static weight to RouteProfile
type RouteProfileWithWeight struct {
*RouteProfile
Weight float64
}
// RouteProfiles is a sortable list of RouteProfile
type RouteProfilesWithWeight []*RouteProfileWithWeight
// Sort is part of sort interface, sort based on Weight
func (lps RouteProfilesWithWeight) Sort() {
sort.Slice(lps, func(i, j int) bool { return lps[i].Weight > lps[j].Weight })
}
// routeLazyPass filters the route based on
func routeLazyPass(ctx *context.Context, filters []*FilterRule, ev *utils.CGREvent, data utils.MapStorage,
resConns, statConns, acntConns, trdConns, rnkConns []string) (pass bool, err error) {

35
engine/routes.go
View File

@@ -19,7 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package engine
import (
"cmp"
"fmt"
"slices"
"strconv"
"strings"
@@ -132,7 +134,7 @@ type RouteS struct {
}
// matchingRouteProfilesForEvent returns ordered list of matching resources which are active by the time of the call
func (rpS *RouteS) matchingRouteProfilesForEvent(ctx *context.Context, tnt string, ev *utils.CGREvent) (matchingRPrf RouteProfilesWithWeight, err error) {
func (rpS *RouteS) matchingRouteProfilesForEvent(ctx *context.Context, tnt string, ev *utils.CGREvent) (matchingRPrf []*RouteProfile, err error) {
evNm := utils.MapStorage{
utils.MetaReq: ev.Event,
utils.MetaOpts: ev.APIOpts,
@@ -150,7 +152,8 @@ func (rpS *RouteS) matchingRouteProfilesForEvent(ctx *context.Context, tnt strin
if err != nil {
return nil, err
}
matchingRPrf = make(RouteProfilesWithWeight, 0, len(rPrfIDs))
matchingRPrf = make([]*RouteProfile, 0, len(rPrfIDs))
weights := make(map[string]float64) // stores sorting weights by profile ID
for lpID := range rPrfIDs {
var rPrf *RouteProfile
if rPrf, err = rpS.dm.GetRouteProfile(ctx, tnt, lpID, true, true, utils.NonTransactional); err != nil {
@@ -166,17 +169,22 @@ func (rpS *RouteS) matchingRouteProfilesForEvent(ctx *context.Context, tnt strin
} else if !pass {
continue
}
var weight float64
if weight, err = WeightFromDynamics(ctx, rPrf.Weights,
rpS.fltrS, ev.Tenant, evNm); err != nil {
return
weight, err := WeightFromDynamics(ctx, rPrf.Weights, rpS.fltrS, ev.Tenant, evNm)
if err != nil {
return nil, err
}
matchingRPrf = append(matchingRPrf, &RouteProfileWithWeight{RouteProfile: rPrf, Weight: weight})
weights[rPrf.ID] = weight
matchingRPrf = append(matchingRPrf, rPrf)
}
if len(matchingRPrf) == 0 {
return nil, utils.ErrNotFound
}
matchingRPrf.Sort()
// Sort by weight (higher values first).
slices.SortFunc(matchingRPrf, func(a, b *RouteProfile) int {
return cmp.Compare(weights[b.ID], weights[a.ID])
})
for i, rp := range matchingRPrf {
var blocker bool
if blocker, err = BlockerFromDynamics(ctx, rp.Blockers, rpS.fltrS, ev.Tenant, evNm); err != nil {
@@ -324,10 +332,7 @@ func (rpS *RouteS) V1GetRouteProfilesForEvent(ctx *context.Context, args *utils.
}
return err
}
*reply = make([]*RouteProfile, len(sPs))
for i, sP := range sPs {
(*reply)[i] = sP.RouteProfile
}
*reply = sPs
return
}
@@ -403,8 +408,8 @@ func (rpS *RouteS) sortedRoutesForProfile(ctx *context.Context, tnt string, rPrf
// sortedRoutesForEvent will return the list of sortedRoutes
// for event based on filters and sorting algorithms
func (rpS *RouteS) sortedRoutesForEvent(ctx *context.Context, tnt string, args *utils.CGREvent) (sortedRoutes SortedRoutesList, err error) {
var rPrfs RouteProfilesWithWeight
if rPrfs, err = rpS.matchingRouteProfilesForEvent(ctx, tnt, args); err != nil {
rPrfs, err := rpS.matchingRouteProfilesForEvent(ctx, tnt, args)
if err != nil {
return
}
prfCount := len(rPrfs) // if the option is not present return for all profiles
@@ -455,7 +460,7 @@ func (rpS *RouteS) sortedRoutesForEvent(ctx *context.Context, tnt string, args *
prfPag.Offset = &offset
}
var sr *SortedRoutes
if sr, err = rpS.sortedRoutesForProfile(ctx, tnt, rPrfl.RouteProfile, args, prfPag, extraOpts); err != nil {
if sr, err = rpS.sortedRoutesForProfile(ctx, tnt, rPrfl, args, prfPag, extraOpts); err != nil {
return
}
if len(sr.Routes) != 0 {

8
engine/routes_test.go
View File

@@ -240,8 +240,8 @@ func TestRoutesmatchingRouteProfilesForEvent(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(spp, sprf[0].RouteProfile) {
t.Errorf("Expecting: %+v, received: %+v", spp, sprf[0].RouteProfile)
if !reflect.DeepEqual(spp, sprf[0]) {
t.Errorf("Expecting: %+v, received: %+v", spp, sprf[0])
}
}
}
@@ -552,8 +552,8 @@ func TestRoutesMatchWithIndexFalse(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(spp, sprf[0].RouteProfile) {
t.Errorf("Expecting: %+v, received: %+v", spp, sprf[0].RouteProfile)
if !reflect.DeepEqual(spp, sprf[0]) {
t.Errorf("Expecting: %+v, received: %+v", spp, sprf[0])
}
}
}