Browse Source

Merge pull request #13205 from aknuds1/arve/typos

`chunks.Reader`: Fix typo in `ChunkOrIterable` doc string
pull/13283/head
Björn Rabenstein 12 months ago committed by GitHub
parent
commit
669cad6e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      model/histogram/float_histogram.go
  2. 2
      tsdb/chunks/chunks.go

1
model/histogram/float_histogram.go

@ -318,7 +318,6 @@ func (h *FloatHistogram) Sub(other *FloatHistogram) *FloatHistogram {
hPositiveSpans, hPositiveBuckets = reduceResolution(hPositiveSpans, hPositiveBuckets, h.Schema, other.Schema, false, true)
hNegativeSpans, hNegativeBuckets = reduceResolution(hNegativeSpans, hNegativeBuckets, h.Schema, other.Schema, false, true)
h.Schema = other.Schema
case other.Schema > h.Schema:
otherPositiveSpans, otherPositiveBuckets = reduceResolution(otherPositiveSpans, otherPositiveBuckets, other.Schema, h.Schema, false, false)
otherNegativeSpans, otherNegativeBuckets = reduceResolution(otherNegativeSpans, otherNegativeBuckets, other.Schema, h.Schema, false, false)

2
tsdb/chunks/chunks.go

@ -671,7 +671,7 @@ func (s *Reader) Size() int64 {
return s.size
}
// Chunk returns a chunk from a given reference.
// ChunkOrIterable returns a chunk from a given reference.
func (s *Reader) ChunkOrIterable(meta Meta) (chunkenc.Chunk, chunkenc.Iterable, error) {
sgmIndex, chkStart := BlockChunkRef(meta.Ref).Unpack()

Loading…
Cancel
Save