RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify position mapper updating

This commit is contained in:
Fabian Reinartz 2017-01-09 19:24:05 +01:00
parent 142c89b8b0
commit 4c4e0c614e
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
head.go
View File

@ -403,9 +403,6 @@ func (h *HeadBlock) fullness() float64 {
} }
func (h *HeadBlock) updateMapping() { func (h *HeadBlock) updateMapping() {
h.mapper.mtx.Lock()
defer h.mapper.mtx.Unlock()
h.mtx.RLock() h.mtx.RLock()
if h.mapper.sortable != nil && h.mapper.Len() == len(h.descs) { if h.mapper.sortable != nil && h.mapper.Len() == len(h.descs) {
@ -435,15 +432,12 @@ func (h *HeadBlock) remapPostings(p Postings) Postings {
return errPostings{err: err} return errPostings{err: err}
} }
h.mapper.mtx.RLock() h.mapper.mtx.Lock()
defer h.mapper.mtx.RUnlock() defer h.mapper.mtx.Unlock()
h.updateMapping()
h.mapper.Sort(list) h.mapper.Sort(list)
slice.Sort(list, func(i, j int) bool {
return h.mapper.fw[list[i]] < h.mapper.fw[list[j]]
})
return newListPostings(list) return newListPostings(list)
} }

5
querier.go
View File

@ -64,11 +64,8 @@ func (s *DB) Querier(mint, maxt int64) Querier {
// TODO(fabxc): find nicer solution. // TODO(fabxc): find nicer solution.
if hb, ok := b.(*HeadBlock); ok { if hb, ok := b.(*HeadBlock); ok {
hb.updateMapping()
q.postingsMapper = hb.remapPostings q.postingsMapper = hb.remapPostings
q.series = &headSeriesReader{ q.series = &headSeriesReader{h: hb}
h: hb,
}
} }
sq.blocks = append(sq.blocks, q) sq.blocks = append(sq.blocks, q)