2017-04-10 11:59:45 -07:00
|
|
|
// Copyright 2017 The Prometheus Authors
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
2017-11-30 06:34:49 -08:00
|
|
|
package chunkenc
|
2016-11-15 01:33:34 -08:00
|
|
|
|
2017-08-08 08:35:34 -07:00
|
|
|
import (
|
2023-11-08 00:35:46 -08:00
|
|
|
"fmt"
|
2020-02-06 07:58:38 -08:00
|
|
|
"math"
|
2017-08-08 08:35:34 -07:00
|
|
|
"sync"
|
|
|
|
|
Style cleanup of all the changes in sparsehistogram so far
A lot of this code was hacked together, literally during a
hackathon. This commit intends not to change the code substantially,
but just make the code obey the usual style practices.
A (possibly incomplete) list of areas:
* Generally address linter warnings.
* The `pgk` directory is deprecated as per dev-summit. No new packages should
be added to it. I moved the new `pkg/histogram` package to `model`
anticipating what's proposed in #9478.
* Make the naming of the Sparse Histogram more consistent. Including
abbreviations, there were just too many names for it: SparseHistogram,
Histogram, Histo, hist, his, shs, h. The idea is to call it "Histogram" in
general. Only add "Sparse" if it is needed to avoid confusion with
conventional Histograms (which is rare because the TSDB really has no notion
of conventional Histograms). Use abbreviations only in local scope, and then
really abbreviate (not just removing three out of seven letters like in
"Histo"). This is in the spirit of
https://github.com/golang/go/wiki/CodeReviewComments#variable-names
* Several other minor name changes.
* A lot of formatting of doc comments. For one, following
https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences
, but also layout question, anticipating how things will look like
when rendered by `godoc` (even where `godoc` doesn't render them
right now because they are for unexported types or not a doc comment
at all but just a normal code comment - consistency is queen!).
* Re-enabled `TestQueryLog` and `TestEndopints` (they pass now,
leaving them disabled was presumably an oversight).
* Bucket iterator for histogram.Histogram is now created with a
method.
* HistogramChunk.iterator now allows iterator recycling. (I think
@dieterbe only commented it out because he was confused by the
question in the comment.)
* HistogramAppender.Append panics now because we decided to treat
staleness marker differently.
Signed-off-by: beorn7 <beorn@grafana.com>
2021-10-09 06:57:07 -07:00
|
|
|
"github.com/prometheus/prometheus/model/histogram"
|
2017-08-08 08:35:34 -07:00
|
|
|
)
|
2016-11-15 01:33:34 -08:00
|
|
|
|
2017-04-28 06:41:42 -07:00
|
|
|
// Encoding is the identifier for a chunk encoding.
|
2016-11-15 01:33:34 -08:00
|
|
|
type Encoding uint8
|
|
|
|
|
2021-11-28 23:54:23 -08:00
|
|
|
// The different available chunk encodings.
|
|
|
|
const (
|
|
|
|
EncNone Encoding = iota
|
|
|
|
EncXOR
|
|
|
|
EncHistogram
|
2022-12-20 02:03:32 -08:00
|
|
|
EncFloatHistogram
|
2021-11-28 23:54:23 -08:00
|
|
|
)
|
|
|
|
|
2016-11-15 01:33:34 -08:00
|
|
|
func (e Encoding) String() string {
|
|
|
|
switch e {
|
|
|
|
case EncNone:
|
|
|
|
return "none"
|
|
|
|
case EncXOR:
|
|
|
|
return "XOR"
|
Style cleanup of all the changes in sparsehistogram so far
A lot of this code was hacked together, literally during a
hackathon. This commit intends not to change the code substantially,
but just make the code obey the usual style practices.
A (possibly incomplete) list of areas:
* Generally address linter warnings.
* The `pgk` directory is deprecated as per dev-summit. No new packages should
be added to it. I moved the new `pkg/histogram` package to `model`
anticipating what's proposed in #9478.
* Make the naming of the Sparse Histogram more consistent. Including
abbreviations, there were just too many names for it: SparseHistogram,
Histogram, Histo, hist, his, shs, h. The idea is to call it "Histogram" in
general. Only add "Sparse" if it is needed to avoid confusion with
conventional Histograms (which is rare because the TSDB really has no notion
of conventional Histograms). Use abbreviations only in local scope, and then
really abbreviate (not just removing three out of seven letters like in
"Histo"). This is in the spirit of
https://github.com/golang/go/wiki/CodeReviewComments#variable-names
* Several other minor name changes.
* A lot of formatting of doc comments. For one, following
https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences
, but also layout question, anticipating how things will look like
when rendered by `godoc` (even where `godoc` doesn't render them
right now because they are for unexported types or not a doc comment
at all but just a normal code comment - consistency is queen!).
* Re-enabled `TestQueryLog` and `TestEndopints` (they pass now,
leaving them disabled was presumably an oversight).
* Bucket iterator for histogram.Histogram is now created with a
method.
* HistogramChunk.iterator now allows iterator recycling. (I think
@dieterbe only commented it out because he was confused by the
question in the comment.)
* HistogramAppender.Append panics now because we decided to treat
staleness marker differently.
Signed-off-by: beorn7 <beorn@grafana.com>
2021-10-09 06:57:07 -07:00
|
|
|
case EncHistogram:
|
|
|
|
return "histogram"
|
2022-12-20 02:03:32 -08:00
|
|
|
case EncFloatHistogram:
|
|
|
|
return "floathistogram"
|
2016-11-15 01:33:34 -08:00
|
|
|
}
|
|
|
|
return "<unknown>"
|
|
|
|
}
|
|
|
|
|
2022-10-11 09:35:35 -07:00
|
|
|
// IsValidEncoding returns true for supported encodings.
|
2022-09-20 10:05:50 -07:00
|
|
|
func IsValidEncoding(e Encoding) bool {
|
2023-03-16 03:23:47 -07:00
|
|
|
return e == EncXOR || e == EncHistogram || e == EncFloatHistogram
|
2022-09-20 10:05:50 -07:00
|
|
|
}
|
|
|
|
|
2023-08-24 06:21:17 -07:00
|
|
|
const (
|
|
|
|
// MaxBytesPerXORChunk is the maximum size an XOR chunk can be.
|
|
|
|
MaxBytesPerXORChunk = 1024
|
|
|
|
// TargetBytesPerHistogramChunk sets a size target for each histogram chunk.
|
|
|
|
TargetBytesPerHistogramChunk = 1024
|
|
|
|
// MinSamplesPerHistogramChunk sets a minimum sample count for histogram chunks. This is desirable because a single
|
|
|
|
// histogram sample can be larger than TargetBytesPerHistogramChunk but we want to avoid too-small sample count
|
|
|
|
// chunks so we can achieve some measure of compression advantage even while dealing with really large histograms.
|
|
|
|
// Note that this minimum sample count is not enforced across chunk range boundaries (for example, if the chunk
|
|
|
|
// range is 100 and the first sample in the chunk range is 99, the next sample will be included in a new chunk
|
|
|
|
// resulting in the old chunk containing only a single sample).
|
|
|
|
MinSamplesPerHistogramChunk = 10
|
|
|
|
)
|
|
|
|
|
2016-11-15 01:33:34 -08:00
|
|
|
// Chunk holds a sequence of sample pairs that can be iterated over and appended to.
|
|
|
|
type Chunk interface {
|
2023-11-28 02:14:29 -08:00
|
|
|
Iterable
|
|
|
|
|
2020-02-05 04:07:41 -08:00
|
|
|
// Bytes returns the underlying byte slice of the chunk.
|
2016-11-29 13:02:58 -08:00
|
|
|
Bytes() []byte
|
2020-02-05 04:07:41 -08:00
|
|
|
|
|
|
|
// Encoding returns the encoding type of the chunk.
|
2016-12-09 11:45:46 -08:00
|
|
|
Encoding() Encoding
|
2020-02-05 04:07:41 -08:00
|
|
|
|
|
|
|
// Appender returns an appender to append samples to the chunk.
|
2016-11-29 13:02:58 -08:00
|
|
|
Appender() (Appender, error)
|
2020-02-05 04:07:41 -08:00
|
|
|
|
|
|
|
// NumSamples returns the number of samples in the chunk.
|
2017-07-12 09:31:26 -07:00
|
|
|
NumSamples() int
|
2020-02-05 04:07:41 -08:00
|
|
|
|
|
|
|
// Compact is called whenever a chunk is expected to be complete (no more
|
|
|
|
// samples appended) and the underlying implementation can eventually
|
|
|
|
// optimize the chunk.
|
|
|
|
// There's no strong guarantee that no samples will be appended once
|
|
|
|
// Compact() is called. Implementing this function is optional.
|
2020-01-23 23:44:52 -08:00
|
|
|
Compact()
|
2024-01-17 09:28:06 -08:00
|
|
|
|
|
|
|
// Reset resets the chunk given stream.
|
|
|
|
Reset(stream []byte)
|
2016-11-15 01:33:34 -08:00
|
|
|
}
|
|
|
|
|
2023-11-28 02:14:29 -08:00
|
|
|
type Iterable interface {
|
|
|
|
// The iterator passed as argument is for re-use.
|
|
|
|
// Depending on implementation, the iterator can
|
|
|
|
// be re-used or a new iterator can be allocated.
|
|
|
|
Iterator(Iterator) Iterator
|
|
|
|
}
|
|
|
|
|
2016-11-15 01:33:34 -08:00
|
|
|
// Appender adds sample pairs to a chunk.
|
|
|
|
type Appender interface {
|
2016-12-31 01:10:27 -08:00
|
|
|
Append(int64, float64)
|
2023-07-26 06:08:16 -07:00
|
|
|
|
|
|
|
// AppendHistogram and AppendFloatHistogram append a histogram sample to a histogram or float histogram chunk.
|
|
|
|
// Appending a histogram may require creating a completely new chunk or recoding (changing) the current chunk.
|
|
|
|
// The Appender prev is used to determine if there is a counter reset between the previous Appender and the current Appender.
|
|
|
|
// The Appender prev is optional and only taken into account when the first sample is being appended.
|
|
|
|
// The bool appendOnly governs what happens when a sample cannot be appended to the current chunk. If appendOnly is true, then
|
|
|
|
// in such case an error is returned without modifying the chunk. If appendOnly is false, then a new chunk is created or the
|
|
|
|
// current chunk is recoded to accommodate the sample.
|
|
|
|
// The returned Chunk c is nil if sample could be appended to the current Chunk, otherwise c is the new Chunk.
|
|
|
|
// The returned bool isRecoded can be used to distinguish between the new Chunk c being a completely new Chunk
|
|
|
|
// or the current Chunk recoded to a new Chunk.
|
|
|
|
// The Appender app that can be used for the next append is always returned.
|
2023-08-04 01:21:16 -07:00
|
|
|
AppendHistogram(prev *HistogramAppender, t int64, h *histogram.Histogram, appendOnly bool) (c Chunk, isRecoded bool, app Appender, err error)
|
2023-07-26 06:08:16 -07:00
|
|
|
AppendFloatHistogram(prev *FloatHistogramAppender, t int64, h *histogram.FloatHistogram, appendOnly bool) (c Chunk, isRecoded bool, app Appender, err error)
|
2016-11-15 01:33:34 -08:00
|
|
|
}
|
|
|
|
|
2016-12-31 01:10:27 -08:00
|
|
|
// Iterator is a simple iterator that can only get the next value.
|
2020-02-26 05:11:55 -08:00
|
|
|
// Iterator iterates over the samples of a time series, in timestamp-increasing order.
|
2016-12-31 01:10:27 -08:00
|
|
|
type Iterator interface {
|
2021-11-28 23:54:23 -08:00
|
|
|
// Next advances the iterator by one and returns the type of the value
|
|
|
|
// at the new position (or ValNone if the iterator is exhausted).
|
|
|
|
Next() ValueType
|
|
|
|
// Seek advances the iterator forward to the first sample with a
|
|
|
|
// timestamp equal or greater than t. If the current sample found by a
|
|
|
|
// previous `Next` or `Seek` operation already has this property, Seek
|
|
|
|
// has no effect. If a sample has been found, Seek returns the type of
|
2023-03-27 17:02:20 -07:00
|
|
|
// its value. Otherwise, it returns ValNone, after which the iterator is
|
2021-11-28 23:54:23 -08:00
|
|
|
// exhausted.
|
|
|
|
Seek(t int64) ValueType
|
|
|
|
// At returns the current timestamp/value pair if the value is a float.
|
|
|
|
// Before the iterator has advanced, the behaviour is unspecified.
|
2017-01-02 04:27:52 -08:00
|
|
|
At() (int64, float64)
|
2024-01-23 08:02:14 -08:00
|
|
|
// AtHistogram returns the current timestamp/value pair if the value is a
|
|
|
|
// histogram with integer counts. Before the iterator has advanced, the behaviour
|
|
|
|
// is unspecified.
|
|
|
|
// The method accepts an optional Histogram object which will be
|
|
|
|
// reused when not nil. Otherwise, a new Histogram object will be allocated.
|
|
|
|
AtHistogram(*histogram.Histogram) (int64, *histogram.Histogram)
|
2021-11-28 23:54:23 -08:00
|
|
|
// AtFloatHistogram returns the current timestamp/value pair if the
|
|
|
|
// value is a histogram with floating-point counts. It also works if the
|
|
|
|
// value is a histogram with integer counts, in which case a
|
|
|
|
// FloatHistogram copy of the histogram is returned. Before the iterator
|
|
|
|
// has advanced, the behaviour is unspecified.
|
2024-01-23 08:02:14 -08:00
|
|
|
// The method accepts an optional FloatHistogram object which will be
|
|
|
|
// reused when not nil. Otherwise, a new FloatHistogram object will be allocated.
|
|
|
|
AtFloatHistogram(*histogram.FloatHistogram) (int64, *histogram.FloatHistogram)
|
2021-11-28 23:54:23 -08:00
|
|
|
// AtT returns the current timestamp.
|
|
|
|
// Before the iterator has advanced, the behaviour is unspecified.
|
|
|
|
AtT() int64
|
|
|
|
// Err returns the current error. It should be used only after the
|
|
|
|
// iterator is exhausted, i.e. `Next` or `Seek` have returned ValNone.
|
2020-02-06 07:58:38 -08:00
|
|
|
Err() error
|
2021-11-28 23:54:23 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
// ValueType defines the type of a value an Iterator points to.
|
|
|
|
type ValueType uint8
|
|
|
|
|
|
|
|
// Possible values for ValueType.
|
|
|
|
const (
|
|
|
|
ValNone ValueType = iota // No value at the current position.
|
|
|
|
ValFloat // A simple float, retrieved with At.
|
|
|
|
ValHistogram // A histogram, retrieve with AtHistogram, but AtFloatHistogram works, too.
|
2022-03-22 08:02:13 -07:00
|
|
|
ValFloatHistogram // A floating-point histogram, retrieve with AtFloatHistogram.
|
2021-11-28 23:54:23 -08:00
|
|
|
)
|
|
|
|
|
|
|
|
func (v ValueType) String() string {
|
|
|
|
switch v {
|
|
|
|
case ValNone:
|
|
|
|
return "none"
|
|
|
|
case ValFloat:
|
|
|
|
return "float"
|
|
|
|
case ValHistogram:
|
|
|
|
return "histogram"
|
|
|
|
case ValFloatHistogram:
|
|
|
|
return "floathistogram"
|
|
|
|
default:
|
|
|
|
return "unknown"
|
|
|
|
}
|
2016-11-15 01:33:34 -08:00
|
|
|
}
|
2017-08-08 08:35:34 -07:00
|
|
|
|
2022-08-22 06:34:39 -07:00
|
|
|
func (v ValueType) ChunkEncoding() Encoding {
|
|
|
|
switch v {
|
|
|
|
case ValFloat:
|
|
|
|
return EncXOR
|
|
|
|
case ValHistogram:
|
|
|
|
return EncHistogram
|
2022-12-20 02:03:32 -08:00
|
|
|
case ValFloatHistogram:
|
|
|
|
return EncFloatHistogram
|
2022-08-22 06:34:39 -07:00
|
|
|
default:
|
|
|
|
return EncNone
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-11-28 02:14:29 -08:00
|
|
|
func (v ValueType) NewChunk() (Chunk, error) {
|
|
|
|
switch v {
|
|
|
|
case ValFloat:
|
|
|
|
return NewXORChunk(), nil
|
|
|
|
case ValHistogram:
|
|
|
|
return NewHistogramChunk(), nil
|
|
|
|
case ValFloatHistogram:
|
|
|
|
return NewFloatHistogramChunk(), nil
|
|
|
|
default:
|
|
|
|
return nil, fmt.Errorf("value type %v unsupported", v)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-03-28 17:16:46 -07:00
|
|
|
// MockSeriesIterator returns an iterator for a mock series with custom timeStamps and values.
|
|
|
|
func MockSeriesIterator(timestamps []int64, values []float64) Iterator {
|
|
|
|
return &mockSeriesIterator{
|
|
|
|
timeStamps: timestamps,
|
|
|
|
values: values,
|
|
|
|
currIndex: 0,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type mockSeriesIterator struct {
|
|
|
|
timeStamps []int64
|
|
|
|
values []float64
|
|
|
|
currIndex int
|
|
|
|
}
|
|
|
|
|
2022-04-05 09:31:19 -07:00
|
|
|
func (it *mockSeriesIterator) Seek(int64) ValueType { return ValNone }
|
|
|
|
|
2022-03-28 17:16:46 -07:00
|
|
|
func (it *mockSeriesIterator) At() (int64, float64) {
|
|
|
|
return it.timeStamps[it.currIndex], it.values[it.currIndex]
|
|
|
|
}
|
|
|
|
|
2024-01-23 08:02:14 -08:00
|
|
|
func (it *mockSeriesIterator) AtHistogram(*histogram.Histogram) (int64, *histogram.Histogram) {
|
|
|
|
return math.MinInt64, nil
|
|
|
|
}
|
2022-04-05 09:31:19 -07:00
|
|
|
|
2024-01-23 08:02:14 -08:00
|
|
|
func (it *mockSeriesIterator) AtFloatHistogram(*histogram.FloatHistogram) (int64, *histogram.FloatHistogram) {
|
2022-04-05 09:31:19 -07:00
|
|
|
return math.MinInt64, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *mockSeriesIterator) AtT() int64 {
|
|
|
|
return it.timeStamps[it.currIndex]
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *mockSeriesIterator) Next() ValueType {
|
2022-03-28 17:16:46 -07:00
|
|
|
if it.currIndex < len(it.timeStamps)-1 {
|
|
|
|
it.currIndex++
|
2022-04-05 09:31:19 -07:00
|
|
|
return ValFloat
|
2022-03-28 17:16:46 -07:00
|
|
|
}
|
|
|
|
|
2022-04-05 09:31:19 -07:00
|
|
|
return ValNone
|
2022-03-28 17:16:46 -07:00
|
|
|
}
|
|
|
|
func (it *mockSeriesIterator) Err() error { return nil }
|
|
|
|
|
2017-10-20 00:43:52 -07:00
|
|
|
// NewNopIterator returns a new chunk iterator that does not hold any data.
|
|
|
|
func NewNopIterator() Iterator {
|
|
|
|
return nopIterator{}
|
|
|
|
}
|
|
|
|
|
|
|
|
type nopIterator struct{}
|
|
|
|
|
2024-01-23 08:02:14 -08:00
|
|
|
func (nopIterator) Next() ValueType { return ValNone }
|
|
|
|
func (nopIterator) Seek(int64) ValueType { return ValNone }
|
|
|
|
func (nopIterator) At() (int64, float64) { return math.MinInt64, 0 }
|
|
|
|
func (nopIterator) AtHistogram(*histogram.Histogram) (int64, *histogram.Histogram) {
|
|
|
|
return math.MinInt64, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (nopIterator) AtFloatHistogram(*histogram.FloatHistogram) (int64, *histogram.FloatHistogram) {
|
|
|
|
return math.MinInt64, nil
|
|
|
|
}
|
|
|
|
func (nopIterator) AtT() int64 { return math.MinInt64 }
|
|
|
|
func (nopIterator) Err() error { return nil }
|
2017-10-20 00:43:52 -07:00
|
|
|
|
2019-05-06 06:47:26 -07:00
|
|
|
// Pool is used to create and reuse chunk references to avoid allocations.
|
2017-08-08 08:35:34 -07:00
|
|
|
type Pool interface {
|
|
|
|
Put(Chunk) error
|
|
|
|
Get(e Encoding, b []byte) (Chunk, error)
|
|
|
|
}
|
|
|
|
|
2019-05-06 06:47:26 -07:00
|
|
|
// pool is a memory pool of chunk objects.
|
2017-08-08 08:35:34 -07:00
|
|
|
type pool struct {
|
2022-12-20 02:03:32 -08:00
|
|
|
xor sync.Pool
|
|
|
|
histogram sync.Pool
|
|
|
|
floatHistogram sync.Pool
|
2017-08-08 08:35:34 -07:00
|
|
|
}
|
|
|
|
|
2019-05-06 06:47:26 -07:00
|
|
|
// NewPool returns a new pool.
|
2017-08-08 08:35:34 -07:00
|
|
|
func NewPool() Pool {
|
|
|
|
return &pool{
|
|
|
|
xor: sync.Pool{
|
|
|
|
New: func() interface{} {
|
2019-02-13 14:41:12 -08:00
|
|
|
return &XORChunk{b: bstream{}}
|
2017-08-08 08:35:34 -07:00
|
|
|
},
|
|
|
|
},
|
Style cleanup of all the changes in sparsehistogram so far
A lot of this code was hacked together, literally during a
hackathon. This commit intends not to change the code substantially,
but just make the code obey the usual style practices.
A (possibly incomplete) list of areas:
* Generally address linter warnings.
* The `pgk` directory is deprecated as per dev-summit. No new packages should
be added to it. I moved the new `pkg/histogram` package to `model`
anticipating what's proposed in #9478.
* Make the naming of the Sparse Histogram more consistent. Including
abbreviations, there were just too many names for it: SparseHistogram,
Histogram, Histo, hist, his, shs, h. The idea is to call it "Histogram" in
general. Only add "Sparse" if it is needed to avoid confusion with
conventional Histograms (which is rare because the TSDB really has no notion
of conventional Histograms). Use abbreviations only in local scope, and then
really abbreviate (not just removing three out of seven letters like in
"Histo"). This is in the spirit of
https://github.com/golang/go/wiki/CodeReviewComments#variable-names
* Several other minor name changes.
* A lot of formatting of doc comments. For one, following
https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences
, but also layout question, anticipating how things will look like
when rendered by `godoc` (even where `godoc` doesn't render them
right now because they are for unexported types or not a doc comment
at all but just a normal code comment - consistency is queen!).
* Re-enabled `TestQueryLog` and `TestEndopints` (they pass now,
leaving them disabled was presumably an oversight).
* Bucket iterator for histogram.Histogram is now created with a
method.
* HistogramChunk.iterator now allows iterator recycling. (I think
@dieterbe only commented it out because he was confused by the
question in the comment.)
* HistogramAppender.Append panics now because we decided to treat
staleness marker differently.
Signed-off-by: beorn7 <beorn@grafana.com>
2021-10-09 06:57:07 -07:00
|
|
|
histogram: sync.Pool{
|
2021-06-29 07:38:46 -07:00
|
|
|
New: func() interface{} {
|
Style cleanup of all the changes in sparsehistogram so far
A lot of this code was hacked together, literally during a
hackathon. This commit intends not to change the code substantially,
but just make the code obey the usual style practices.
A (possibly incomplete) list of areas:
* Generally address linter warnings.
* The `pgk` directory is deprecated as per dev-summit. No new packages should
be added to it. I moved the new `pkg/histogram` package to `model`
anticipating what's proposed in #9478.
* Make the naming of the Sparse Histogram more consistent. Including
abbreviations, there were just too many names for it: SparseHistogram,
Histogram, Histo, hist, his, shs, h. The idea is to call it "Histogram" in
general. Only add "Sparse" if it is needed to avoid confusion with
conventional Histograms (which is rare because the TSDB really has no notion
of conventional Histograms). Use abbreviations only in local scope, and then
really abbreviate (not just removing three out of seven letters like in
"Histo"). This is in the spirit of
https://github.com/golang/go/wiki/CodeReviewComments#variable-names
* Several other minor name changes.
* A lot of formatting of doc comments. For one, following
https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences
, but also layout question, anticipating how things will look like
when rendered by `godoc` (even where `godoc` doesn't render them
right now because they are for unexported types or not a doc comment
at all but just a normal code comment - consistency is queen!).
* Re-enabled `TestQueryLog` and `TestEndopints` (they pass now,
leaving them disabled was presumably an oversight).
* Bucket iterator for histogram.Histogram is now created with a
method.
* HistogramChunk.iterator now allows iterator recycling. (I think
@dieterbe only commented it out because he was confused by the
question in the comment.)
* HistogramAppender.Append panics now because we decided to treat
staleness marker differently.
Signed-off-by: beorn7 <beorn@grafana.com>
2021-10-09 06:57:07 -07:00
|
|
|
return &HistogramChunk{b: bstream{}}
|
2021-06-29 07:38:46 -07:00
|
|
|
},
|
|
|
|
},
|
2022-12-20 02:03:32 -08:00
|
|
|
floatHistogram: sync.Pool{
|
|
|
|
New: func() interface{} {
|
|
|
|
return &FloatHistogramChunk{b: bstream{}}
|
|
|
|
},
|
|
|
|
},
|
2017-08-08 08:35:34 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *pool) Get(e Encoding, b []byte) (Chunk, error) {
|
2024-01-17 09:28:06 -08:00
|
|
|
var c Chunk
|
2017-08-08 08:35:34 -07:00
|
|
|
switch e {
|
2023-03-16 03:23:47 -07:00
|
|
|
case EncXOR:
|
2024-01-17 09:28:06 -08:00
|
|
|
c = p.xor.Get().(*XORChunk)
|
Style cleanup of all the changes in sparsehistogram so far
A lot of this code was hacked together, literally during a
hackathon. This commit intends not to change the code substantially,
but just make the code obey the usual style practices.
A (possibly incomplete) list of areas:
* Generally address linter warnings.
* The `pgk` directory is deprecated as per dev-summit. No new packages should
be added to it. I moved the new `pkg/histogram` package to `model`
anticipating what's proposed in #9478.
* Make the naming of the Sparse Histogram more consistent. Including
abbreviations, there were just too many names for it: SparseHistogram,
Histogram, Histo, hist, his, shs, h. The idea is to call it "Histogram" in
general. Only add "Sparse" if it is needed to avoid confusion with
conventional Histograms (which is rare because the TSDB really has no notion
of conventional Histograms). Use abbreviations only in local scope, and then
really abbreviate (not just removing three out of seven letters like in
"Histo"). This is in the spirit of
https://github.com/golang/go/wiki/CodeReviewComments#variable-names
* Several other minor name changes.
* A lot of formatting of doc comments. For one, following
https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences
, but also layout question, anticipating how things will look like
when rendered by `godoc` (even where `godoc` doesn't render them
right now because they are for unexported types or not a doc comment
at all but just a normal code comment - consistency is queen!).
* Re-enabled `TestQueryLog` and `TestEndopints` (they pass now,
leaving them disabled was presumably an oversight).
* Bucket iterator for histogram.Histogram is now created with a
method.
* HistogramChunk.iterator now allows iterator recycling. (I think
@dieterbe only commented it out because he was confused by the
question in the comment.)
* HistogramAppender.Append panics now because we decided to treat
staleness marker differently.
Signed-off-by: beorn7 <beorn@grafana.com>
2021-10-09 06:57:07 -07:00
|
|
|
case EncHistogram:
|
2024-01-17 09:28:06 -08:00
|
|
|
c = p.histogram.Get().(*HistogramChunk)
|
2022-12-20 02:03:32 -08:00
|
|
|
case EncFloatHistogram:
|
2024-01-17 09:28:06 -08:00
|
|
|
c = p.floatHistogram.Get().(*FloatHistogramChunk)
|
|
|
|
default:
|
|
|
|
return nil, fmt.Errorf("invalid chunk encoding %q", e)
|
2017-08-08 08:35:34 -07:00
|
|
|
}
|
2024-01-17 09:28:06 -08:00
|
|
|
|
|
|
|
c.Reset(b)
|
|
|
|
return c, nil
|
2017-08-08 08:35:34 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
func (p *pool) Put(c Chunk) error {
|
2024-01-17 09:28:06 -08:00
|
|
|
var sp *sync.Pool
|
|
|
|
var ok bool
|
2017-08-08 08:35:34 -07:00
|
|
|
switch c.Encoding() {
|
2023-03-16 03:23:47 -07:00
|
|
|
case EncXOR:
|
2024-01-17 09:28:06 -08:00
|
|
|
_, ok = c.(*XORChunk)
|
|
|
|
sp = &p.xor
|
Style cleanup of all the changes in sparsehistogram so far
A lot of this code was hacked together, literally during a
hackathon. This commit intends not to change the code substantially,
but just make the code obey the usual style practices.
A (possibly incomplete) list of areas:
* Generally address linter warnings.
* The `pgk` directory is deprecated as per dev-summit. No new packages should
be added to it. I moved the new `pkg/histogram` package to `model`
anticipating what's proposed in #9478.
* Make the naming of the Sparse Histogram more consistent. Including
abbreviations, there were just too many names for it: SparseHistogram,
Histogram, Histo, hist, his, shs, h. The idea is to call it "Histogram" in
general. Only add "Sparse" if it is needed to avoid confusion with
conventional Histograms (which is rare because the TSDB really has no notion
of conventional Histograms). Use abbreviations only in local scope, and then
really abbreviate (not just removing three out of seven letters like in
"Histo"). This is in the spirit of
https://github.com/golang/go/wiki/CodeReviewComments#variable-names
* Several other minor name changes.
* A lot of formatting of doc comments. For one, following
https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences
, but also layout question, anticipating how things will look like
when rendered by `godoc` (even where `godoc` doesn't render them
right now because they are for unexported types or not a doc comment
at all but just a normal code comment - consistency is queen!).
* Re-enabled `TestQueryLog` and `TestEndopints` (they pass now,
leaving them disabled was presumably an oversight).
* Bucket iterator for histogram.Histogram is now created with a
method.
* HistogramChunk.iterator now allows iterator recycling. (I think
@dieterbe only commented it out because he was confused by the
question in the comment.)
* HistogramAppender.Append panics now because we decided to treat
staleness marker differently.
Signed-off-by: beorn7 <beorn@grafana.com>
2021-10-09 06:57:07 -07:00
|
|
|
case EncHistogram:
|
2024-01-17 09:28:06 -08:00
|
|
|
_, ok = c.(*HistogramChunk)
|
|
|
|
sp = &p.histogram
|
2022-12-20 02:03:32 -08:00
|
|
|
case EncFloatHistogram:
|
2024-01-17 09:28:06 -08:00
|
|
|
_, ok = c.(*FloatHistogramChunk)
|
|
|
|
sp = &p.floatHistogram
|
|
|
|
default:
|
|
|
|
return fmt.Errorf("invalid chunk encoding %q", c.Encoding())
|
|
|
|
}
|
|
|
|
if !ok {
|
2022-12-20 02:03:32 -08:00
|
|
|
// 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,
|
|
|
|
// we just skip it.
|
2024-01-17 09:28:06 -08:00
|
|
|
return nil
|
2017-08-08 08:35:34 -07:00
|
|
|
}
|
2024-01-17 09:28:06 -08:00
|
|
|
|
|
|
|
c.Reset(nil)
|
|
|
|
sp.Put(c)
|
2017-08-08 08:35:34 -07:00
|
|
|
return nil
|
|
|
|
}
|
2019-05-06 06:47:26 -07:00
|
|
|
|
|
|
|
// FromData returns a chunk from a byte slice of chunk data.
|
|
|
|
// This is there so that users of the library can easily create chunks from
|
|
|
|
// bytes.
|
|
|
|
func FromData(e Encoding, d []byte) (Chunk, error) {
|
|
|
|
switch e {
|
2023-03-16 03:23:47 -07:00
|
|
|
case EncXOR:
|
2019-05-06 06:47:26 -07:00
|
|
|
return &XORChunk{b: bstream{count: 0, stream: d}}, nil
|
Style cleanup of all the changes in sparsehistogram so far
A lot of this code was hacked together, literally during a
hackathon. This commit intends not to change the code substantially,
but just make the code obey the usual style practices.
A (possibly incomplete) list of areas:
* Generally address linter warnings.
* The `pgk` directory is deprecated as per dev-summit. No new packages should
be added to it. I moved the new `pkg/histogram` package to `model`
anticipating what's proposed in #9478.
* Make the naming of the Sparse Histogram more consistent. Including
abbreviations, there were just too many names for it: SparseHistogram,
Histogram, Histo, hist, his, shs, h. The idea is to call it "Histogram" in
general. Only add "Sparse" if it is needed to avoid confusion with
conventional Histograms (which is rare because the TSDB really has no notion
of conventional Histograms). Use abbreviations only in local scope, and then
really abbreviate (not just removing three out of seven letters like in
"Histo"). This is in the spirit of
https://github.com/golang/go/wiki/CodeReviewComments#variable-names
* Several other minor name changes.
* A lot of formatting of doc comments. For one, following
https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences
, but also layout question, anticipating how things will look like
when rendered by `godoc` (even where `godoc` doesn't render them
right now because they are for unexported types or not a doc comment
at all but just a normal code comment - consistency is queen!).
* Re-enabled `TestQueryLog` and `TestEndopints` (they pass now,
leaving them disabled was presumably an oversight).
* Bucket iterator for histogram.Histogram is now created with a
method.
* HistogramChunk.iterator now allows iterator recycling. (I think
@dieterbe only commented it out because he was confused by the
question in the comment.)
* HistogramAppender.Append panics now because we decided to treat
staleness marker differently.
Signed-off-by: beorn7 <beorn@grafana.com>
2021-10-09 06:57:07 -07:00
|
|
|
case EncHistogram:
|
|
|
|
return &HistogramChunk{b: bstream{count: 0, stream: d}}, nil
|
2022-12-20 02:03:32 -08:00
|
|
|
case EncFloatHistogram:
|
|
|
|
return &FloatHistogramChunk{b: bstream{count: 0, stream: d}}, nil
|
2021-06-29 07:38:46 -07:00
|
|
|
}
|
2023-11-08 00:35:46 -08:00
|
|
|
return nil, fmt.Errorf("invalid chunk encoding %q", e)
|
2021-06-29 07:38:46 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// NewEmptyChunk returns an empty chunk for the given encoding.
|
|
|
|
func NewEmptyChunk(e Encoding) (Chunk, error) {
|
|
|
|
switch e {
|
|
|
|
case EncXOR:
|
|
|
|
return NewXORChunk(), nil
|
Style cleanup of all the changes in sparsehistogram so far
A lot of this code was hacked together, literally during a
hackathon. This commit intends not to change the code substantially,
but just make the code obey the usual style practices.
A (possibly incomplete) list of areas:
* Generally address linter warnings.
* The `pgk` directory is deprecated as per dev-summit. No new packages should
be added to it. I moved the new `pkg/histogram` package to `model`
anticipating what's proposed in #9478.
* Make the naming of the Sparse Histogram more consistent. Including
abbreviations, there were just too many names for it: SparseHistogram,
Histogram, Histo, hist, his, shs, h. The idea is to call it "Histogram" in
general. Only add "Sparse" if it is needed to avoid confusion with
conventional Histograms (which is rare because the TSDB really has no notion
of conventional Histograms). Use abbreviations only in local scope, and then
really abbreviate (not just removing three out of seven letters like in
"Histo"). This is in the spirit of
https://github.com/golang/go/wiki/CodeReviewComments#variable-names
* Several other minor name changes.
* A lot of formatting of doc comments. For one, following
https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences
, but also layout question, anticipating how things will look like
when rendered by `godoc` (even where `godoc` doesn't render them
right now because they are for unexported types or not a doc comment
at all but just a normal code comment - consistency is queen!).
* Re-enabled `TestQueryLog` and `TestEndopints` (they pass now,
leaving them disabled was presumably an oversight).
* Bucket iterator for histogram.Histogram is now created with a
method.
* HistogramChunk.iterator now allows iterator recycling. (I think
@dieterbe only commented it out because he was confused by the
question in the comment.)
* HistogramAppender.Append panics now because we decided to treat
staleness marker differently.
Signed-off-by: beorn7 <beorn@grafana.com>
2021-10-09 06:57:07 -07:00
|
|
|
case EncHistogram:
|
|
|
|
return NewHistogramChunk(), nil
|
2022-12-20 02:03:32 -08:00
|
|
|
case EncFloatHistogram:
|
|
|
|
return NewFloatHistogramChunk(), nil
|
2019-05-06 06:47:26 -07:00
|
|
|
}
|
2023-11-08 00:35:46 -08:00
|
|
|
return nil, fmt.Errorf("invalid chunk encoding %q", e)
|
2019-05-06 06:47:26 -07:00
|
|
|
}
|