mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-25 05:34:05 -08:00
Merge pull request #286 from mattbostock/rename_high_timestamp
head: Rename highTimestamp to maxt
This commit is contained in:
commit
90d55672d1
13
head.go
13
head.go
|
@ -451,8 +451,8 @@ func (h *Head) appender() *headAppender {
|
|||
return &headAppender{
|
||||
head: h,
|
||||
mint: h.MaxTime() - h.chunkRange/2,
|
||||
maxt: math.MinInt64,
|
||||
samples: h.getAppendBuffer(),
|
||||
highTimestamp: math.MinInt64,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -470,11 +470,10 @@ func (h *Head) putAppendBuffer(b []RefSample) {
|
|||
|
||||
type headAppender struct {
|
||||
head *Head
|
||||
mint int64
|
||||
mint, maxt int64
|
||||
|
||||
series []RefSeries
|
||||
samples []RefSample
|
||||
highTimestamp int64
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue