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

Merge pull request #577 from jaffee/intersectCountOptimization

Browse source 
rewrite intersectCountArrayBitmap for perf test
This commit is contained in:
Matthew Jaffee 2017-05-30 15:15:20 -05:00 • committed by GitHub
commit c4fccc025c
2 changed files with 59 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
roaring/roaring.go
View file

@ -1228,7 +1228,7 @@ func intersectionCountArrayArray(a, b *container) (n uint64) {
return n
}
func intersectionCountArrayBitmap(a, b *container) (n uint64) {
func intersectionCountArrayBitmapOld(a, b *container) (n uint64) {
// Copy array header so we can shrink it.
array := a.array
if len(array) == 0 {
@ -1270,6 +1270,18 @@ func intersectionCountArrayBitmap(a, b *container) (n uint64) {
return n
}
func intersectionCountArrayBitmap(a, b *container) (n uint64) {
for _, val := range a.array {
i := val / 64
if i >= uint32(len(b.bitmap)) {
break
}
off := val % 64
n += (b.bitmap[i] & (1 << off)) >> off
}
return n
}
func intersectionCountBitmapBitmap(a, b *container) (n uint64) {
return popcntAndSlice(a.bitmap, b.bitmap)
}

49
roaring/roaring_internal_test.go
View file

@ -14,9 +14,7 @@
package roaring
import (
"testing"
)
import "testing"
func TestBitmapCountRange(t *testing.T) {
c := container{}
@ -41,3 +39,48 @@ func TestBitmapCountRange(t *testing.T) {
}
}
}
func TestIntersectionCountArrayBitmap2(t *testing.T) {
a, b := &container{}, &container{}
tests := []struct {
array []uint32
bitmap []uint64
exp uint64
}{
{
array: []uint32{0},
bitmap: []uint64{1},
exp: 1,
},
{
array: []uint32{0, 1},
bitmap: []uint64{3},
exp: 2,
},
{
array: []uint32{64, 128, 129, 2000},
bitmap: []uint64{932421, 2},
exp: 0,
},
{
array: []uint32{0, 65, 130, 195},
bitmap: []uint64{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255},
exp: 4,
},
{
array: []uint32{63, 120, 543, 639, 12000},
bitmap: []uint64{0x8000000000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0x8000000000000000},
exp: 2,
},
}
for i, test := range tests {
a.array = test.array
b.bitmap = test.bitmap
ret1 := intersectionCountArrayBitmapOld(a, b)
ret2 := intersectionCountArrayBitmap(a, b)
if ret1 != ret2 || ret2 != test.exp {
t.Fatalf("test #%v intersectCountArrayBitmap fail orig: %v new: %v exp: %v", i, ret1, ret2, test.exp)
}
}
}