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 2009/04/17 22:17:11 UTC
svn commit: r766139 - in
/incubator/cassandra/trunk/src/org/apache/cassandra: db/ test/ tools/ utils/
Author: jbellis
Date: Fri Apr 17 20:17:11 2009
New Revision: 766139
URL: http://svn.apache.org/viewvc?rev=766139&view=rev
Log:
rename BloomFilter.fill -> add
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/db/BinaryMemtable.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnIndexer.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java
incubator/cassandra/trunk/src/org/apache/cassandra/test/SSTableTest.java
incubator/cassandra/trunk/src/org/apache/cassandra/tools/IndexBuilder.java
incubator/cassandra/trunk/src/org/apache/cassandra/tools/ThreadListBuilder.java
incubator/cassandra/trunk/src/org/apache/cassandra/utils/BloomFilter.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/BinaryMemtable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/BinaryMemtable.java?rev=766139&r1=766138&r2=766139&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/BinaryMemtable.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/BinaryMemtable.java Fri Apr 17 20:17:11 2009
@@ -156,7 +156,7 @@
{
/* Now write the key and value to disk */
ssTable.append(key, bytes);
- bf.fill(key);
+ bf.add(key);
}
}
ssTable.close(bf);
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamilyStore.java?rev=766139&r1=766138&r2=766139&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamilyStore.java Fri Apr 17 20:17:11 2009
@@ -1147,7 +1147,7 @@
try
{
ssTableRange.append(lastkey, bufOut);
- compactedRangeBloomFilter.fill(lastkey);
+ compactedRangeBloomFilter.add(lastkey);
}
catch(Exception ex)
{
@@ -1229,7 +1229,7 @@
private void doFill(BloomFilter bf, String decoratedKey)
{
- bf.fill(StorageService.getPartitioner().undecorateKey(decoratedKey));
+ bf.add(StorageService.getPartitioner().undecorateKey(decoratedKey));
}
/*
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnIndexer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnIndexer.java?rev=766139&r1=766138&r2=766139&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnIndexer.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnIndexer.java Fri Apr 17 20:17:11 2009
@@ -24,13 +24,10 @@
import java.util.Collection;
import java.util.List;
-import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.io.DataOutputBuffer;
import org.apache.cassandra.io.IndexHelper;
-import org.apache.cassandra.io.SSTable.KeyPositionInfo;
import org.apache.cassandra.utils.BloomFilter;
-import org.apache.cassandra.utils.FBUtilities;
/**
@@ -81,14 +78,14 @@
BloomFilter bf = new BloomFilter(columnCount, 4);
for ( IColumn column : columns )
{
- bf.fill(column.name());
+ bf.add(column.name());
/* If this is SuperColumn type Column Family we need to get the subColumns too. */
if ( column instanceof SuperColumn )
{
Collection<IColumn> subColumns = column.getSubColumns();
for ( IColumn subColumn : subColumns )
{
- bf.fill(subColumn.name());
+ bf.add(subColumn.name());
}
}
}
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java?rev=766139&r1=766138&r2=766139&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java Fri Apr 17 20:17:11 2009
@@ -398,7 +398,7 @@
ColumnFamily.serializerWithIndexes().serialize( columnFamily, buffer );
/* Now write the key and value to disk */
ssTable.append(partitioner.decorateKey(key), buffer);
- bf.fill(key);
+ bf.add(key);
columnFamily.clear();
}
}
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/test/SSTableTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/test/SSTableTest.java?rev=766139&r1=766138&r2=766139&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/test/SSTableTest.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/test/SSTableTest.java Fri Apr 17 20:17:11 2009
@@ -52,7 +52,7 @@
cf.addColumn("C", "Avinash Lakshman is a good man".getBytes(), i);
ColumnFamily.serializerWithIndexes().serialize(cf, bufOut);
ssTable.append(key, bufOut);
- bf.fill(key);
+ bf.add(key);
}
ssTable.close(bf);
}
@@ -87,7 +87,7 @@
BloomFilter bf = new BloomFilter(1024*1024, 15);
for ( int i = 0; i < 1024*1024; ++i )
{
- bf.fill(Integer.toString(i));
+ bf.add(Integer.toString(i));
}
DataOutputBuffer bufOut = new DataOutputBuffer();
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/tools/IndexBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/tools/IndexBuilder.java?rev=766139&r1=766138&r2=766139&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/tools/IndexBuilder.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/tools/IndexBuilder.java Fri Apr 17 20:17:11 2009
@@ -29,9 +29,6 @@
import org.apache.cassandra.utils.BasicUtilities;
import org.apache.cassandra.utils.BloomFilter;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
-
public class IndexBuilder
{
private static final int bufferSize_ = 64*1024;
@@ -126,7 +123,7 @@
for ( int i = 0; i < blockSize; ++i )
{
String currentKey = bufIn.readUTF();
- bf.fill(currentKey);
+ bf.add(currentKey);
if ( largestKey == null )
{
largestKey = currentKey;
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/tools/ThreadListBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/tools/ThreadListBuilder.java?rev=766139&r1=766138&r2=766139&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/tools/ThreadListBuilder.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/tools/ThreadListBuilder.java Fri Apr 17 20:17:11 2009
@@ -21,7 +21,6 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.RandomAccessFile;
import java.util.ArrayList;
@@ -69,7 +68,7 @@
bf = new BloomFilter(count_, 8);
}
line = line.trim();
- bf.fill(line);
+ bf.add(line);
++keyCount;
}
}
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/utils/BloomFilter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/utils/BloomFilter.java?rev=766139&r1=766138&r2=766139&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/utils/BloomFilter.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/utils/BloomFilter.java Fri Apr 17 20:17:11 2009
@@ -142,7 +142,7 @@
the filter_.
This is a general purpose API.
*/
- public void fill(String key)
+ public void add(String key)
{
for (int i = 0; i < hashes_; ++i)
{