From 7b27dc2109b5bc1c0e2adef0cc6eb70f3c31af4b Mon Sep 17 00:00:00 2001
From: Shubheksha Jalan <jshubheksha@gmail.com>
Date: Thu, 11 Jan 2018 13:20:42 +0530
Subject: [PATCH] address review comments, fix index tests

---
 block.go            |  2 +-
 index/index.go      | 19 +++++++++----------
 index/index_test.go |  8 ++++----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/block.go b/block.go
index 35466c29ec..2dab0c32d5 100644
--- a/block.go
+++ b/block.go
@@ -152,7 +152,7 @@ type BlockMeta struct {
 	// Information on compactions the block was created from.
 	Compaction BlockMetaCompaction `json:"compaction"`
 
-	// Version of the index format
+	// Version of the index format.
 	Version int `json:"version"`
 }
 
diff --git a/index/index.go b/index/index.go
index 7decaa5176..f49b9236ec 100644
--- a/index/index.go
+++ b/index/index.go
@@ -268,7 +268,6 @@ func (w *Writer) AddSeries(ref uint64, lset labels.Labels, chunks ...chunks.Meta
 	}
 	w.addPadding(16)
 	w.seriesOffsets[ref] = w.pos / 16
-	w.Version = 2
 
 	w.buf2.reset()
 	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.
-func NewReader(b ByteSlice, v int) (*Reader, error) {
-	return newReader(b, nil, v)
+func NewReader(b ByteSlice, version int) (*Reader, error) {
+	return newReader(b, nil, version)
 }
 
-func NewReaderV1(b ByteSlice, c io.Closer, v int) (*Reader, error) {
-	return newReader(b, c, v)
+func NewReaderV1(b ByteSlice, c io.Closer, version int) (*Reader, error) {
+	return newReader(b, c, version)
 }
 
 // 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)
 	if err != nil {
 		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{
 		b:        b,
 		c:        c,
@@ -597,7 +596,7 @@ func newReader(b ByteSlice, c io.Closer, v int) (*Reader, error) {
 		labels:   map[string]uint32{},
 		postings: map[labels.Label]uint32{},
 		crc32:    newCRC32(),
-		version:  v,
+		version:  version,
 	}
 	// Verify magic number.
 	if b.Len() < 4 {
@@ -866,7 +865,7 @@ func (r *Reader) LabelIndices() ([][]string, error) {
 	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 {
 	offset := id
 	if r.version == 2 {
diff --git a/index/index_test.go b/index/index_test.go
index 83b6ef6574..65ef9b6e67 100644
--- a/index/index_test.go
+++ b/index/index_test.go
@@ -160,7 +160,7 @@ func TestIndexRW_Create_Open(t *testing.T) {
 	testutil.Ok(t, err)
 	testutil.Ok(t, iw.Close())
 
-	ir, err := NewFileReader(fn)
+	ir, err := NewFileReader(fn, 1)
 	testutil.Ok(t, err)
 	testutil.Ok(t, ir.Close())
 
@@ -170,7 +170,7 @@ func TestIndexRW_Create_Open(t *testing.T) {
 	_, err = f.WriteAt([]byte{0, 0}, 0)
 	testutil.Ok(t, err)
 
-	_, err = NewFileReader(dir)
+	_, err = NewFileReader(dir, 1)
 	testutil.NotOk(t, err)
 }
 
@@ -213,7 +213,7 @@ func TestIndexRW_Postings(t *testing.T) {
 
 	testutil.Ok(t, iw.Close())
 
-	ir, err := NewFileReader(fn)
+	ir, err := NewFileReader(fn, 2)
 	testutil.Ok(t, err)
 
 	p, err := ir.Postings("a", "1")
@@ -331,7 +331,7 @@ func TestPersistence_index_e2e(t *testing.T) {
 	err = iw.Close()
 	testutil.Ok(t, err)
 
-	ir, err := NewFileReader(filepath.Join(dir, "index"))
+	ir, err := NewFileReader(filepath.Join(dir, "index"), 2)
 	testutil.Ok(t, err)
 
 	for p := range mi.postings {