mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-18 11:34:05 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #9056 from prometheus/beorn7/histogram2

Browse source 
Fix re-encoding
This commit is contained in:
Björn Rabenstein 2021-07-06 01:12:16 +02:00 committed by GitHub
parent 6b682541f9 cb75747bce
commit 08258cc539
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tsdb/chunkenc/histo.go
View file

@ -361,10 +361,14 @@ func (a *HistoAppender) AppendHistogram(t int64, h histogram.SparseHistogram) {
} }
// Recode converts the current chunk to accommodate an expansion of the set of // Recode converts the current chunk to accommodate an expansion of the set of
// (positive and/or negative) buckets used, according to the provided interjections, resulting in // (positive and/or negative) buckets used, according to the provided
// the honoring of the provided new posSpans and negSpans // interjections, resulting in the honoring of the provided new posSpans and
// note: the decode-recode can probably be done more efficiently, but that's for a future optimization // negSpans.
func (a *HistoAppender) Recode(posInterjections, negInterjections []Interjection, posSpans, negSpans []histogram.Span) (Chunk, Appender) { func (a *HistoAppender) Recode(posInterjections, negInterjections []Interjection, posSpans, negSpans []histogram.Span) (Chunk, Appender) {
// TODO(beorn7): This currently just decodes everything and then encodes
// it again with the new span layout. This can probably be done in-place
// by editing the chunk. But let's first see how expensive it is in the
// big picture.
it := newHistoIterator(a.b.bytes()) it := newHistoIterator(a.b.bytes())
hc := NewHistoChunk() hc := NewHistoChunk()
app, err := hc.Appender() app, err := hc.Appender()
@ -372,18 +376,24 @@ func (a *HistoAppender) Recode(posInterjections, negInterjections []Interjection
panic(err) panic(err)
} }
numPosBuckets, numNegBuckets := countSpans(posSpans), countSpans(negSpans) numPosBuckets, numNegBuckets := countSpans(posSpans), countSpans(negSpans)
posbuckets := make([]int64, numPosBuckets) // new (modified) histogram buckets
negbuckets := make([]int64, numNegBuckets) // new (modified) histogram buckets
for it.Next() { for it.Next() {
tOld, hOld := it.AtHistogram() tOld, hOld := it.AtHistogram()
// save the modified histogram to the new chunk
// We have to newly allocate slices for the modified buckets
// here because they are kept by the appender until the next
// append.
// TODO(beorn7): We might be able to optimize this.
posBuckets := make([]int64, numPosBuckets)
negBuckets := make([]int64, numNegBuckets)
// Save the modified histogram to the new chunk.
hOld.PositiveSpans, hOld.NegativeSpans = posSpans, negSpans hOld.PositiveSpans, hOld.NegativeSpans = posSpans, negSpans
if len(posInterjections) > 0 { if len(posInterjections) > 0 {
hOld.PositiveBuckets = interject(hOld.PositiveBuckets, posbuckets, posInterjections) hOld.PositiveBuckets = interject(hOld.PositiveBuckets, posBuckets, posInterjections)
} }
if len(negInterjections) > 0 { if len(negInterjections) > 0 {
hOld.NegativeBuckets = interject(hOld.NegativeBuckets, negbuckets, negInterjections) hOld.NegativeBuckets = interject(hOld.NegativeBuckets, negBuckets, negInterjections)
} }
app.AppendHistogram(tOld, hOld) app.AppendHistogram(tOld, hOld)
} }