Add test bacj

Signed-off-by: Alan Protasio <[email protected]>

Author: alanprot

pkg/querier/batch/batch.go

@@ -101,9 +101,10 @@ func (a *iteratorAdapter) Seek(t int64) bool {
 			}
 			return true
 		} else {
-			// In this case, t is after the end of the current batch. Here we try to calculate if we are seeking to samples
-			// in the same chunks, and if so, we foward the iterator to the right point in time - we do that this
-			// is more efficient than the seek call
+			// In this case, t is after the end of the current batch.
+			// Here we assume that the scrape interval is 30s and try to calculate how many samples ahead we are trying to seek.
+			// If the number of samples is < 60 (each chunk has 120 samples) we assume that the samples belongs to the current
+			// chunk and we forward the iterator to the right point - this is more efficient than the seek call.
 			approxNumberOfSamples := model.Time(t).Sub(model.Time(a.curr.Timestamps[a.curr.Length-1])) / (30 * time.Second)
 			if approxNumberOfSamples < 60 {
 				for a.underlying.Next(promchunk.BatchSize) {

pkg/querier/batch/batch_test.go

@@ -13,47 +13,47 @@ import (
 	promchunk "github.com/cortexproject/cortex/pkg/chunk/encoding"
 )
 
-//func BenchmarkNewChunkMergeIterator_CreateAndIterate(b *testing.B) {
-//	scenarios := []struct {
-//		numChunks          int
-//		numSamplesPerChunk int
-//		duplicationFactor  int
-//		enc                promchunk.Encoding
-//	}{
-//		{numChunks: 1000, numSamplesPerChunk: 100, duplicationFactor: 1, enc: promchunk.PrometheusXorChunk},
-//		{numChunks: 1000, numSamplesPerChunk: 100, duplicationFactor: 3, enc: promchunk.PrometheusXorChunk},
-//		{numChunks: 100, numSamplesPerChunk: 100, duplicationFactor: 1, enc: promchunk.PrometheusXorChunk},
-//		{numChunks: 100, numSamplesPerChunk: 100, duplicationFactor: 3, enc: promchunk.PrometheusXorChunk},
-//		{numChunks: 1, numSamplesPerChunk: 100, duplicationFactor: 1, enc: promchunk.PrometheusXorChunk},
-//		{numChunks: 1, numSamplesPerChunk: 100, duplicationFactor: 3, enc: promchunk.PrometheusXorChunk},
-//	}
-//
-//	for _, scenario := range scenarios {
-//		name := fmt.Sprintf("chunks: %d samples per chunk: %d duplication factor: %d encoding: %s",
-//			scenario.numChunks,
-//			scenario.numSamplesPerChunk,
-//			scenario.duplicationFactor,
-//			scenario.enc.String())
-//
-//		chunks := createChunks(b, scenario.numChunks, scenario.numSamplesPerChunk, scenario.duplicationFactor, scenario.enc)
-//
-//		b.Run(name, func(b *testing.B) {
-//			b.ReportAllocs()
-//
-//			for n := 0; n < b.N; n++ {
-//				it := NewChunkMergeIterator(chunks, 0, 0)
-//				for it.Next() != chunkenc.ValNone {
-//					it.At()
-//				}
-//
-//				// Ensure no error occurred.
-//				if it.Err() != nil {
-//					b.Fatal(it.Err().Error())
-//				}
-//			}
-//		})
-//	}
-//}
+func BenchmarkNewChunkMergeIterator_CreateAndIterate(b *testing.B) {
+	scenarios := []struct {
+		numChunks          int
+		numSamplesPerChunk int
+		duplicationFactor  int
+		enc                promchunk.Encoding
+	}{
+		{numChunks: 1000, numSamplesPerChunk: 100, duplicationFactor: 1, enc: promchunk.PrometheusXorChunk},
+		{numChunks: 1000, numSamplesPerChunk: 100, duplicationFactor: 3, enc: promchunk.PrometheusXorChunk},
+		{numChunks: 100, numSamplesPerChunk: 100, duplicationFactor: 1, enc: promchunk.PrometheusXorChunk},
+		{numChunks: 100, numSamplesPerChunk: 100, duplicationFactor: 3, enc: promchunk.PrometheusXorChunk},
+		{numChunks: 1, numSamplesPerChunk: 100, duplicationFactor: 1, enc: promchunk.PrometheusXorChunk},
+		{numChunks: 1, numSamplesPerChunk: 100, duplicationFactor: 3, enc: promchunk.PrometheusXorChunk},
+	}
+
+	for _, scenario := range scenarios {
+		name := fmt.Sprintf("chunks: %d samples per chunk: %d duplication factor: %d encoding: %s",
+			scenario.numChunks,
+			scenario.numSamplesPerChunk,
+			scenario.duplicationFactor,
+			scenario.enc.String())
+
+		chunks := createChunks(b, step, scenario.numChunks, scenario.numSamplesPerChunk, scenario.duplicationFactor, scenario.enc)
+
+		b.Run(name, func(b *testing.B) {
+			b.ReportAllocs()
+
+			for n := 0; n < b.N; n++ {
+				it := NewChunkMergeIterator(chunks, 0, 0)
+				for it.Next() != chunkenc.ValNone {
+					it.At()
+				}
+
+				// Ensure no error occurred.
+				if it.Err() != nil {
+					b.Fatal(it.Err().Error())
+				}
+			}
+		})
+	}
+}
 
 func BenchmarkNewChunkMergeIterator_Seek(b *testing.B) {
 	scrapeInterval := 30 * time.Second