You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/04/23 22:16:31 UTC
svn commit: r1096214 - in
/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra:
db/Table.java utils/BloomFilter.java
Author: jbellis
Date: Sat Apr 23 20:16:31 2011
New Revision: 1096214
URL: http://svn.apache.org/viewvc?rev=1096214&view=rev
Log:
cleanup
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/BloomFilter.java
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java?rev=1096214&r1=1096213&r2=1096214&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java Sat Apr 23 20:16:31 2011
@@ -634,9 +634,9 @@ public class Table
}
}
- public String getDataFileLocation(long expectedCompactedFileSize)
+ public String getDataFileLocation(long expectedSize)
{
- String path = DatabaseDescriptor.getDataFileLocationForTable(name, expectedCompactedFileSize);
+ String path = DatabaseDescriptor.getDataFileLocationForTable(name, expectedSize);
if (path == null)
{
// retry after GCing to force unmap of compacted SSTables so they can be deleted
@@ -649,7 +649,7 @@ public class Table
{
throw new AssertionError(e);
}
- path = DatabaseDescriptor.getDataFileLocationForTable(name, expectedCompactedFileSize);
+ path = DatabaseDescriptor.getDataFileLocationForTable(name, expectedSize);
}
return path;
}
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/BloomFilter.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/BloomFilter.java?rev=1096214&r1=1096213&r2=1096214&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/BloomFilter.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/BloomFilter.java Sat Apr 23 20:16:31 2011
@@ -46,23 +46,9 @@ public class BloomFilter extends Filter
return serializer_;
}
- long emptyBuckets()
- {
- long n = 0;
- for (long i = 0; i < buckets(); i++)
- {
- if (!bitset.get(i))
- {
- n++;
- }
- }
- return n;
- }
-
private static OpenBitSet bucketsFor(long numElements, int bucketsPer)
{
- long numBits = numElements * bucketsPer + EXCESS; //TODO overflow?
- return new OpenBitSet((long)Math.min(Long.MAX_VALUE, numBits));
+ return new OpenBitSet(numElements * bucketsPer + EXCESS);
}
/**
@@ -76,7 +62,7 @@ public class BloomFilter extends Filter
if (bucketsPerElement < targetBucketsPerElem)
{
logger.warn(String.format("Cannot provide an optimal BloomFilter for %d elements (%d/%d buckets per element).",
- numElements, bucketsPerElement, targetBucketsPerElem));
+ numElements, bucketsPerElement, targetBucketsPerElem));
}
BloomCalculations.BloomSpecification spec = BloomCalculations.computeBloomSpec(bucketsPerElement);
return new BloomFilter(spec.K, bucketsFor(numElements, spec.bucketsPerElement));