Skip to content

Commit

Permalink
fix lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
rfratto committed Oct 4, 2021
1 parent 692fc1e commit b4b0399
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions pkg/intern/intern.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var (
Global Interner = New(prometheus.DefaultRegisterer)
)

// Iterner is a string interner.
// Interner is a string interner.
type Interner interface {
// Metrics returns Metrics for the interner.
Metrics() *Metrics
Expand Down Expand Up @@ -147,18 +147,18 @@ func (p *pool) Release(s string) {
delete(p.pool, s)
}

// InternLabels is a helper function for interning all label
// names and values to a given interner.
func InternLabels(interner Interner, lbls labels.Labels) {
// Intern is a helper function for interning all label names and values to a
// given interner.
func Intern(interner Interner, lbls labels.Labels) {
for i, l := range lbls {
lbls[i].Name = interner.Intern(l.Name)
lbls[i].Value = interner.Intern(l.Value)
}
}

// ReleaseLabels is a helper function for releasing all label
// names and values from a given interner.
func ReleaseLabels(interner Interner, ls labels.Labels) {
// Release is a helper function for releasing all label names and values from a
// given interner.
func Release(interner Interner, ls labels.Labels) {
for _, l := range ls {
interner.Release(l.Name)
interner.Release(l.Value)
Expand Down
4 changes: 2 additions & 2 deletions scrape/scrape.go
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ func (c *scrapeCache) iterDone(flushCache bool) {
// that haven't appeared in the last scrape.
for s, e := range c.series {
if c.iter != e.lastIter {
intern.ReleaseLabels(c.interner, e.lset)
intern.Release(c.interner, e.lset)
delete(c.series, s)
}
}
Expand Down Expand Up @@ -958,7 +958,7 @@ func (c *scrapeCache) get(met string) (*cacheEntry, bool) {
func (c *scrapeCache) addRef(met string, ref uint64, lset labels.Labels, hash uint64) *cacheEntry {
// The cache entries are used for staleness tracking so even if ref is
// 0 we need to track it.
intern.InternLabels(c.interner, lset)
intern.Intern(c.interner, lset)

ce := &cacheEntry{ref: ref, lastIter: c.iter, lset: lset, hash: hash}
c.series[met] = ce
Expand Down
8 changes: 4 additions & 4 deletions storage/remote/queue_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ func (t *QueueManager) Stop() {
// On shutdown, release the strings in the labels from the intern pool.
t.seriesMtx.Lock()
for _, labels := range t.seriesLabels {
intern.ReleaseLabels(t.interner, labels)
intern.Release(t.interner, labels)
}
t.seriesMtx.Unlock()
t.metrics.unregister()
Expand All @@ -657,13 +657,13 @@ func (t *QueueManager) StoreSeries(series []record.RefSeries, index int) {
t.droppedSeries[s.Ref] = struct{}{}
continue
}
intern.InternLabels(intern.Global, lbls)
intern.Intern(intern.Global, lbls)

// We should not ever be replacing a series labels in the map, but just
// in case we do we need to ensure we do not leak the replaced interned
// strings.
if orig, ok := t.seriesLabels[s.Ref]; ok {
intern.ReleaseLabels(t.interner, orig)
intern.Release(t.interner, orig)
}
t.seriesLabels[s.Ref] = lbls
}
Expand Down Expand Up @@ -691,7 +691,7 @@ func (t *QueueManager) SeriesReset(index int) {
for k, v := range t.seriesSegmentIndexes {
if v < index {
delete(t.seriesSegmentIndexes, k)
intern.ReleaseLabels(t.interner, t.seriesLabels[k])
intern.Release(t.interner, t.seriesLabels[k])
delete(t.seriesLabels, k)
delete(t.droppedSeries, k)
}
Expand Down

0 comments on commit b4b0399

Please sign in to comment.