Author: jbellis Date: Tue Oct 25 18:30:10 2011 New Revision: 1188849 URL: http://svn.apache.org/viewvc?rev=1188849&view=rev Log: update BloomFilter to use OBS.fast operations patch by jbellis
Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/BloomFilter.java Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/BloomFilter.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/BloomFilter.java?rev=1188849&r1=1188848&r2=1188849&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/BloomFilter.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/BloomFilter.java Tue Oct 25 18:30:10 2011 @@ -27,7 +27,6 @@ import org.apache.cassandra.utils.obs.Op public class BloomFilter extends Filter { - private static final Logger logger = LoggerFactory.getLogger(BloomFilter.class); private static final int EXCESS = 20; static BloomFilterSerializer serializer_ = new BloomFilterSerializer(); @@ -88,14 +87,9 @@ public class BloomFilter extends Filter return new BloomFilter(spec.K, bucketsFor(numElements, spec.bucketsPerElement)); } - private long buckets() - { - return bitset.size(); - } - private long[] getHashBuckets(ByteBuffer key) { - return BloomFilter.getHashBuckets(key, hashCount, buckets()); + return BloomFilter.getHashBuckets(key, hashCount, bitset.size()); } // Murmur is faster than an SHA-based approach and provides as-good collision @@ -119,7 +113,7 @@ public class BloomFilter extends Filter { for (long bucketIndex : getHashBuckets(key)) { - bitset.set(bucketIndex); + bitset.fastSet(bucketIndex); } } @@ -127,7 +121,7 @@ public class BloomFilter extends Filter { for (long bucketIndex : getHashBuckets(key)) { - if (!bitset.get(bucketIndex)) + if (!bitset.fastGet(bucketIndex)) { return false; }