From 55ea5ae6b18c7a85980b334b2291089315fc6ea7 Mon Sep 17 00:00:00 2001 From: Matt Bostock Date: Wed, 21 Feb 2018 16:01:12 +0000 Subject: [PATCH] head: Rename highTimestamp to maxt `maxt` seems more consistent with `mint` and other uses of `maxt` elsewhere in the code, if I've understand the intent correctly. --- head.go | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/head.go b/head.go index 4e1bea957..45f7d754e 100644 --- a/head.go +++ b/head.go @@ -449,10 +449,10 @@ func (h *Head) Appender() Appender { func (h *Head) appender() *headAppender { return &headAppender{ - head: h, - mint: h.MaxTime() - h.chunkRange/2, - samples: h.getAppendBuffer(), - highTimestamp: math.MinInt64, + head: h, + mint: h.MaxTime() - h.chunkRange/2, + maxt: math.MinInt64, + samples: h.getAppendBuffer(), } } @@ -469,12 +469,11 @@ func (h *Head) putAppendBuffer(b []RefSample) { } type headAppender struct { - head *Head - mint int64 + head *Head + mint, maxt int64 - series []RefSeries - samples []RefSample - highTimestamp int64 + series []RefSeries + samples []RefSample } func (a *headAppender) Add(lset labels.Labels, t int64, v float64) (uint64, error) { @@ -508,8 +507,8 @@ func (a *headAppender) AddFast(ref uint64, t int64, v float64) error { if t < a.mint { return ErrOutOfBounds } - if t > a.highTimestamp { - a.highTimestamp = t + if t > a.maxt { + a.maxt = t } a.samples = append(a.samples, RefSample{ @@ -551,10 +550,10 @@ func (a *headAppender) Commit() error { for { ht := a.head.MaxTime() - if a.highTimestamp <= ht { + if a.maxt <= ht { break } - if atomic.CompareAndSwapInt64(&a.head.maxTime, ht, a.highTimestamp) { + if atomic.CompareAndSwapInt64(&a.head.maxTime, ht, a.maxt) { break } }