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

address review comments, fix index tests

Browse source
This commit is contained in:
Shubheksha Jalan 2018-01-11 13:20:42 +05:30
parent 510dc17066
commit 7b27dc2109
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
block.go
View file

@ -152,7 +152,7 @@ type BlockMeta struct {
// Information on compactions the block was created from. // Information on compactions the block was created from.
Compaction BlockMetaCompaction `json:"compaction"` Compaction BlockMetaCompaction `json:"compaction"`
// Version of the index format // Version of the index format.
Version int `json:"version"` Version int `json:"version"`
} }

19
index/index.go
View file

@ -268,7 +268,6 @@ func (w *Writer) AddSeries(ref uint64, lset labels.Labels, chunks ...chunks.Meta
} }
w.addPadding(16) w.addPadding(16)
w.seriesOffsets[ref] = w.pos / 16 w.seriesOffsets[ref] = w.pos / 16
w.Version = 2
w.buf2.reset() w.buf2.reset()
w.buf2.putUvarint(len(lset)) w.buf2.putUvarint(len(lset))
@ -572,24 +571,24 @@ func (b realByteSlice) Sub(start, end int) ByteSlice {
} }
// NewReader returns a new IndexReader on the given byte slice. // NewReader returns a new IndexReader on the given byte slice.
func NewReader(b ByteSlice, v int) (*Reader, error) { func NewReader(b ByteSlice, version int) (*Reader, error) {
return newReader(b, nil, v) return newReader(b, nil, version)
} }
func NewReaderV1(b ByteSlice, c io.Closer, v int) (*Reader, error) { func NewReaderV1(b ByteSlice, c io.Closer, version int) (*Reader, error) {
return newReader(b, c, v) return newReader(b, c, version)
} }
// NewFileReader returns a new index reader against the given index file. // NewFileReader returns a new index reader against the given index file.
func NewFileReader(path string, v int) (*Reader, error) { func NewFileReader(path string, version int) (*Reader, error) {
f, err := fileutil.OpenMmapFile(path) f, err := fileutil.OpenMmapFile(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return newReader(realByteSlice(f.Bytes()), f, v) return newReader(realByteSlice(f.Bytes()), f, version)
} }
func newReader(b ByteSlice, c io.Closer, v int) (*Reader, error) { func newReader(b ByteSlice, c io.Closer, version int) (*Reader, error) {
r := &Reader{ r := &Reader{
b: b, b: b,
c: c, c: c,
@ -597,7 +596,7 @@ func newReader(b ByteSlice, c io.Closer, v int) (*Reader, error) {
labels: map[string]uint32{}, labels: map[string]uint32{},
postings: map[labels.Label]uint32{}, postings: map[labels.Label]uint32{},
crc32: newCRC32(), crc32: newCRC32(),
version: v, version: version,
} }
// Verify magic number. // Verify magic number.
if b.Len() < 4 { if b.Len() < 4 {
@ -866,7 +865,7 @@ func (r *Reader) LabelIndices() ([][]string, error) {
return res, nil return res, nil
} }
// Reads the series with the given ID and writes its labels and chunks into lbls and chks. // Series reads the series with the given ID and writes its labels and chunks into lbls and chks.
func (r *Reader) Series(id uint64, lbls *labels.Labels, chks *[]chunks.Meta) error { func (r *Reader) Series(id uint64, lbls *labels.Labels, chks *[]chunks.Meta) error {
offset := id offset := id
if r.version == 2 { if r.version == 2 {

8
index/index_test.go
View file

@ -160,7 +160,7 @@ func TestIndexRW_Create_Open(t *testing.T) {
testutil.Ok(t, err) testutil.Ok(t, err)
testutil.Ok(t, iw.Close()) testutil.Ok(t, iw.Close())
ir, err := NewFileReader(fn) ir, err := NewFileReader(fn, 1)
testutil.Ok(t, err) testutil.Ok(t, err)
testutil.Ok(t, ir.Close()) testutil.Ok(t, ir.Close())
@ -170,7 +170,7 @@ func TestIndexRW_Create_Open(t *testing.T) {
_, err = f.WriteAt([]byte{0, 0}, 0) _, err = f.WriteAt([]byte{0, 0}, 0)
testutil.Ok(t, err) testutil.Ok(t, err)
_, err = NewFileReader(dir) _, err = NewFileReader(dir, 1)
testutil.NotOk(t, err) testutil.NotOk(t, err)
} }
@ -213,7 +213,7 @@ func TestIndexRW_Postings(t *testing.T) {
testutil.Ok(t, iw.Close()) testutil.Ok(t, iw.Close())
ir, err := NewFileReader(fn) ir, err := NewFileReader(fn, 2)
testutil.Ok(t, err) testutil.Ok(t, err)
p, err := ir.Postings("a", "1") p, err := ir.Postings("a", "1")
@ -331,7 +331,7 @@ func TestPersistence_index_e2e(t *testing.T) {
err = iw.Close() err = iw.Close()
testutil.Ok(t, err) testutil.Ok(t, err)
ir, err := NewFileReader(filepath.Join(dir, "index")) ir, err := NewFileReader(filepath.Join(dir, "index"), 2)
testutil.Ok(t, err) testutil.Ok(t, err)
for p := range mi.postings { for p := range mi.postings {