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

Merge pull request #117 from umbel/bug

Browse source 
Bug
This commit is contained in:
tgruben 2016-09-27 17:20:59 -05:00 • committed by GitHub
commit 8759d68ab6
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bitmap.go
View file

@ -86,13 +86,12 @@ func (b *Bitmap) Intersect(other *Bitmap) *Bitmap {
// Union returns the bitwise union of b and other.
func (b *Bitmap) Union(other *Bitmap) *Bitmap {
var segments []BitmapSegment
itr := newMergeSegmentIterator(b.segments, other.segments)
for s0, s1 := itr.next(); s0 != nil || s1 != nil; s0, s1 = itr.next() {
if s0 == nil {
if s1 == nil {
segments = append(segments, *s0)
continue
} else if s1 == nil {
} else if s0 == nil {
segments = append(segments, *s1)
continue
}
@ -111,7 +110,7 @@ func (b *Bitmap) Difference(other *Bitmap) *Bitmap {
if s0 == nil {
continue
} else if s1 == nil {
segments = append(segments, *s1)
segments = append(segments, *s0)
continue
}
segments = append(segments, *s0.Difference(s1))