mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'sparsehistogram' of github.com:prometheus/prometheus into sparsehistogram

Browse source
This commit is contained in:
beorn7 2021-10-12 15:30:48 +02:00
parent 94729d9936 c450c01eb9
commit 468a89f1bf
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tsdb/chunkenc/chunk.go
View file

@ -160,7 +160,6 @@ func (p *pool) Get(e Encoding, b []byte) (Chunk, error) {
c.b.count = 0 c.b.count = 0
return c, nil return c, nil
case EncHistogram: case EncHistogram:
// TODO: update metadata
c := p.histogram.Get().(*HistogramChunk) c := p.histogram.Get().(*HistogramChunk)
c.b.stream = b c.b.stream = b
c.b.count = 0 c.b.count = 0
@ -183,7 +182,6 @@ func (p *pool) Put(c Chunk) error {
xc.b.count = 0 xc.b.count = 0
p.xor.Put(c) p.xor.Put(c)
case EncHistogram: case EncHistogram:
// TODO: update metadata
sh, ok := c.(*HistogramChunk) sh, ok := c.(*HistogramChunk)
// This may happen often with wrapped chunks. Nothing we can really do about // This may happen often with wrapped chunks. Nothing we can really do about
// it but returning an error would cause a lot of allocations again. Thus, // it but returning an error would cause a lot of allocations again. Thus,
@ -208,7 +206,6 @@ func FromData(e Encoding, d []byte) (Chunk, error) {
case EncXOR: case EncXOR:
return &XORChunk{b: bstream{count: 0, stream: d}}, nil return &XORChunk{b: bstream{count: 0, stream: d}}, nil
case EncHistogram: case EncHistogram:
// TODO: update metadata
return &HistogramChunk{b: bstream{count: 0, stream: d}}, nil return &HistogramChunk{b: bstream{count: 0, stream: d}}, nil
} }
return nil, errors.Errorf("invalid chunk encoding %q", e) return nil, errors.Errorf("invalid chunk encoding %q", e)