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

Slightly optimize debit for balances with non-nil Factor

Browse Source 
Factor will be computed only once at the start of the function, instead
of doing it on every Increments iteration.

'amount' variable will be updated and rounded only when the computed
balances factor is different from its default value (1).
This commit is contained in:
ionutboangiu
2024-03-27 14:08:04 +02:00
committed by Dan Christian Bogos
parent bd4aa99458
commit cc72aa92d9
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/balances.go
View File

@@ -786,6 +786,9 @@ func (bc Balances) SaveDirtyBalances(acc *Account, initBal map[string]float64) {
type ValueFactors map[string]float64
func (f ValueFactors) GetValue(category string) float64 {
if f == nil {
return 1.0
}
if value, ok := f[category]; ok {
return value
}
@@ -859,6 +862,11 @@ func (b *Balance) debit(cd *CallDescriptor, ub *Account, moneyBalances Balances,
if !isUnitBal {
tor = utils.MetaMonetary
}
// Compute the balance factor ahead of time. If the map is nil, or
// the factor is not found, it will default to 1.
bFactor := b.Factor.GetValue(cd.ExtraFields[utils.BalanceFactorID])
if duration, err_ := utils.ParseZeroRatingSubject(tor, b.RatingSubject,
config.CgrConfig().RalsCfg().BalanceRatingSubject, isUnitBal); err_ == nil {
// we have *zero based units
@@ -899,10 +907,8 @@ func (b *Balance) debit(cd *CallDescriptor, ub *Account, moneyBalances Balances,
for incIndex, inc := range ts.Increments {
//log.Printf("INCREMENET: %+v", inc)
amount := float64(inc.Duration)
if b.Factors != nil {
amount = utils.Round(
amount*b.Factors.GetValue(cd.ExtraFields[utils.BalanceFactorID]),
globalRoundingDecimals, utils.MetaRoundingUp)
if bFactor != 1 {
amount = utils.Round(amount*bFactor, globalRoundingDecimals, utils.MetaRoundingUp)
}
if b.GetValue() >= amount {
b.SubtractValue(amount)
@@ -1044,10 +1050,8 @@ func (b *Balance) debit(cd *CallDescriptor, ub *Account, moneyBalances Balances,
canDebitCost := b.GetValue() >= cost
var moneyBal *Balance
if isUnitBal {
if b.Factors != nil {
amount = utils.Round(
amount*b.Factors.GetValue(cd.ExtraFields[utils.BalanceFactorID]),
globalRoundingDecimals, utils.MetaRoundingUp)
if bFactor != 1 {
amount = utils.Round(amount*bFactor, globalRoundingDecimals, utils.MetaRoundingUp)
}
for _, mb := range moneyBalances {
if mb.GetValue() >= cost {