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

Rename SeriesShard to Shard

Browse source
This commit is contained in:
Fabian Reinartz 2016-12-15 08:36:09 +01:00
parent 9873e18b75
commit 5424a0cf75
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
db.go
View file

@ -35,14 +35,14 @@ type DB struct {
opts *Options opts *Options
path string path string
shards []*SeriesShard shards []*Shard
} }
// TODO(fabxc): make configurable // TODO(fabxc): make configurable
const ( const (
seriesShardShift = 2 shardShift = 2
numSeriesShards = 1 << seriesShardShift numShards = 1 << shardShift
maxChunkSize = 1024 maxChunkSize = 1024
) )
// Open or create a new DB. // Open or create a new DB.
@ -67,11 +67,11 @@ func Open(path string, l log.Logger, opts *Options) (*DB, error) {
// Initialize vertical shards. // Initialize vertical shards.
// TODO(fabxc): validate shard number to be power of 2, which is required // TODO(fabxc): validate shard number to be power of 2, which is required
// for the bitshift-modulo when finding the right shard. // for the bitshift-modulo when finding the right shard.
for i := 0; i < numSeriesShards; i++ { for i := 0; i < numShards; i++ {
l := log.NewContext(l).With("shard", i) l := log.NewContext(l).With("shard", i)
d := shardDir(path, i) d := shardDir(path, i)
s, err := NewSeriesShard(d, l) s, err := OpenShard(d, l)
if err != nil { if err != nil {
return nil, fmt.Errorf("initializing shard %q failed: %s", d, err) return nil, fmt.Errorf("initializing shard %q failed: %s", d, err)
} }
@ -139,7 +139,7 @@ func (v *Vector) Reset() {
// Add a sample to the vector. // Add a sample to the vector.
func (v *Vector) Add(lset Labels, val float64) { func (v *Vector) Add(lset Labels, val float64) {
h := lset.Hash() h := lset.Hash()
s := uint16(h >> (64 - seriesShardShift)) s := uint16(h >> (64 - shardShift))
v.Buckets[s] = append(v.Buckets[s], Sample{ v.Buckets[s] = append(v.Buckets[s], Sample{
Hash: h, Hash: h,
@ -185,7 +185,7 @@ func (db *DB) AppendVector(ts int64, v *Vector) error {
func (db *DB) AppendSingle(lset Labels, ts int64, v float64) error { func (db *DB) AppendSingle(lset Labels, ts int64, v float64) error {
sort.Sort(lset) sort.Sort(lset)
h := lset.Hash() h := lset.Hash()
s := uint16(h >> (64 - seriesShardShift)) s := uint16(h >> (64 - shardShift))
return db.shards[s].appendBatch(ts, []Sample{ return db.shards[s].appendBatch(ts, []Sample{
{ {
@ -198,9 +198,9 @@ func (db *DB) AppendSingle(lset Labels, ts int64, v float64) error {
const sep = '\xff' const sep = '\xff'
// SeriesShard handles reads and writes of time series falling into // Shard handles reads and writes of time series falling into
// a hashed shard of a series. // a hashed shard of a series.
type SeriesShard struct { type Shard struct {
path string path string
persistCh chan struct{} persistCh chan struct{}
logger log.Logger logger log.Logger
@ -210,8 +210,8 @@ type SeriesShard struct {
head *HeadBlock head *HeadBlock
} }
// NewSeriesShard returns a new SeriesShard. // OpenShard returns a new Shard.
func NewSeriesShard(path string, logger log.Logger) (*SeriesShard, error) { func OpenShard(path string, logger log.Logger) (*Shard, error) {
// Create directory if shard is new. // Create directory if shard is new.
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
if err := os.MkdirAll(path, 0777); err != nil { if err := os.MkdirAll(path, 0777); err != nil {
@ -225,7 +225,7 @@ func NewSeriesShard(path string, logger log.Logger) (*SeriesShard, error) {
return nil, err return nil, err
} }
s := &SeriesShard{ s := &Shard{
path: path, path: path,
persistCh: make(chan struct{}, 1), persistCh: make(chan struct{}, 1),
logger: logger, logger: logger,
@ -240,8 +240,8 @@ func NewSeriesShard(path string, logger log.Logger) (*SeriesShard, error) {
return s, nil return s, nil
} }
// Close the series shard. // Close the shard.
func (s *SeriesShard) Close() error { func (s *Shard) Close() error {
var e MultiError var e MultiError
for _, pb := range s.persisted { for _, pb := range s.persisted {
@ -251,7 +251,7 @@ func (s *SeriesShard) Close() error {
return e.Err() return e.Err()
} }
func (s *SeriesShard) appendBatch(ts int64, samples []Sample) error { func (s *Shard) appendBatch(ts int64, samples []Sample) error {
// TODO(fabxc): make configurable. // TODO(fabxc): make configurable.
const persistenceTimeThreshold = 1000 * 60 * 60 // 1 hour if timestamp in ms const persistenceTimeThreshold = 1000 * 60 * 60 // 1 hour if timestamp in ms
@ -283,14 +283,14 @@ func (s *SeriesShard) appendBatch(ts int64, samples []Sample) error {
// blocksForRange returns all blocks within the shard that may contain // blocksForRange returns all blocks within the shard that may contain
// data for the given time range. // data for the given time range.
func (s *SeriesShard) blocksForRange(mint, maxt int64) (bs []Block) { func (s *Shard) blocksForRange(mint, maxt int64) (bs []Block) {
return []Block{s.head} return []Block{s.head}
} }
// TODO(fabxc): make configurable. // TODO(fabxc): make configurable.
const shardGracePeriod = 60 * 1000 // 60 seconds for millisecond scale const shardGracePeriod = 60 * 1000 // 60 seconds for millisecond scale
func (s *SeriesShard) persist() error { func (s *Shard) persist() error {
s.mtx.Lock() s.mtx.Lock()
// Set new head block. // Set new head block.

2
querier.go
View file

@ -110,7 +110,7 @@ type shardQuerier struct {
// Querier returns a new querier over the data shard for the given // Querier returns a new querier over the data shard for the given
// time range. // time range.
func (s *SeriesShard) Querier(mint, maxt int64) Querier { func (s *Shard) Querier(mint, maxt int64) Querier {
blocks := s.blocksForRange(mint, maxt) blocks := s.blocksForRange(mint, maxt)
sq := &shardQuerier{ sq := &shardQuerier{