lib/storage: simplify code for searching for label values

This is a follow-up after 9dd191b27c
This commit is contained in:
Aliaksandr Valialkin 2022-02-17 12:29:24 +02:00
parent 3c3805865b
commit c3affb0c4f
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1

View file

@ -981,10 +981,9 @@ func (is *indexSearch) searchTagValuesOnDate(tvs map[string]struct{}, tagKey []b
if mp.IsDeletedTag(dmis) {
continue
}
key := mp.Tag.Key
skipTag := isArtificialTagKey(key)
if !skipTag {
if string(mp.Tag.Key) != string(tagKey) {
break
}
tvs[string(mp.Tag.Value)] = struct{}{}
if mp.MetricIDsLen() < maxMetricIDsPerRow/2 {
// There is no need in searching for the next tag value,
@ -992,21 +991,12 @@ func (is *indexSearch) searchTagValuesOnDate(tvs map[string]struct{}, tagKey []b
// because the current row contains incomplete metricIDs set.
continue
}
}
// Search for the next tag value.
// The last char in kb.B must be tagSeparatorChar.
// Just increment it in order to jump to the next tag value.
kb.B = is.marshalCommonPrefix(kb.B[:0], nsPrefixDateTagToMetricIDs)
kb.B = encoding.MarshalUint64(kb.B, date)
if len(key) > 0 && key[0] == compositeTagKeyPrefix {
// skip composite tag entries
kb.B = append(kb.B, compositeTagKeyPrefix)
} else {
kb.B = marshalTagValue(kb.B, key)
}
if !skipTag {
kb.B = marshalTagValue(kb.B, mp.Tag.Value)
}
kb.B = marshalTagValue(kb.B, mp.Tag.Key)
kb.B[len(kb.B)-1]++
ts.Seek(kb.B)
}
@ -1075,10 +1065,9 @@ func (is *indexSearch) searchTagValues(tvs map[string]struct{}, tagKey []byte, m
if mp.IsDeletedTag(dmis) {
continue
}
key := mp.Tag.Key
skipTag := isArtificialTagKey(key)
if !skipTag {
if string(mp.Tag.Key) != string(tagKey) {
break
}
tvs[string(mp.Tag.Value)] = struct{}{}
if mp.MetricIDsLen() < maxMetricIDsPerRow/2 {
// There is no need in searching for the next tag value,
@ -1086,20 +1075,11 @@ func (is *indexSearch) searchTagValues(tvs map[string]struct{}, tagKey []byte, m
// because the current row contains incomplete metricIDs set.
continue
}
}
// Search for the next tag value.
// The last char in kb.B must be tagSeparatorChar.
// Just increment it in order to jump to the next tag value.
kb.B = is.marshalCommonPrefix(kb.B[:0], nsPrefixTagToMetricIDs)
if len(key) > 0 && key[0] == compositeTagKeyPrefix {
// skip composite tag entries
kb.B = append(kb.B, compositeTagKeyPrefix)
} else {
kb.B = marshalTagValue(kb.B, key)
}
if !skipTag {
kb.B = marshalTagValue(kb.B, mp.Tag.Value)
}
kb.B = marshalTagValue(kb.B, mp.Tag.Key)
kb.B[len(kb.B)-1]++
ts.Seek(kb.B)
}