Merge pull request #229 from alldroll/runtime_container_bug_fix

Fixed bug with runtime container "index out of range".
RoaringBitmap · Aug 14, 2019 · 4208ad8 · 4208ad8
2 parents 55181d0 + a4937ad
commit 4208ad8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/container_test.go b/container_test.go
@@ -71,7 +71,7 @@ func testContainerIteratorPeekNext(t *testing.T, c container) {
 }
 
 func testContainerIteratorAdvance(t *testing.T, con container) {
-	values := []uint16{2, 15, 16, 31, 32, 33, 9999}
+	values := []uint16{1, 2, 15, 16, 31, 32, 33, 9999}
 	for _, v := range values {
 		con.iadd(v)
 	}
@@ -80,8 +80,8 @@ func testContainerIteratorAdvance(t *testing.T, con container) {
 		minval   uint16
 		expected uint16
 	}{
-		{0, 2},
-		{1, 2},
+		{0, 1},
+		{1, 1},
 		{2, 2},
 		{3, 15},
 		{30, 31},

diff --git a/roaring_test.go b/roaring_test.go
@@ -2197,7 +2197,7 @@ func TestIteratorPeekNext(t *testing.T) {
 }
 
 func TestIteratorAdvance(t *testing.T) {
-	values := []uint32{2, 15, 16, 31, 32, 33, 9999, MaxUint16}
+	values := []uint32{1, 2, 15, 16, 31, 32, 33, 9999, MaxUint16}
 	bm := New()
 	for n := 0; n < len(values); n++ {
 		bm.Add(values[n])
@@ -2207,8 +2207,8 @@ func TestIteratorAdvance(t *testing.T) {
 		minval   uint32
 		expected uint32
 	}{
-		{0, 2},
-		{1, 2},
+		{0, 1},
+		{1, 1},
 		{2, 2},
 		{3, 15},
 		{30, 31},

diff --git a/runcontainer.go b/runcontainer.go
@@ -1250,7 +1250,10 @@ func (ri *runIterator16) advanceIfNeeded(minval uint16) {
 			ri.curIndex = interval
 		}
 
-		ri.curPosInIndex = ri.rc.iv[ri.curIndex].length
+		// we should set a position to the previous container, only if the iterator doesn't point on the first container
+		if ri.curIndex >= 0 {
+			ri.curPosInIndex = ri.rc.iv[ri.curIndex].length
+		}
 	}
 
 	for ri.hasNext() && ri.peekNext() < minval {