Browse Source

tsdb/chunkenc: use Go standard errors package

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
pull/13108/head
Matthieu MOREL 1 year ago
parent
commit
b60f9f801e
  1. 11
      tsdb/chunkenc/chunk.go
  2. 7
      tsdb/chunkenc/varbit.go

11
tsdb/chunkenc/chunk.go

@ -14,11 +14,10 @@
package chunkenc package chunkenc
import ( import (
"fmt"
"math" "math"
"sync" "sync"
"github.com/pkg/errors"
"github.com/prometheus/prometheus/model/histogram" "github.com/prometheus/prometheus/model/histogram"
) )
@ -293,7 +292,7 @@ func (p *pool) Get(e Encoding, b []byte) (Chunk, error) {
c.b.count = 0 c.b.count = 0
return c, nil return c, nil
} }
return nil, errors.Errorf("invalid chunk encoding %q", e) return nil, fmt.Errorf("invalid chunk encoding %q", e)
} }
func (p *pool) Put(c Chunk) error { func (p *pool) Put(c Chunk) error {
@ -332,7 +331,7 @@ func (p *pool) Put(c Chunk) error {
sh.b.count = 0 sh.b.count = 0
p.floatHistogram.Put(c) p.floatHistogram.Put(c)
default: default:
return errors.Errorf("invalid chunk encoding %q", c.Encoding()) return fmt.Errorf("invalid chunk encoding %q", c.Encoding())
} }
return nil return nil
} }
@ -349,7 +348,7 @@ func FromData(e Encoding, d []byte) (Chunk, error) {
case EncFloatHistogram: case EncFloatHistogram:
return &FloatHistogramChunk{b: bstream{count: 0, stream: d}}, nil return &FloatHistogramChunk{b: bstream{count: 0, stream: d}}, nil
} }
return nil, errors.Errorf("invalid chunk encoding %q", e) return nil, fmt.Errorf("invalid chunk encoding %q", e)
} }
// NewEmptyChunk returns an empty chunk for the given encoding. // NewEmptyChunk returns an empty chunk for the given encoding.
@ -362,5 +361,5 @@ func NewEmptyChunk(e Encoding) (Chunk, error) {
case EncFloatHistogram: case EncFloatHistogram:
return NewFloatHistogramChunk(), nil return NewFloatHistogramChunk(), nil
} }
return nil, errors.Errorf("invalid chunk encoding %q", e) return nil, fmt.Errorf("invalid chunk encoding %q", e)
} }

7
tsdb/chunkenc/varbit.go

@ -14,9 +14,8 @@
package chunkenc package chunkenc
import ( import (
"fmt"
"math/bits" "math/bits"
"github.com/pkg/errors"
) )
// putVarbitInt writes an int64 using varbit encoding with a bit bucketing // putVarbitInt writes an int64 using varbit encoding with a bit bucketing
@ -109,7 +108,7 @@ func readVarbitInt(b *bstreamReader) (int64, error) {
val = int64(bits) val = int64(bits)
default: default:
return 0, errors.Errorf("invalid bit pattern %b", d) return 0, fmt.Errorf("invalid bit pattern %b", d)
} }
if sz != 0 { if sz != 0 {
@ -215,7 +214,7 @@ func readVarbitUint(b *bstreamReader) (uint64, error) {
return 0, err return 0, err
} }
default: default:
return 0, errors.Errorf("invalid bit pattern %b", d) return 0, fmt.Errorf("invalid bit pattern %b", d)
} }
if sz != 0 { if sz != 0 {

Loading…
Cancel
Save