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

optimize unionArrayBitmap

Browse source
This commit is contained in:
Todd Gruben 2017-09-15 21:57:23 -05:00 • committed by Travis
parent 48f34836e5
commit 50dab75c82
No known key found for this signature in database
GPG key ID: 7F08008DFD9314C9
2 changed files with 16 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
roaring/roaring.go
View file

@ -2378,33 +2378,14 @@ func (c *container) bitmapZeroRange(i, j uint64) {
}
func unionArrayBitmap(a, b *container) *container {
output := &container{container_type: ContainerArray}
itr := newBufBitmapIterator(newBitmapIterator(b.bitmap))
for i := 0; ; {
vb, eof := itr.next()
if i >= len(a.array) && eof {
break
} else if i >= len(a.array) {
output.add(vb)
continue
} else if eof {
output.add(a.array[i])
i++
continue
}
va := a.array[i]
if va < vb {
output.add(va)
i++
itr.unread()
} else if va > vb {
output.add(vb)
} else {
output.add(va)
i++
output := b.clone()
for _, v := range a.array {
if !output.bitmapContains(v) {
output.bitmap[v/64] |= (1 << uint64(v%64))
output.n++
}
}
return output
}

16
roaring/roaring_internal_test.go
View file

@ -647,7 +647,6 @@ func TestIntersectBitmapRunArray(t *testing.T) {
func TestUnionMixed(t *testing.T) {
a := &container{}
b := &container{}
c := &container{}
a.runs = []interval16{{start: 5, last: 10}}
a.container_type = ContainerRun
@ -669,24 +668,30 @@ func TestUnionMixed(t *testing.T) {
if !reflect.DeepEqual(res.runs, []interval16{{start: 5, last: 10}}) {
t.Fatalf("test #3 expected %v, but got %v", []interval16{{start: 5, last: 10}}, res.runs)
}
c.bitmap = []uint64{0x3}
c := &container{bitmap: make([]uint64, bitmapN)}
c.bitmap[0] = uint64(0x3)
c.n = 2
c.container_type = ContainerBitmap
expected := make([]uint64, bitmapN)
expected[0] = uint64(2019)
res = union(c, a)
if !reflect.DeepEqual(res.bitmap, []uint64{2019}) {
if !reflect.DeepEqual(res.bitmap, expected) {
t.Fatalf("test #4 expected %v, but got %v", []uint64{2019}, res.bitmap)
}
res = union(a, c)
if !reflect.DeepEqual(res.bitmap, []uint64{2019}) {
if !reflect.DeepEqual(res.bitmap, expected) {
t.Fatalf("test #5 expected %v, but got %v", []uint64{2019}, res.bitmap)
}
res = union(b, c)
res.bitmapToArray() //just added so test setup was easier
if !reflect.DeepEqual(res.array, []uint16{0, 1, 4, 5, 7, 10, 11, 12}) {
t.Fatalf("test #6 expected %v, but got %v", []uint16{0, 1, 4, 5, 7, 10, 11, 12}, res.array)
}
res = union(c, b)
res.bitmapToArray() //just added so test setup was easier
if !reflect.DeepEqual(res.array, []uint16{0, 1, 4, 5, 7, 10, 11, 12}) {
t.Fatalf("test #6 expected %v, but got %v", []uint16{0, 1, 4, 5, 7, 10, 11, 12}, res.array)
}
@ -793,7 +798,6 @@ func TestDifferenceMixed(t *testing.T) {
}
res = difference(c, b)
fmt.Println(res)
if !reflect.DeepEqual(res.array, []uint16{5}) {
t.Fatalf("test #7 expected %v, but got %v", []uint16{5}, res.array)
}