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

Merge branch 'master' of github.com:prometheus/tsdb

This commit is contained in:
Fabian Reinartz 2018-02-21 21:11:26 +01:00
parent 3f06121dd0 bc97c6c6be
commit 88ddcab17c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
head.go
View File

@ -265,7 +265,7 @@ func (h *Head) ReadWAL() error {
// TODO(fabxc): series entries spread between samples can starve the sample workers. // TODO(fabxc): series entries spread between samples can starve the sample workers.
// Even with bufferd channels, this can impact startup time with lots of series churn. // Even with bufferd channels, this can impact startup time with lots of series churn.
// We must not pralellize series creation itself but could make the indexing asynchronous. // We must not paralellize series creation itself but could make the indexing asynchronous.
seriesFunc := func(series []RefSeries) { seriesFunc := func(series []RefSeries) {
for _, s := range series { for _, s := range series {
h.getOrCreateWithID(s.Ref, s.Labels.Hash(), s.Labels) h.getOrCreateWithID(s.Ref, s.Labels.Hash(), s.Labels)
@ -762,10 +762,6 @@ func (c *safeChunk) Iterator() chunkenc.Iterator {
return it return it
} }
// func (c *safeChunk) Appender() (chunks.Appender, error) { panic("illegal") }
// func (c *safeChunk) Bytes() []byte { panic("illegal") }
// func (c *safeChunk) Encoding() chunks.Encoding { panic("illegal") }
type headIndexReader struct { type headIndexReader struct {
head *Head head *Head
mint, maxt int64 mint, maxt int64
@ -1259,7 +1255,7 @@ func (s *memSeries) iterator(id int) chunkenc.Iterator {
if id-s.firstChunkID < len(s.chunks)-1 { if id-s.firstChunkID < len(s.chunks)-1 {
return c.chunk.Iterator() return c.chunk.Iterator()
} }
// Serve the last 4 samples for the last chunk from the series buffer // Serve the last 4 samples for the last chunk from the sample buffer
// as their compressed bytes may be mutated by added samples. // as their compressed bytes may be mutated by added samples.
it := &memSafeIterator{ it := &memSafeIterator{
Iterator: c.chunk.Iterator(), Iterator: c.chunk.Iterator(),