Fix roaring dependency, minor PR fixes.

Godeps

@@ -1,6 +1,5 @@
 collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
-github.com/RoaringBitmap/roaring d6540aab65a17321470b1661bfc52da1823871e9
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 github.com/bmizerany/pat 6226ea591a40176dd3ff9cd8eff81ed6ca721a00
 github.com/boltdb/bolt 2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8
@@ -14,6 +13,7 @@ github.com/golang/protobuf b4deda0973fb4c70b50d226b1af49f3da59f5265
 github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380
 github.com/google/go-cmp 3af367b6b30c263d47e8895973edcca9a49cf029
 github.com/influxdata/influxql 5e999e6a81820d4450f2a1f35c5597b569258f01
+github.com/influxdata/roaring d6540aab65a17321470b1661bfc52da1823871e9
 github.com/influxdata/usage-client 6d3895376368aa52a3a81d2a16e90f0f52371967
 github.com/jsternberg/zap-logfmt ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6
 github.com/jwilder/encoding b4e1701a28efcc637d9afcca7d38e495fe909a09

Gopkg.lock

@@ -17,12 +17,6 @@
   packages = ["."]
   revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"
 
-[[projects]]
-  name = "github.com/RoaringBitmap/roaring"
-  packages = ["."]
-  revision = "084ecabb327a0f98dbfca86a3774eb313921f90f"
-  source = "https://github.com/benbjohnson/roaring.git"
-
 [[projects]]
   branch = "master"
   name = "github.com/beorn7/perks"
@@ -121,6 +115,11 @@
   ]
   revision = "c661ab7db8ad858626cc7a2114e786f4e7463564"
 
+[[projects]]
+  name = "github.com/influxdata/roaring"
+  packages = ["."]
+  revision = "ec86e26aba5545a1819e1ad68e9faa0f1745fff5"
+
 [[projects]]
   branch = "master"
   name = "github.com/influxdata/usage-client"
@@ -407,6 +406,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "7930c85c9857de37ed365f33b510cf55d632fae1a07dabe92a5e0badf8e5ca43"
+  inputs-digest = "439d8ce7614902915daae4a9b249a987b3fd5ce17e6f096cffa61b20b63b40d2"
   solver-name = "gps-cdcl"
   solver-version = 1

Gopkg.toml

@@ -7,8 +7,7 @@
   branch = "master"
 
 [[constraint]]
-  name = "github.com/RoaringBitmap/roaring"
-  source = "https://github.com/influxdata/roaring.git"
+  name = "github.com/influxdata/roaring"
   revision = "ec86e26aba5545a1819e1ad68e9faa0f1745fff5"
 
 [[constraint]]

LICENSE_OF_DEPENDENCIES.md

@@ -2,7 +2,7 @@
 - bootstrap 3.3.5 [MIT LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
 - collectd.org [ISC LICENSE](https://github.com/collectd/go-collectd/blob/master/LICENSE)
 - github.com/BurntSushi/toml [MIT LICENSE](https://github.com/BurntSushi/toml/blob/master/COPYING)
-- github.com/RoaringBitmap/roaring [APACHE LICENSE](https://github.com/RoaringBitmap/roaring/blob/master/LICENSE)
+- github.com/influxdata/roaring [APACHE LICENSE](https://github.com/influxdata/roaring/blob/master/LICENSE)
 - github.com/beorn7/perks [MIT LICENSE](https://github.com/beorn7/perks/blob/master/LICENSE)
 - github.com/bmizerany/pat [MIT LICENSE](https://github.com/bmizerany/pat#license)
 - github.com/boltdb/bolt [MIT LICENSE](https://github.com/boltdb/bolt/blob/master/LICENSE)

tsdb/index/tsi1/index_files.go

@@ -188,7 +188,7 @@ func (p IndexFiles) CompactTo(w io.Writer, sfile *tsdb.SeriesFile, m, k uint64,
 	}
 
 	// Ensure block is word aligned.
-	if offset := (n) % 8; offset != 0 {
+	if offset := n % 8; offset != 0 {
 		if err := writeTo(bw, make([]byte, 8-offset), &n); err != nil {
 			return n, err
 		}

tsdb/index/tsi1/partition.go

@@ -768,7 +768,7 @@ func (p *Partition) TagKeySeriesIDIterator(name, key []byte) tsdb.SeriesIDIterat
 func (p *Partition) TagValueSeriesIDIterator(name, key, value []byte) (tsdb.SeriesIDIterator, error) {
 	fs, err := p.RetainFileSet()
 	if err != nil {
-		return nil, err // TODO(edd): this should probably return an error.
+		return nil, err
 	}
 
 	itr, err := fs.TagValueSeriesIDIterator(name, key, value)

tsdb/index/tsi1/tag_block.go

@@ -314,11 +314,15 @@ type TagBlockValueElem struct {
 	flag  byte
 	value []byte
 
+	// Legacy uvarint-encoded series data.
+	// Mutually exclusive with seriesIDSetData field.
 	series struct {
 		n    uint64 // Series count
 		data []byte // Raw series data
 	}
 
+	// Roaring bitmap encoded series data.
+	// Mutually exclusive with series.data field.
 	seriesIDSetData []byte
 
 	size int

tsdb/series_set.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/influxdata/roaring"
 )
 
 // SeriesIDSet represents a lockable bitmap of series ids.
@@ -200,8 +200,8 @@ func (s *SeriesIDSet) UnmarshalBinary(data []byte) error {
 // UnmarshalBinaryUnsafe unmarshals data into the set.
 // References to the underlying data are used so data should not be reused by caller.
 func (s *SeriesIDSet) UnmarshalBinaryUnsafe(data []byte) error {
-	s.RLock()
-	defer s.RUnlock()
+	s.Lock()
+	defer s.Unlock()
 	return s.bitmap.UnmarshalBinaryUnsafe(data)
 }
 
@@ -217,7 +217,7 @@ func (s *SeriesIDSet) Slice() []uint64 {
 	s.RLock()
 	defer s.RUnlock()
 
-	var a []uint64
+	a := make([]uint64, 0, s.bitmap.GetCardinality())
 	for _, seriesID := range s.bitmap.ToArray() {
 		a = append(a, uint64(seriesID))
 	}