Rename MergeSamples to MergeSampleSets

Author: aaron7

pkg/chunk/chunk.go

@@ -297,7 +297,7 @@ func chunksToIterators(chunks []Chunk) ([]local.SeriesIterator, error) {
 			return nil, err
 		}
 
-		ss.Values = util.MergeSamples(ss.Values, samples)
+		ss.Values = util.MergeSampleSets(ss.Values, samples)
 	}
 
 	iterators := make([]local.SeriesIterator, 0, len(sampleStreams))
@@ -327,7 +327,7 @@ func ChunksToMatrix(chunks []Chunk) (model.Matrix, error) {
 			return nil, err
 		}
 
-		ss.Values = util.MergeSamples(ss.Values, samples)
+		ss.Values = util.MergeSampleSets(ss.Values, samples)
 	}
 
 	matrix := make(model.Matrix, 0, len(sampleStreams))

pkg/chunk/chunk_test.go

@@ -145,7 +145,7 @@ func TestChunksToIterators(t *testing.T) {
 
 	iterator1 := util.NewSampleStreamIterator(&model.SampleStream{
 		Metric: chunk1.Metric,
-		Values: util.MergeSamples(chunk1Samples, chunk2Samples),
+		Values: util.MergeSampleSets(chunk1Samples, chunk2Samples),
 	})
 
 	// Create another chunk with a different metric

pkg/distributor/distributor.go

@@ -532,7 +532,7 @@ func (d *Distributor) queryIngesters(ctx context.Context, ingesters []*ring.Inge
 					}
 					fpToSampleStream[fp] = mss
 				}
-				mss.Values = util.MergeSamples(mss.Values, ss.Values)
+				mss.Values = util.MergeSampleSets(mss.Values, ss.Values)
 			}
 		}
 	}

pkg/querier/querier.go

@@ -289,7 +289,7 @@ func mergeMatrices(matrices chan model.Matrix, errors chan error, n int) (model.
 				if fpSS, ok := fpToSS[fp]; !ok {
 					fpToSS[fp] = ss
 				} else {
-					fpSS.Values = util.MergeSamples(fpSS.Values, ss.Values)
+					fpSS.Values = util.MergeSampleSets(fpSS.Values, ss.Values)
 				}
 			}
 		}

pkg/util/iterator.go

@@ -52,7 +52,7 @@ func (msit MergeSeriesIterator) RangeValues(in metric.Interval) []model.SamplePa
 		sampleSets = append(sampleSets, it.RangeValues(in))
 	}
 
-	samples := MergeNSamples(sampleSets...)
+	samples := MergeNSampleSets(sampleSets...)
 	if len(samples) == 0 {
 		return nil
 	}

pkg/util/merger.go

@@ -2,8 +2,8 @@ package util
 
 import "github.com/prometheus/common/model"
 
-// MergeSamples merges and dedupes two sets of already sorted sample pairs.
-func MergeSamples(a, b []model.SamplePair) []model.SamplePair {
+// MergeSampleSets merges and dedupes two sets of already sorted sample pairs.
+func MergeSampleSets(a, b []model.SamplePair) []model.SamplePair {
 	result := make([]model.SamplePair, 0, len(a)+len(b))
 	i, j := 0, 0
 	for i < len(a) && j < len(b) {
@@ -28,8 +28,8 @@ func MergeSamples(a, b []model.SamplePair) []model.SamplePair {
 	return result
 }
 
-// MergeNSamples merges and dedupes n sets of already sorted sample pairs.
-func MergeNSamples(sampleSets ...[]model.SamplePair) []model.SamplePair {
+// MergeNSampleSets merges and dedupes n sets of already sorted sample pairs.
+func MergeNSampleSets(sampleSets ...[]model.SamplePair) []model.SamplePair {
 	l := len(sampleSets)
 	switch l {
 	case 0:
@@ -45,7 +45,7 @@ func MergeNSamples(sampleSets ...[]model.SamplePair) []model.SamplePair {
 	for ; l > 1; l-- {
 		left, right := <-c, <-c
 		go func() {
-			c <- MergeSamples(left, right)
+			c <- MergeSampleSets(left, right)
 		}()
 	}
 	return <-c

pkg/util/merger_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestMergeSamples(t *testing.T) {
+func TestMergeSampleSets(t *testing.T) {
 	now := model.Now()
 	sample1 := model.SamplePair{Timestamp: now, Value: 1}
 	sample2 := model.SamplePair{Timestamp: now.Add(1 * time.Second), Value: 2}
@@ -46,36 +46,36 @@ func TestMergeSamples(t *testing.T) {
 			expected: []model.SamplePair{sample1, sample2, sample3, sample4},
 		},
 	} {
-		samples := MergeSamples(c.samplesA, c.samplesB)
+		samples := MergeSampleSets(c.samplesA, c.samplesB)
 		require.Equal(t, c.expected, samples)
 	}
 }
 
-func TestMergeNSamples(t *testing.T) {
+func TestMergeNSampleSets(t *testing.T) {
 	now := model.Now()
 	sample1 := model.SamplePair{Timestamp: now, Value: 1}
 	sample2 := model.SamplePair{Timestamp: now.Add(1 * time.Second), Value: 2}
 	sample3 := model.SamplePair{Timestamp: now.Add(4 * time.Second), Value: 3}
 	sample4 := model.SamplePair{Timestamp: now.Add(8 * time.Second), Value: 7}
 
 	for _, c := range []struct {
-		samplesSet [][]model.SamplePair
+		sampleSets [][]model.SamplePair
 		expected   []model.SamplePair
 	}{
 		{
-			samplesSet: [][]model.SamplePair{{}, {}, {}},
+			sampleSets: [][]model.SamplePair{{}, {}, {}},
 			expected:   []model.SamplePair{},
 		},
 		{
-			samplesSet: [][]model.SamplePair{
+			sampleSets: [][]model.SamplePair{
 				{sample1, sample2},
 				{sample2},
 				{sample1, sample3, sample4},
 			},
 			expected: []model.SamplePair{sample1, sample2, sample3, sample4},
 		},
 	} {
-		samples := MergeNSamples(c.samplesSet...)
+		samples := MergeNSampleSets(c.sampleSets...)
 		require.Equal(t, c.expected, samples)
 	}
 }