natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename BloomFilter.fill -> add 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@766139 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-04-17 20:17:11 +00:00
parent 04344cbb03
commit 674eaf5cf5
8 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/apache/cassandra/db/BinaryMemtable.java
View File

@ -156,7 +156,7 @@ public class BinaryMemtable
{
/* Now write the key and value to disk */
ssTable.append(key, bytes);
bf.fill(key);
bf.add(key);
}
}
ssTable.close(bf);

4
src/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -1147,7 +1147,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
try
{
ssTableRange.append(lastkey, bufOut);
compactedRangeBloomFilter.fill(lastkey);
compactedRangeBloomFilter.add(lastkey);
}
catch(Exception ex)
{
@ -1229,7 +1229,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
private void doFill(BloomFilter bf, String decoratedKey)
{
bf.fill(StorageService.getPartitioner().undecorateKey(decoratedKey));
bf.add(StorageService.getPartitioner().undecorateKey(decoratedKey));
}
/*

7
src/org/apache/cassandra/db/ColumnIndexer.java
View File

@ -24,13 +24,10 @@ import java.util.ArrayList;
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 @@ public class ColumnIndexer
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());
}
}
}

2
src/org/apache/cassandra/db/Memtable.java
View File

@ -398,7 +398,7 @@ public class Memtable implements Comparable<Memtable>
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();
}
}

4
src/org/apache/cassandra/test/SSTableTest.java
View File

@ -52,7 +52,7 @@ public class SSTableTest
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 @@ public class SSTableTest
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();

5
src/org/apache/cassandra/tools/IndexBuilder.java
View File

@ -29,9 +29,6 @@ import org.apache.cassandra.io.SequenceFile;
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 @@ public class IndexBuilder
for ( int i = 0; i < blockSize; ++i )
{
String currentKey = bufIn.readUTF();
bf.fill(currentKey);
bf.add(currentKey);
if ( largestKey == null )
{
largestKey = currentKey;

3
src/org/apache/cassandra/tools/ThreadListBuilder.java
View File

@ -21,7 +21,6 @@ package org.apache.cassandra.tools;
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 @@ public class ThreadListBuilder
bf = new BloomFilter(count_, 8);
}
line = line.trim();
bf.fill(line);
bf.add(line);
++keyCount;
}
}

2
src/org/apache/cassandra/utils/BloomFilter.java
View File

@ -142,7 +142,7 @@ public class BloomFilter implements Serializable
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)
{