chore: a bit of cleanup

grafana · May 31, 2024 · eb84303 · eb84303
1 parent 6dd77ae
commit eb84303
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 61 deletions.
diff --git a/pkg/pattern/ingester_querier.go b/pkg/pattern/ingester_querier.go
@@ -103,7 +103,7 @@ func (q *IngesterQuerier) Samples(
 		return nil, err
 	}
 
-	// TODO: what should batch size be here?
+	// TODO(twhitney): what should batch size be here?
 	resp, err := pattern_iter.ReadMetricsBatch(loki_iter.NewSortSampleIterator(iterators), math.MaxInt32)
 	if err != nil {
 		return nil, err

diff --git a/pkg/pattern/ingester_test.go b/pkg/pattern/ingester_test.go
@@ -144,12 +144,6 @@ func TestInstancePushQuerySamples(t *testing.T) {
 		expr, err = syntax.ParseSampleExpr(`count_over_time({test="test"}[80s])`)
 		require.NoError(t, err)
 
-		// it, err := inst.QuerySample(context.Background(), expr, &logproto.QuerySamplesRequest{
-		// 	Query: expr.String(),
-		// 	Start: time.Unix(0, 0),
-		// 	End:   time.Unix(int64(20*30), 0),
-		// 	Step:  10000,
-		// })
 		it, err = inst.QuerySample(context.Background(), expr, &logproto.QuerySamplesRequest{
 			Query: expr.String(),
 			Start: time.Unix(0, 0),

diff --git a/pkg/pattern/metric/evaluator.go b/pkg/pattern/metric/evaluator.go
@@ -242,59 +242,6 @@ func newRangeVectorIterator(
 	), nil
 }
 
-type seriesToSampleIterator struct {
-	floats []promql.FPoint
-	curTs  int64
-	cur    float64
-	lbls   labels.Labels
-}
-
-// TODO: could this me a matrix iterator that returned multiple samples with
-// different labels for the same timestamp?
-func NewSeriesToSampleIterator(series *promql.Series) *seriesToSampleIterator {
-	return &seriesToSampleIterator{
-		floats: series.Floats,
-		lbls:   series.Metric,
-	}
-}
-
-func (s *seriesToSampleIterator) Next() bool {
-	if len(s.floats) == 0 {
-		return false
-	}
-
-	current, rest := s.floats[0], s.floats[1:]
-
-	s.curTs = current.T * 1e6 // convert to nanoseconds
-	s.cur = current.F
-
-	s.floats = rest
-	return true
-}
-
-func (s *seriesToSampleIterator) Labels() string {
-	return s.lbls.String()
-}
-
-func (s *seriesToSampleIterator) Sample() logproto.Sample {
-	return logproto.Sample{
-		Timestamp: s.curTs,
-		Value:     s.cur,
-	}
-}
-
-func (s *seriesToSampleIterator) StreamHash() uint64 {
-	return s.lbls.Hash()
-}
-
-func (s *seriesToSampleIterator) Error() error {
-	return nil
-}
-
-func (s *seriesToSampleIterator) Close() error {
-	return nil
-}
-
 type paramCompat struct {
 	expr    syntax.SampleExpr
 	from    model.Time

diff --git a/pkg/util/marshal/marshal_test.go b/pkg/util/marshal/marshal_test.go
@@ -1136,7 +1136,6 @@ func Test_WriteQueryPatternsResponseJSON(t *testing.T) {
 	}
 }
 
-//TODO: use real times for clarity
 func Test_WriteQuerySamplesResponseJSON(t *testing.T) {
 	expected := func(result string) string {
 		return fmt.Sprintf(`{