cleanup(ruler): remove unused filterSeriesSet, sliceSeriesSet, buildSelectorExpr

Author: alanprot

pkg/ruler/prefetch_queryable.go

@@ -2,15 +2,12 @@ package ruler
 
 import (
 	"context"
-	"strings"
 	"time"
 
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/prometheus/prometheus/rules"
-	"github.com/prometheus/prometheus/storage"
-	"github.com/prometheus/prometheus/util/annotations"
 )
 
 // prefetchEntry holds pre-fetched results for a merged selector.
@@ -82,20 +79,6 @@ func executePrefetch(ctx context.Context, plan []mergedSelect, queryFunc rules.Q
 	return cache
 }
 
-// buildSelectorExpr constructs a PromQL selector string from matchers.
-func buildSelectorExpr(ms []*labels.Matcher) string {
-	var b strings.Builder
-	b.WriteByte('{')
-	for i, m := range ms {
-		if i > 0 {
-			b.WriteByte(',')
-		}
-		b.WriteString(m.String())
-	}
-	b.WriteByte('}')
-	return b.String()
-}
-
 // isMatcherSetSuperset returns true if superMatchers covers all series that subMatchers would match.
 func isMatcherSetSuperset(superMatchers, subMatchers []*labels.Matcher) bool {
 	for _, sup := range superMatchers {
@@ -135,32 +118,6 @@ func extraMatchers(entryMatchers, queryMatchers []*labels.Matcher) []*labels.Mat
 	return result
 }
 
-// filterSeriesSet wraps a SeriesSet and applies additional matchers locally.
-type filterSeriesSet struct {
-	inner   storage.SeriesSet
-	filters []*labels.Matcher
-	cur     storage.Series
-}
-
-func newFilterSeriesSet(inner storage.SeriesSet, filters []*labels.Matcher) storage.SeriesSet {
-	return &filterSeriesSet{inner: inner, filters: filters}
-}
-
-func (f *filterSeriesSet) Next() bool {
-	for f.inner.Next() {
-		s := f.inner.At()
-		if matchesAll(s.Labels(), f.filters) {
-			f.cur = s
-			return true
-		}
-	}
-	return false
-}
-
-func (f *filterSeriesSet) At() storage.Series            { return f.cur }
-func (f *filterSeriesSet) Err() error                    { return f.inner.Err() }
-func (f *filterSeriesSet) Warnings() annotations.Annotations { return nil }
-
 func matchesAll(lset labels.Labels, matchers []*labels.Matcher) bool {
 	for _, m := range matchers {
 		if !m.Matches(lset.Get(m.Name)) {
@@ -170,25 +127,6 @@ func matchesAll(lset labels.Labels, matchers []*labels.Matcher) bool {
 	return true
 }
 
-// sliceSeriesSet serves series from a pre-materialized slice.
-type sliceSeriesSet struct {
-	series []storage.Series
-	idx    int
-}
-
-func newSliceSeriesSet(series []storage.Series) storage.SeriesSet {
-	return &sliceSeriesSet{series: series, idx: -1}
-}
-
-func (s *sliceSeriesSet) Next() bool {
-	s.idx++
-	return s.idx < len(s.series)
-}
-
-func (s *sliceSeriesSet) At() storage.Series                 { return s.series[s.idx] }
-func (s *sliceSeriesSet) Err() error                         { return nil }
-func (s *sliceSeriesSet) Warnings() annotations.Annotations  { return nil }
-
 // extractSelectorsFromExpr extracts VectorSelector matchers from a PromQL expression string.
 func extractSelectorsFromExpr(qs string) [][]*labels.Matcher {
 	expr, err := parser.ParseExpr(qs)

pkg/ruler/prefetch_queryable_test.go

@@ -7,60 +7,10 @@ import (
 
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
-	"github.com/prometheus/prometheus/storage"
-	"github.com/prometheus/prometheus/tsdb/chunkenc"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-type mockSeries struct {
-	lset labels.Labels
-}
-
-func (s *mockSeries) Labels() labels.Labels                    { return s.lset }
-func (s *mockSeries) Iterator(chunkenc.Iterator) chunkenc.Iterator { return chunkenc.NewNopIterator() }
-
-func TestFilterSeriesSet(t *testing.T) {
-	series := []storage.Series{
-		&mockSeries{lset: labels.FromStrings("__name__", "http_requests", "job", "api", "env", "prod")},
-		&mockSeries{lset: labels.FromStrings("__name__", "http_requests", "job", "web", "env", "prod")},
-		&mockSeries{lset: labels.FromStrings("__name__", "http_requests", "job", "api", "env", "dev")},
-	}
-
-	// Filter to only job="api"
-	filters := []*labels.Matcher{labels.MustNewMatcher(labels.MatchEqual, "job", "api")}
-	ss := newFilterSeriesSet(newSliceSeriesSet(series), filters)
-
-	var got []labels.Labels
-	for ss.Next() {
-		got = append(got, ss.At().Labels())
-	}
-	require.NoError(t, ss.Err())
-	assert.Len(t, got, 2)
-	assert.Equal(t, "api", got[0].Get("job"))
-	assert.Equal(t, "api", got[1].Get("job"))
-}
-
-func TestFilterSeriesSet_RegexFilter(t *testing.T) {
-	series := []storage.Series{
-		&mockSeries{lset: labels.FromStrings("__name__", "cpu", "host", "server-1")},
-		&mockSeries{lset: labels.FromStrings("__name__", "cpu", "host", "server-2")},
-		&mockSeries{lset: labels.FromStrings("__name__", "cpu", "host", "db-1")},
-	}
-
-	filters := []*labels.Matcher{labels.MustNewMatcher(labels.MatchRegexp, "host", "server-.*")}
-	ss := newFilterSeriesSet(newSliceSeriesSet(series), filters)
-
-	var got []labels.Labels
-	for ss.Next() {
-		got = append(got, ss.At().Labels())
-	}
-	require.NoError(t, ss.Err())
-	assert.Len(t, got, 2)
-	assert.Equal(t, "server-1", got[0].Get("host"))
-	assert.Equal(t, "server-2", got[1].Get("host"))
-}
-
 func TestPrefetchCache_FindSuperset(t *testing.T) {
 	// Cache has a broad entry: __name__="http", job=~".*"
 	cache := &prefetchCache{
@@ -202,12 +152,3 @@ func TestExecutePrefetch(t *testing.T) {
 	require.Len(t, cache.entries, 1)
 	assert.Len(t, cache.entries[0].vector, 2)
 }
-
-func TestBuildSelectorExpr(t *testing.T) {
-	ms := []*labels.Matcher{
-		labels.MustNewMatcher(labels.MatchEqual, "__name__", "http"),
-		labels.MustNewMatcher(labels.MatchRegexp, "job", ".*"),
-	}
-	got := buildSelectorExpr(ms)
-	assert.Equal(t, `{__name__="http",job=~".*"}`, got)
-}