cleanup

Signed-off-by: Ben Ye <benye@amazon.com>

Author: yeya24

pkg/querier/chunk_store_queryable_test.go

@@ -2,9 +2,6 @@ package querier
 
 import (
 	"context"
-	"fmt"
-	"sort"
-	"testing"
 	"time"
 
 	"github.com/prometheus/common/model"
@@ -52,36 +49,3 @@ func mkChunk(t require.TestingT, mint, maxt model.Time, step time.Duration, enco
 	}
 	return chunk.NewChunk(metric, pc, mint, maxt)
 }
-
-func TestPartitionChunksOutputIsSortedByLabels(t *testing.T) {
-	t.Parallel()
-
-	var allChunks []chunk.Chunk
-
-	const count = 10
-	// go down, to add series in reversed order
-	for i := count; i > 0; i-- {
-		ch := mkChunk(t, model.Time(0), model.Time(1000), time.Millisecond, promchunk.PrometheusXorChunk)
-		// mkChunk uses `foo` as metric name, so we rename metric to be unique
-		ch.Metric[0].Value = fmt.Sprintf("%02d", i)
-
-		allChunks = append(allChunks, ch)
-	}
-
-	res := partitionChunks(allChunks, 0, 1000, mergeChunks)
-
-	// collect labels from each series
-	var seriesLabels []labels.Labels
-	for res.Next() {
-		seriesLabels = append(seriesLabels, res.At().Labels())
-	}
-
-	require.Len(t, seriesLabels, count)
-	require.True(t, sort.IsSorted(sortedByLabels(seriesLabels)))
-}
-
-type sortedByLabels []labels.Labels
-
-func (b sortedByLabels) Len() int           { return len(b) }
-func (b sortedByLabels) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
-func (b sortedByLabels) Less(i, j int) bool { return labels.Compare(b[i], b[j]) < 0 }

pkg/querier/querier_test.go

@@ -31,7 +31,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/ingester/client"
 	"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
 	"github.com/cortexproject/cortex/pkg/querier/batch"
-	"github.com/cortexproject/cortex/pkg/querier/iterators"
 	"github.com/cortexproject/cortex/pkg/tenant"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/chunkcompat"
@@ -80,15 +79,6 @@ type query struct {
 }
 
 var (
-	testcases = []struct {
-		name string
-		f    chunkIteratorFunc
-	}{
-		{"matrixes", mergeChunks},
-		{"iterators", iterators.NewChunkMergeIterator},
-		{"batches", batch.NewChunkMergeIterator},
-	}
-
 	encodings = []struct {
 		name string
 		e    promchunk.Encoding