scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-09 12:27:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't call isArray on a nil *Container

Browse source 
differenceInPlace wasn't checking for nil containers, which are
theoretically valid empty containers. Also added a couple of other
N==0 checks to streamline the higher-level operation.
This commit is contained in:
Seebs 2020-03-31 11:03:29 -05:00
parent 3b6a26e5c6
commit d26e221a91
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
roaring/roaring.go
View file

@ -5540,6 +5540,10 @@ func (b *Bitmap) DifferenceInPlace(others ...*Bitmap) {
// Go through all the containers and remove the other bits
for targetItr.Next() {
targetKey, curContainer := targetItr.Value()
// no point in subtracting things from an empty container.
if curContainer.N() == 0 {
removeContainerKeys = append(removeContainerKeys, targetKey)
}
// Loop until every iters current value has been handled.
for _, iIter := range bitmapIters {
if !iIter.hasNext {
@ -5554,16 +5558,18 @@ func (b *Bitmap) DifferenceInPlace(others ...*Bitmap) {
break
}
}
if targetKey == iKey {
if curContainer.frozen() {
curContainer = curContainer.Clone()
b.Containers.Put(targetKey, curContainer)
}
curContainer.differenceInPlace(iContainer)
if curContainer.N() == 0 {
removeContainerKeys = append(removeContainerKeys, iKey)
break
// note: a nil container is valid, and has N == 0.
if iContainer.N() != 0 {
if curContainer.frozen() {
curContainer = curContainer.Clone()
b.Containers.Put(targetKey, curContainer)
}
curContainer.differenceInPlace(iContainer)
if curContainer.N() == 0 {
removeContainerKeys = append(removeContainerKeys, targetKey)
break
}
}
iIter.hasNext = iIter.iter.Next()
}
@ -5578,6 +5584,9 @@ func (b *Bitmap) DifferenceInPlace(others ...*Bitmap) {
}
func (c *Container) differenceInPlace(other *Container) {
if other == nil {
return
}
if other.isArray() {
if c.isArray() {
differenceArrayArrayInPlace(c, other)