From eeaabff7fe78a4cf5c7f69d49771b3ebbc3f49be Mon Sep 17 00:00:00 2001
From: Travis <travis@pilosa.com>
Date: Tue, 20 Jun 2017 16:46:40 -0500
Subject: [PATCH] Standardize the default iterator value for j to -1 for both
 arrays and runs

---
 roaring/roaring.go      | 18 ++++++++++++++----
 roaring/roaring_test.go | 12 +++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/roaring/roaring.go b/roaring/roaring.go
index 80dbfa79a..bb802f00c 100644
--- a/roaring/roaring.go
+++ b/roaring/roaring.go
@@ -828,13 +828,13 @@ type BitmapInfo struct {
 // Iterator represents an iterator over a Bitmap.
 type Iterator struct {
 	bitmap  *Bitmap
-	i, j, k int // i: container; j: array index, bit index, or run index; k:
+	i, j, k int // i: container; j: array index, bit index, or run index; k: offset within the run
 }
 
 // eof returns true if the iterator is at the end of the bitmap.
 func (itr *Iterator) eof() bool { return itr.i >= len(itr.bitmap.containers) }
 
-// Seek moves to the first value equal to or greater than v.
+// Seek moves to the first value equal to or greater than `seek`.
 func (itr *Iterator) Seek(seek uint64) {
 	// Move to the correct container.
 	itr.i = search64(itr.bitmap.keys, highbits(seek))
@@ -845,7 +845,7 @@ func (itr *Iterator) Seek(seek uint64) {
 		return
 	}
 
-	// Move to the correct value index inside the array container.
+	// Move to the correct value index inside the container.
 	lb := lowbits(seek)
 	c := itr.bitmap.containers[itr.i]
 	if c.isArray() {
@@ -907,6 +907,16 @@ func (itr *Iterator) Next() (v uint64, eof bool) {
 		}
 
 		if c.isRun() {
+			// Because itr.j for an array container defaults to -1
+			// but defaults to 0 for a run container, we need to
+			// standardize on treating -1 as our default value for itr.j.
+			// Note that this is easier than changing the default to 0
+			// because the array logic uses the negative number space
+			// to represent offsets to an array position that isn't filled
+			// (-1 being the first empty space in an array, or 0).
+			if itr.j == -1 {
+				itr.j++
+			}
 			r := c.runs[itr.j]
 			runLength := int(r.last - r.start)
 
@@ -917,7 +927,7 @@ func (itr *Iterator) Next() (v uint64, eof bool) {
 
 			if itr.j >= len(c.runs) {
 				// Reached end of runs, move to the next container.
-				itr.i, itr.j = itr.i+1, 0
+				itr.i, itr.j = itr.i+1, -1
 				continue
 			}
 
diff --git a/roaring/roaring_test.go b/roaring/roaring_test.go
index 8150f4376..98ffc8157 100644
--- a/roaring/roaring_test.go
+++ b/roaring/roaring_test.go
@@ -15,8 +15,8 @@
 package roaring_test
 
 import (
-	"fmt"
 	"bytes"
+	"fmt"
 	"math"
 	"math/rand"
 	"reflect"
@@ -78,6 +78,16 @@ func TestCheckRun(t *testing.T) {
 	}
 }
 
+// Ensure that we can transition between runs and arrays when materializing the bitmap.
+func TestContainerTransitions(t *testing.T) {
+	// [run, run][array][run]
+	b := roaring.NewBitmap(0, 1, 2, 3, 4, 5, 1000, 1001, 1002, 1003, 1004, 1005, 100000, 100001, 100002, 132000, 132001, 132002, 132003, 132004, 132005)
+	b.Optimize() // convert to runs
+	if !reflect.DeepEqual(b.Slice(), []uint64{0, 1, 2, 3, 4, 5, 1000, 1001, 1002, 1003, 1004, 1005, 100000, 100001, 100002, 132000, 132001, 132002, 132003, 132004, 132005}) {
+		t.Fatalf("unexpected slice: %+v", b.Slice())
+	}
+}
+
 // Ensure an empty bitmap returns false if checking for existence.
 func TestBitmap_Contains_Empty(t *testing.T) {
 	if roaring.NewBitmap().Contains(1000) {