From d682731efccd97a81f14df0a75b9611798c098cb Mon Sep 17 00:00:00 2001
From: Brian Brazil <brian.brazil@robustperception.io>
Date: Fri, 17 Jan 2020 10:57:52 +0000
Subject: [PATCH] Extend BenchmarkQuerierSelect to use multiple blocks.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
---
 tsdb/querier_bench_test.go | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/tsdb/querier_bench_test.go b/tsdb/querier_bench_test.go
index 9efd3f0dd5..5ab41c3c67 100644
--- a/tsdb/querier_bench_test.go
+++ b/tsdb/querier_bench_test.go
@@ -136,12 +136,26 @@ func BenchmarkQuerierSelect(b *testing.B) {
 	}
 	testutil.Ok(b, app.Commit())
 
-	bench := func(b *testing.B, br BlockReader) {
+	emptyHead, err := NewHead(nil, nil, nil, 1000)
+	testutil.Ok(b, err)
+	defer emptyHead.Close()
+
+	bench := func(b *testing.B, br BlockReader, multiBlock bool) {
 		matcher := labels.MustNewMatcher(labels.MatchEqual, "foo", "bar")
 		for s := 1; s <= numSeries; s *= 10 {
 			b.Run(fmt.Sprintf("%dof%d", s, numSeries), func(b *testing.B) {
-				q, err := NewBlockQuerier(br, 0, int64(s-1))
+				bq, err := NewBlockQuerier(br, 0, int64(s-1))
 				testutil.Ok(b, err)
+				blocks := []Querier{bq}
+
+				if multiBlock {
+					// Passing more than one block to the querier will trigger
+					// sorting of the returned series.
+					bq, err := NewBlockQuerier(emptyHead, 0, int64(s-1))
+					testutil.Ok(b, err)
+					blocks = append(blocks, bq)
+				}
+				q := &querier{blocks: blocks}
 
 				b.ResetTimer()
 				for i := 0; i < b.N; i++ {
@@ -157,7 +171,10 @@ func BenchmarkQuerierSelect(b *testing.B) {
 	}
 
 	b.Run("Head", func(b *testing.B) {
-		bench(b, h)
+		bench(b, h, false)
+	})
+	b.Run("SortedHead", func(b *testing.B) {
+		bench(b, h, true)
 	})
 
 	tmpdir, err := ioutil.TempDir("", "test_benchquerierselect")
@@ -174,6 +191,6 @@ func BenchmarkQuerierSelect(b *testing.B) {
 	}()
 
 	b.Run("Block", func(b *testing.B) {
-		bench(b, block)
+		bench(b, block, false)
 	})
 }