scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-07 17:15:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug fixes found by running container operation tests

Browse source
This commit is contained in:
Travis Turner 2018-02-14 13:30:38 -06:00
parent aaf4e3ca62
commit 5f09048914
No known key found for this signature in database
GPG key ID: 7F08008DFD9314C9
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
roaring/roaring.go
View file

@ -2178,7 +2178,7 @@ func unionArrayArray(a, b *container) *container {
// unionArrayRun optimistically assumes that the result will be a run container,
// and converts to a bitmap or array container afterwards if necessary.
func unionArrayRun(a, b *container) *container {
if b.n == maxContainerVal {
if b.n == maxContainerVal+1 {
return b.clone()
}
output := &container{containerType: ContainerRun}
@ -2235,10 +2235,10 @@ func (c *container) runAppendInterval(v interval16) int {
}
func unionRunRun(a, b *container) *container {
if a.n == maxContainerVal {
if a.n == maxContainerVal+1 {
return a.clone()
}
if b.n == maxContainerVal {
if b.n == maxContainerVal+1 {
return b.clone()
}
na, nb := len(a.runs), len(b.runs)
@ -2269,9 +2269,12 @@ func unionRunRun(a, b *container) *container {
}
func unionBitmapRun(a, b *container) *container {
if b.n == maxContainerVal {
if b.n == maxContainerVal+1 {
return b.clone()
}
if a.n == maxContainerVal+1 {
return a.clone()
}
output := a.clone()
for j := 0; j < len(b.runs); j++ {
output.bitmapSetRange(uint64(b.runs[j].start), uint64(b.runs[j].last)+1)
@ -2286,7 +2289,7 @@ func (c *container) bitmapSetRange(i, j uint64) {
x := i >> 6
y := (j - 1) >> 6
var X uint64 = maxBitmap << (i % 64)
var Y uint64 = maxBitmap >> (64 - (j % 64))
var Y uint64 = maxBitmap >> (63 - ((j - 1) % 64))
xcnt := popcnt(X)
ycnt := popcnt(Y)
if x == y {
@ -2309,7 +2312,7 @@ func (c *container) bitmapXorRange(i, j uint64) {
x := i >> 6
y := (j - 1) >> 6
var X uint64 = maxBitmap << (i % 64)
var Y uint64 = maxBitmap >> (64 - (j % 64))
var Y uint64 = maxBitmap >> (63 - ((j - 1) % 64))
if x == y {
cnt := popcnt(c.bitmap[x])
c.bitmap[x] ^= (X & Y) //// flip
@ -2781,7 +2784,9 @@ func xorArrayBitmap(a, b *container) *container {
}
}
if output.count() < ArrayMaxSize {
// It's possible that output was converted from bitmap to array in output.remove()
// so we only do this conversion if output is still a bitmap container.
if output.containerType == ContainerBitmap && output.count() < ArrayMaxSize {
output.bitmapToArray()
}
@ -3196,7 +3201,7 @@ func xorRunRun(a, b *container) *container {
if nb == 0 {
return a.clone()
}
output := &container{}
output := &container{containerType: ContainerRun}
lastI, lastJ := -1, -1