trust cell.BitN a few more places

Found a couple of places where we were still not trusting this, but really
we're testing it a lot more carefully now.
This commit is contained in:
Seebs 2022-03-30 15:16:25 -05:00
parent 9acc7a6019
commit 5148974602

View file

@ -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.RemakeContainerBitmap(replacing, cloneMaybe)
c = roaring.RemakeContainerBitmapN(replacing, cloneMaybe, int32(l.BitN))
case ContainerTypeBitmap:
c = roaring.RemakeContainerBitmapN(replacing, toArray64(cpMaybe), int32(l.BitN))
case ContainerTypeRLE:
@ -245,11 +245,11 @@ func toContainer(l leafCell, tx *Tx) (c *roaring.Container) {
case ContainerTypeBitmapPtr:
_, bm, _ := tx.leafCellBitmap(toPgno(cpMaybe))
cloneMaybe := bm
c = roaring.NewContainerBitmap(-1, cloneMaybe)
c = roaring.NewContainerBitmap(l.BitN, cloneMaybe)
case ContainerTypeBitmap:
c = roaring.NewContainerBitmap(-1, toArray64(cpMaybe))
c = roaring.NewContainerBitmap(l.BitN, toArray64(cpMaybe))
case ContainerTypeRLE:
c = roaring.NewContainerRun(toInterval16(cpMaybe))
c = roaring.NewContainerRunN(toInterval16(cpMaybe), int32(l.BitN))
}
// Note: If the "roaringparanoia" build tag isn't set, this
// should be optimized away entirely. Otherwise it's moderately