cleanup unused newTimeSeriesSet (#5978)

Signed-off-by: Ben Ye <[email protected]>

Author: yeya24

pkg/distributor/query.go

@@ -317,43 +317,3 @@ func (d *Distributor) queryIngesterStream(ctx context.Context, replicationSet ri
 
 	return resp, nil
 }
-
-// Merges and dedupes two sorted slices with samples together.
-func mergeSamples(a, b []cortexpb.Sample) []cortexpb.Sample {
-	if sameSamples(a, b) {
-		return a
-	}
-
-	result := make([]cortexpb.Sample, 0, len(a)+len(b))
-	i, j := 0, 0
-	for i < len(a) && j < len(b) {
-		if a[i].TimestampMs < b[j].TimestampMs {
-			result = append(result, a[i])
-			i++
-		} else if a[i].TimestampMs > b[j].TimestampMs {
-			result = append(result, b[j])
-			j++
-		} else {
-			result = append(result, a[i])
-			i++
-			j++
-		}
-	}
-	// Add the rest of a or b. One of them is empty now.
-	result = append(result, a[i:]...)
-	result = append(result, b[j:]...)
-	return result
-}
-
-func sameSamples(a, b []cortexpb.Sample) bool {
-	if len(a) != len(b) {
-		return false
-	}
-
-	for i := 0; i < len(a); i++ {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-	return true
-}

pkg/distributor/query_test.go

@@ -13,109 +13,6 @@ import (
 	ingester_client "github.com/cortexproject/cortex/pkg/ingester/client"
 )
 
-func TestMergeSamplesIntoFirstDuplicates(t *testing.T) {
-	t.Parallel()
-	a := []cortexpb.Sample{
-		{Value: 1.084537996, TimestampMs: 1583946732744},
-		{Value: 1.086111723, TimestampMs: 1583946750366},
-		{Value: 1.086111723, TimestampMs: 1583946768623},
-		{Value: 1.087776094, TimestampMs: 1583946795182},
-		{Value: 1.089301187, TimestampMs: 1583946810018},
-		{Value: 1.089301187, TimestampMs: 1583946825064},
-		{Value: 1.089301187, TimestampMs: 1583946835547},
-		{Value: 1.090722985, TimestampMs: 1583946846629},
-		{Value: 1.090722985, TimestampMs: 1583946857608},
-		{Value: 1.092038719, TimestampMs: 1583946882302},
-	}
-
-	b := []cortexpb.Sample{
-		{Value: 1.084537996, TimestampMs: 1583946732744},
-		{Value: 1.086111723, TimestampMs: 1583946750366},
-		{Value: 1.086111723, TimestampMs: 1583946768623},
-		{Value: 1.087776094, TimestampMs: 1583946795182},
-		{Value: 1.089301187, TimestampMs: 1583946810018},
-		{Value: 1.089301187, TimestampMs: 1583946825064},
-		{Value: 1.089301187, TimestampMs: 1583946835547},
-		{Value: 1.090722985, TimestampMs: 1583946846629},
-		{Value: 1.090722985, TimestampMs: 1583946857608},
-		{Value: 1.092038719, TimestampMs: 1583946882302},
-	}
-
-	a = mergeSamples(a, b)
-
-	// should be the same
-	require.Equal(t, a, b)
-}
-
-func TestMergeSamplesIntoFirst(t *testing.T) {
-	t.Parallel()
-	a := []cortexpb.Sample{
-		{Value: 1, TimestampMs: 10},
-		{Value: 2, TimestampMs: 20},
-		{Value: 3, TimestampMs: 30},
-		{Value: 4, TimestampMs: 40},
-		{Value: 5, TimestampMs: 45},
-		{Value: 5, TimestampMs: 50},
-	}
-
-	b := []cortexpb.Sample{
-		{Value: 1, TimestampMs: 5},
-		{Value: 2, TimestampMs: 15},
-		{Value: 3, TimestampMs: 25},
-		{Value: 3, TimestampMs: 30},
-		{Value: 4, TimestampMs: 35},
-		{Value: 5, TimestampMs: 45},
-		{Value: 6, TimestampMs: 55},
-	}
-
-	a = mergeSamples(a, b)
-
-	require.Equal(t, []cortexpb.Sample{
-		{Value: 1, TimestampMs: 5},
-		{Value: 1, TimestampMs: 10},
-		{Value: 2, TimestampMs: 15},
-		{Value: 2, TimestampMs: 20},
-		{Value: 3, TimestampMs: 25},
-		{Value: 3, TimestampMs: 30},
-		{Value: 4, TimestampMs: 35},
-		{Value: 4, TimestampMs: 40},
-		{Value: 5, TimestampMs: 45},
-		{Value: 5, TimestampMs: 50},
-		{Value: 6, TimestampMs: 55},
-	}, a)
-}
-
-func TestMergeSamplesIntoFirstNilA(t *testing.T) {
-	t.Parallel()
-	b := []cortexpb.Sample{
-		{Value: 1, TimestampMs: 5},
-		{Value: 2, TimestampMs: 15},
-		{Value: 3, TimestampMs: 25},
-		{Value: 4, TimestampMs: 35},
-		{Value: 5, TimestampMs: 45},
-		{Value: 6, TimestampMs: 55},
-	}
-
-	a := mergeSamples(nil, b)
-
-	require.Equal(t, b, a)
-}
-
-func TestMergeSamplesIntoFirstNilB(t *testing.T) {
-	t.Parallel()
-	a := []cortexpb.Sample{
-		{Value: 1, TimestampMs: 10},
-		{Value: 2, TimestampMs: 20},
-		{Value: 3, TimestampMs: 30},
-		{Value: 4, TimestampMs: 40},
-		{Value: 5, TimestampMs: 50},
-	}
-
-	b := mergeSamples(a, nil)
-
-	require.Equal(t, b, a)
-}
-
 func TestMergeExemplars(t *testing.T) {
 	t.Parallel()
 	now := timestamp.FromTime(time.Now())