adding merge test

Signed-off-by: alanprot <[email protected]>

Author: alanprot

pkg/querier/querier.go

@@ -348,7 +348,7 @@ func (q querier) Select(ctx context.Context, sortSeries bool, sp *storage.Select
 	}
 	startT := time.Now()
 	defer func() {
-		stats.AddNotOptimizedRegexMatchers(notOptimizedRegexMatchersCount(matchers))
+		stats.StoreNotOptimizedRegexMatchers(notOptimizedRegexMatchersCount(matchers))
 		stats.AddQueryStorageWallTime(time.Since(startT))
 	}()
 

pkg/querier/stats/stats.go

@@ -221,18 +221,20 @@ func (s *QueryStats) AddQueryStorageWallTime(t time.Duration) {
 	atomic.AddInt64((*int64)(&s.QueryStorageWallTime), int64(t))
 }
 
-func (s *QueryStats) AddNotOptimizedRegexMatchers(count uint64) {
+func (s *QueryStats) StoreNotOptimizedRegexMatchers(count uint64) {
 	if s == nil {
 		return
 	}
-	atomic.AddUint64(&s.NotOptimizedRegexCount, count)
+
+	// For this stats we get the MAX, instead of adding the counts
+	// as for split queries we will call this method multiples times.
+	atomic.StoreUint64(&s.NotOptimizedRegexCount, max(count, s.LoadNotOptimizedRegexMatchers()))
 }
 
 func (s *QueryStats) LoadNotOptimizedRegexMatchers() uint64 {
 	if s == nil {
 		return 0
 	}
-
 	return atomic.LoadUint64(&s.NotOptimizedRegexCount)
 }
 
@@ -405,7 +407,7 @@ func (s *QueryStats) Merge(other *QueryStats) {
 	s.AddFetchedChunkBytes(other.LoadFetchedChunkBytes())
 	s.AddFetchedDataBytes(other.LoadFetchedDataBytes())
 	s.AddFetchedSamples(other.LoadFetchedSamples())
-	s.AddNotOptimizedRegexMatchers(other.LoadNotOptimizedRegexMatchers())
+	s.StoreNotOptimizedRegexMatchers(other.LoadNotOptimizedRegexMatchers())
 	s.AddFetchedChunks(other.LoadFetchedChunks())
 	s.AddStoreGatewayTouchedPostings(other.LoadStoreGatewayTouchedPostings())
 	s.AddStoreGatewayTouchedPostingBytes(other.LoadStoreGatewayTouchedPostingBytes())

pkg/querier/stats/stats_test.go

@@ -221,6 +221,7 @@ func TestStats_Merge(t *testing.T) {
 		stats1.AddFetchedSamples(109)
 		stats1.AddScannedSamples(100)
 		stats1.AddPeakSamples(100)
+		stats1.StoreNotOptimizedRegexMatchers(2)
 		stats1.AddExtraFields("a", "b")
 		stats1.AddExtraFields("a", "b")
 
@@ -234,6 +235,7 @@ func TestStats_Merge(t *testing.T) {
 		stats1.AddStoreGatewayTouchedPostingBytes(301)
 		stats2.AddFetchedChunks(102)
 		stats2.AddFetchedSamples(103)
+		stats2.StoreNotOptimizedRegexMatchers(3)
 		stats2.AddPeakSamples(105)
 		stats2.AddScannedSamples(105)
 		stats2.AddExtraFields("c", "d")
@@ -251,6 +253,7 @@ func TestStats_Merge(t *testing.T) {
 		assert.Equal(t, uint64(105), stats1.LoadPeakSamples())
 		assert.Equal(t, uint64(401), stats1.LoadStoreGatewayTouchedPostings())
 		assert.Equal(t, uint64(601), stats1.LoadStoreGatewayTouchedPostingBytes())
+		assert.Equal(t, uint64(3), stats1.LoadNotOptimizedRegexMatchers())
 		checkExtraFields(t, []interface{}{"a", "b", "c", "d"}, stats1.LoadExtraFields())
 	})