Skip to content

Fix bitCount is 0 after intersect or union #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix bitCount is 0 after intersect or union #40

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a1b3f9
Fix bitCount is 0 after intersect or union
SidWeng Aug 29, 2018
a5c4ab9
wrong approximateElementCount() after union/intersection
SidWeng Sep 3, 2018
290d68f
remove unnecessary code
SidWeng Sep 3, 2018
730fef7
remove unused import
SidWeng Sep 3, 2018
8c38b47
Revert "remove unused import"
SidWeng Sep 4, 2018
cb3c432
Revert "remove unnecessary code"
SidWeng Sep 4, 2018
360eda2
stupid error, forget to use the right function
SidWeng Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions bloom-filter/src/main/scala/bloomfilter/mutable/UnsafeBitArray.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package bloomfilter.mutable
import java.io._

import bloomfilter.util.Unsafe.unsafe
import scala.annotation.tailrec

@SerialVersionUID(2L)
class UnsafeBitArray(val numberOfBits: Long) extends Serializable {
Expand Down Expand Up @@ -33,6 +34,7 @@ class UnsafeBitArray(val numberOfBits: Long) extends Serializable {
val thatLong = unsafe.getLong(that.ptr + (index >>> 6) * 8L)
val longAtIndex = combiner(thisLong, thatLong)
unsafe.putLong(result.ptr + (index >>> 6) * 8L, longAtIndex)
result.addBitCount(UnsafeBitArray.getSetBit(longAtIndex))
index += 64
}
result
Expand All @@ -50,6 +52,10 @@ class UnsafeBitArray(val numberOfBits: Long) extends Serializable {
combine(that, _ & _)
}

def addBitCount(i: Long): Unit = {
bitCount += i
}

def getBitCount: Long = {
bitCount
}
Expand Down Expand Up @@ -102,4 +108,16 @@ object UnsafeBitArray {
private def readResolve: AnyRef = unsafeBitArray
}

def getSetBit(i: Long): Long = {
@tailrec
def aux(i: Long, cnt: Long): Long = {
if (i == 0) {
cnt
} else {
aux(i & (i -1), cnt + 1)
}
}

aux(i, 0)
}
}