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

moved trend compressing in datamanager

Browse Source
This commit is contained in:
gezimbll
2024-10-14 16:30:03 +02:00
committed by Dan Christian Bogos
parent 51e376d59b
commit d50114fcbc
4 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/datamanager.go
View File

@@ -1323,15 +1323,8 @@ func (dm *DataManager) GetTrend(tenant, id string,
if err != utils.ErrNotFound { // RPC error
return
}
} else {
if dm.dataDB.GetStorageType() != utils.MetaInternal {
if err = tr.compress(dm.ms); err != nil {
return
}
}
if err = dm.dataDB.SetTrendDrv(tr); err != nil {
return
}
} else if err = dm.dataDB.SetTrendDrv(tr); err != nil {
return
}
}
// have Trend or ErrNotFound
@@ -1345,6 +1338,9 @@ func (dm *DataManager) GetTrend(tenant, id string,
return
}
}
if err := tr.uncompress(dm.ms); err != nil {
return nil, err
}
if cacheWrite {
if errCh := Cache.Set(utils.CacheTrends, tntID, tr, nil,
cacheCommit(transactionID), transactionID); errCh != nil {

6
engine/libtrends.go
View File

@@ -123,8 +123,7 @@ func (t *Trend) Clone() (tC *Trend) {
}
func (t *Trend) compress(ms Marshaler) (err error) {
maxRL := config.CgrConfig().TrendSCfg().StoreUncompressedLimit
if maxRL > 0 && maxRL > len(t.RunTimes) {
if config.CgrConfig().TrendSCfg().StoreUncompressedLimit > len(t.RunTimes) {
return
}
t.CompressedMetrics, err = ms.Marshal(t.Metrics)
@@ -137,8 +136,7 @@ func (t *Trend) compress(ms Marshaler) (err error) {
}
func (t *Trend) uncompress(ms Marshaler) (err error) {
maxL := config.CgrConfig().TrendSCfg().StoreUncompressedLimit
if t == nil || (maxL > 0 && t.RunTimes != nil) {
if t == nil || t.RunTimes != nil {
return
}
err = ms.Unmarshal(t.CompressedMetrics, &t.Metrics)

9
engine/storage_mongo_datadb.go
View File

@@ -1612,13 +1612,8 @@ func (ms *MongoStorage) GetTrendDrv(tenant, id string) (*Trend, error) {
}
return decodeErr
})
if err != nil {
return nil, err
}
if err = tr.uncompress(ms.ms); err != nil {
return nil, err
}
return tr, nil
return tr, err
}
func (ms *MongoStorage) SetTrendDrv(tr *Trend) error {

9
engine/storage_redis.go
View File

@@ -971,13 +971,8 @@ func (rs *RedisStorage) GetTrendDrv(tenant, id string) (tr *Trend, err error) {
err = utils.ErrNotFound
return
}
if err = rs.ms.Unmarshal(values, &tr); err != nil {
return
}
if err = tr.uncompress(rs.ms); err != nil {
return nil, err
}
return tr, nil
err = rs.ms.Unmarshal(values, &tr)
return tr, err
}
func (rs *RedisStorage) SetTrendDrv(r *Trend) (err error) {