Removed MinItems from StatQueue

engine/libstats.go

@@ -74,7 +74,6 @@ func NewStoredStatQueue(sq *StatQueue, ms Marshaler) (sSQ *StoredStatQueue, err
 			config.CgrConfig().GeneralCfg().RoundingDecimals),
 		SQItems:   make([]SQItem, len(sq.SQItems)),
 		SQMetrics: make(map[string][]byte, len(sq.SQMetrics)),
-		MinItems:  sq.MinItems,
 	}
 	for i, sqItm := range sq.SQItems {
 		sSQ.SQItems[i] = sqItm
@@ -95,7 +94,6 @@ type StoredStatQueue struct {
 	ID         string
 	SQItems    []SQItem
 	SQMetrics  map[string][]byte
-	MinItems   int
 	Compressed bool
 }
 
@@ -119,13 +117,12 @@ func (ssq *StoredStatQueue) AsStatQueue(ms Marshaler) (sq *StatQueue, err error)
 		ID:        ssq.ID,
 		SQItems:   make([]SQItem, len(ssq.SQItems)),
 		SQMetrics: make(map[string]StatMetric, len(ssq.SQMetrics)),
-		MinItems:  ssq.MinItems,
 	}
 	for i, sqItm := range ssq.SQItems {
 		sq.SQItems[i] = sqItm
 	}
 	for metricID, marshaled := range ssq.SQMetrics {
-		if metric, err := NewStatMetric(metricID, ssq.MinItems, []string{}); err != nil {
+		if metric, err := NewStatMetric(metricID, 0, []string{}); err != nil {
 			return nil, err
 		} else if err := metric.LoadMarshaled(ms, marshaled); err != nil {
 			return nil, err
@@ -151,7 +148,6 @@ type StatQueue struct {
 	ID        string
 	SQItems   []SQItem
 	SQMetrics map[string]StatMetric
-	MinItems  int
 	sqPrfl    *StatQueueProfile
 	dirty     *bool          // needs save
 	ttl       *time.Duration // timeToLeave, picked on each init

engine/stats.go

@@ -526,6 +526,8 @@ func (sS *StatService) V1ResetStatQueue(tntID *utils.TenantID, rply *string) (er
 		true, false, utils.NonTransactional); err != nil {
 		return
 	}
+	sq.Lock()
+	defer sq.Unlock()
 	sq.SQItems = make([]SQItem, 0)
 	metrics := sq.SQMetrics
 	sq.SQMetrics = make(map[string]StatMetric)

migrator/stats.go

@@ -147,11 +147,9 @@ func remakeQueue(sq *engine.StatQueue) (out *engine.StatQueue) {
 		ID:        sq.ID,
 		SQItems:   sq.SQItems,
 		SQMetrics: make(map[string]engine.StatMetric),
-		MinItems:  sq.MinItems,
 	}
 	for mID, metric := range sq.SQMetrics {
-		id := utils.ConcatenatedKey(utils.SplitConcatenatedKey(mID)...)
-		out.SQMetrics[id] = metric
+		out.SQMetrics[mID] = metric
 	}
 	return
 }

migrator/stats_it_test.go

@@ -464,8 +464,6 @@ func testStsITMigrateFromv1(t *testing.T) {
 	var statQueue *engine.StatQueue
 	if statQueue, err = stsMigrator.dmOut.DataManager().GetStatQueue("cgrates.org", "test", false, false, utils.NonTransactional); err != nil {
 		t.Error(err)
-	} else if statQueue.MinItems != 0 {
-		t.Errorf("Expecting: '0', received: %+v", statQueue.MinItems)
 	} else if statQueue.ID != "test" {
 		t.Errorf("Expecting: 'test', received: %+v", statQueue.ID)
 	} else if statQueue.Tenant != "cgrates.org" {

migrator/stats_test.go

@@ -162,7 +162,6 @@ func TestRemakeQueue(t *testing.T) {
 			"*sum#~*req.Usage":    nil,
 			"*average#~*req.Cost": nil,
 		},
-		MinItems: 2,
 	}
 	expected := &engine.StatQueue{
 		Tenant:  sq.Tenant,
@@ -173,7 +172,6 @@ func TestRemakeQueue(t *testing.T) {
 			"*sum#~*req.Usage":    nil,
 			"*average#~*req.Cost": nil,
 		},
-		MinItems: sq.MinItems,
 	}
 
 	if rply := remakeQueue(sq); !reflect.DeepEqual(expected, rply) {