Merge branch 'master' into fb-1186-updates

rbf/cursorx.go

@@ -177,7 +177,7 @@ func intoContainer(l leafCell, tx *Tx, replacing *roaring.Container, target []by
 	case ContainerTypeBitmapPtr:
 		_, bm, _ := tx.leafCellBitmap(toPgno(cpMaybe))
 		cloneMaybe := bm
-		c = roaring.RemakeContainerBitmapN(replacing, cloneMaybe, int32(l.BitN))
+		c = roaring.RemakeContainerBitmap(replacing, cloneMaybe)
 	case ContainerTypeBitmap:
 		c = roaring.RemakeContainerBitmapN(replacing, toArray64(cpMaybe), int32(l.BitN))
 	case ContainerTypeRLE:
@@ -216,9 +216,9 @@ func toContainer(l leafCell, tx *Tx) (c *roaring.Container) {
 	case ContainerTypeBitmapPtr:
 		_, bm, _ := tx.leafCellBitmap(toPgno(cpMaybe))
 		cloneMaybe := bm
-		c = roaring.NewContainerBitmap(l.BitN, cloneMaybe)
+		c = roaring.NewContainerBitmap(-1, cloneMaybe)
 	case ContainerTypeBitmap:
-		c = roaring.NewContainerBitmap(l.BitN, toArray64(cpMaybe))
+		c = roaring.NewContainerBitmap(-1, toArray64(cpMaybe))
 	case ContainerTypeRLE:
 		c = roaring.NewContainerRun(toInterval16(cpMaybe))
 	}

roaring/containers_test.go

@@ -176,6 +176,14 @@ func TestSliceContainers(t *testing.T) {
 	})
 }
 
+func TestContainersFB1247(t *testing.T) {
+	bm := [bitmapN]uint64{0xF}
+	co := NewContainerBitmap(1, bm[:])
+	co = co.bitmapToArray()
+	//should not panic
+
+}
+
 func genRun(r *rand.Rand) Interval16 {
 gen:
 	dat := r.Uint32()

roaring/roaring.go

@@ -3567,21 +3567,40 @@ func (c *Container) bitmapToArray() *Container {
 		return c
 	}
 	bitmap := c.bitmap()
-	n := int32(0)
 
-	array := make([]uint16, c.N())
-	for i, word := range bitmap {
-		for word != 0 {
-			t := word & -word
-			if roaringParanoia {
-				if n >= c.N() {
-					panic("bitmap has more bits set than container.n")
+	// FB-1247 adding an extra check just in case c.N proves to be unreliable
+	// TODO  prove this has to be reliable
+	makeArray := func(bm []uint64, ar []uint16) ([]uint16, bool, int32) {
+		n := int32(0)
+		for i, word := range bm {
+			for word != 0 {
+				t := word & -word
+				if roaringParanoia {
+					if n >= c.N() {
+						panic("bitmap has more bits set than container.n")
+					}
 				}
+				if n == int32(len(ar)) {
+					return ar, true, n
+				}
+				ar[n] = uint16((i*64 + int(popcount(t-1))))
+				n++
+				word ^= t
 			}
-			array[n] = uint16((i*64 + int(popcount(t-1))))
-			n++
-			word ^= t
 		}
+		return ar, false, n
+	}
+	array, fail, n := makeArray(bitmap, make([]uint16, c.N()))
+	if fail {
+		// the onlyreason we are here is because N was incorrect
+		// so we force a recount of N and try again
+		c.bitmapRepair()
+		array, fail, n = makeArray(bitmap, make([]uint16, c.N()))
+		if fail {
+			//this should not be able to happen under any circumstance
+			panic("bitmapToArray failure")
+		}
+
 	}
 	if roaringParanoia {
 		if n != c.N() {