mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 21:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

tsdb: move exemplar series labels to index entry (#8783)

Browse source 
Signed-off-by: yeya24 <yb532204897@gmail.com>
This commit is contained in:
Ben Ye 2021-05-05 13:51:16 -04:00 committed by GitHub
parent 9e8df5ade9
commit 8f05cd8f9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tsdb/exemplar.go
View file

@ -41,14 +41,15 @@ type CircularExemplarStorage struct {
} }
type indexEntry struct { type indexEntry struct {
oldest int oldest int
newest int newest int
seriesLabels labels.Labels
} }
type circularBufferEntry struct { type circularBufferEntry struct {
exemplar exemplar.Exemplar exemplar exemplar.Exemplar
seriesLabels labels.Labels next int
next int ref *indexEntry
} }
// NewCircularExemplarStorage creates an circular in memory exemplar storage. // NewCircularExemplarStorage creates an circular in memory exemplar storage.
@ -124,10 +125,10 @@ func (ce *CircularExemplarStorage) Select(start, end int64, matchers ...[]*label
if e.exemplar.Ts > end || ce.exemplars[idx.newest].exemplar.Ts < start { if e.exemplar.Ts > end || ce.exemplars[idx.newest].exemplar.Ts < start {
continue continue
} }
if !matchesSomeMatcherSet(e.seriesLabels, matchers) { if !matchesSomeMatcherSet(idx.seriesLabels, matchers) {
continue continue
} }
se.SeriesLabels = e.seriesLabels se.SeriesLabels = idx.seriesLabels
// Loop through all exemplars in the circular buffer for the current series. // Loop through all exemplars in the circular buffer for the current series.
for e.exemplar.Ts <= end { for e.exemplar.Ts <= end {
@ -174,7 +175,7 @@ func (ce *CircularExemplarStorage) AddExemplar(l labels.Labels, e exemplar.Exemp
idx, ok := ce.index[seriesLabels] idx, ok := ce.index[seriesLabels]
if !ok { if !ok {
ce.index[seriesLabels] = &indexEntry{oldest: ce.nextIndex} ce.index[seriesLabels] = &indexEntry{oldest: ce.nextIndex, seriesLabels: l}
} else { } else {
// Check for duplicate vs last stored exemplar for this series. // Check for duplicate vs last stored exemplar for this series.
// NB these are expected, add appending them is a no-op. // NB these are expected, add appending them is a no-op.
@ -195,7 +196,7 @@ func (ce *CircularExemplarStorage) AddExemplar(l labels.Labels, e exemplar.Exemp
} else { } else {
// There exists exemplar already on this ce.nextIndex entry, drop it, to make place // There exists exemplar already on this ce.nextIndex entry, drop it, to make place
// for others. // for others.
prevLabels := prev.seriesLabels.String() prevLabels := prev.ref.seriesLabels.String()
if prev.next == -1 { if prev.next == -1 {
// Last item for this series, remove index entry. // Last item for this series, remove index entry.
delete(ce.index, prevLabels) delete(ce.index, prevLabels)
@ -208,7 +209,7 @@ func (ce *CircularExemplarStorage) AddExemplar(l labels.Labels, e exemplar.Exemp
// since this is the first exemplar stored for this series. // since this is the first exemplar stored for this series.
ce.exemplars[ce.nextIndex].exemplar = e ce.exemplars[ce.nextIndex].exemplar = e
ce.exemplars[ce.nextIndex].next = -1 ce.exemplars[ce.nextIndex].next = -1
ce.exemplars[ce.nextIndex].seriesLabels = l ce.exemplars[ce.nextIndex].ref = ce.index[seriesLabels]
ce.index[seriesLabels].newest = ce.nextIndex ce.index[seriesLabels].newest = ce.nextIndex
ce.nextIndex = (ce.nextIndex + 1) % len(ce.exemplars) ce.nextIndex = (ce.nextIndex + 1) % len(ce.exemplars)

4
tsdb/exemplar_test.go
View file

@ -304,11 +304,11 @@ func TestIndexOverwrite(t *testing.T) {
// index entry for series l1 since we just wrote two exemplars for series l2. // index entry for series l1 since we just wrote two exemplars for series l2.
_, ok := es.index[l1.String()] _, ok := es.index[l1.String()]
require.False(t, ok) require.False(t, ok)
require.Equal(t, &indexEntry{1, 0}, es.index[l2.String()]) require.Equal(t, &indexEntry{1, 0, l2}, es.index[l2.String()])
err = es.AddExemplar(l1, exemplar.Exemplar{Value: 4, Ts: 4}) err = es.AddExemplar(l1, exemplar.Exemplar{Value: 4, Ts: 4})
require.NoError(t, err) require.NoError(t, err)
i := es.index[l2.String()] i := es.index[l2.String()]
require.Equal(t, &indexEntry{0, 0}, i) require.Equal(t, &indexEntry{0, 0, l2}, i)
} }