Cleanup

Signed-off-by: Arve Knudsen <[email protected]>

tsdb/index/index.go

@@ -1551,6 +1551,7 @@ func (r *Reader) LabelValuesStream(name string, matchers ...*labels.Matcher) sto
 		return &labelValuesV1{
 			matchers: matchers,
 			it:       reflect.ValueOf(p).MapRange(),
+			name:     name,
 		}
 	}
 

tsdb/index/labelvalues.go

@@ -108,12 +108,18 @@ func (l *labelValuesV2) Warnings() storage.Warnings {
 type labelValuesV1 struct {
 	it       *reflect.MapIter
 	matchers []*labels.Matcher
+	name     string
 }
 
 func (l *labelValuesV1) Next() bool {
 loop:
 	for l.it.Next() {
 		for _, m := range l.matchers {
+			if m.Name != l.name {
+				// This should not happen
+				continue
+			}
+
 			if !m.Matches(l.At()) {
 				continue loop
 			}
@@ -203,8 +209,10 @@ func (it *intersectLabelValues) Next() bool {
 			// These are always the same number of bytes,
 			// and it's faster to skip than to parse.
 			it.skip = it.d.Len()
-			it.d.Uvarint()      // Keycount.
-			it.d.UvarintBytes() // Label name.
+			// Key count
+			it.d.Uvarint()
+			// Label name
+			it.d.UvarintBytes()
 			it.skip -= it.d.Len()
 		} else {
 			it.d.Skip(it.skip)

tsdb/index/postings.go

@@ -156,6 +156,11 @@ func (p *MemPostings) LabelValuesStream(name string, matchers ...*labels.Matcher
 loop:
 	for v := range p.m[name] {
 		for _, m := range matchers {
+			if m.Name != name {
+				// This should not happen
+				continue
+			}
+
 			if !m.Matches(v) {
 				continue loop
 			}