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

rename serializer2 -> serializerWithIndexers 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759204 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-03-27 16:33:02 +00:00
parent 7f8f72e25b
commit 2f8268cd09
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ public final class ColumnFamily implements Serializable
* This method returns the serializer whose methods are
* preprocessed by a dynamic proxy.
*/
public static ICompactSerializer2<ColumnFamily> serializer2()
public static ICompactSerializer2<ColumnFamily> serializerWithIndexes()
{
return (ICompactSerializer2<ColumnFamily>)Proxy.newProxyInstance( ColumnFamily.class.getClassLoader(), new Class[]{ICompactSerializer2.class}, new CompactSerializerInvocationHandler<ColumnFamily>(serializer_) );
}

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

@ -22,10 +22,7 @@ import java.io.*;
import java.math.BigInteger;
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@ -38,16 +35,12 @@ import org.apache.cassandra.io.IndexHelper;
import org.apache.cassandra.io.SSTable;
import org.apache.cassandra.io.SequenceFile;
import org.apache.cassandra.net.EndPoint;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.PartitionerType;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.BloomFilter;
import org.apache.cassandra.utils.FileUtils;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
import org.apache.cassandra.io.*;
import org.apache.cassandra.utils.*;
/**
* Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@ -1167,7 +1160,7 @@ public class ColumnFamilyStore
if( columnFamily != null )
{
/* serialize the cf with column indexes */
ColumnFamily.serializer2().serialize(columnFamily, bufOut);
ColumnFamily.serializerWithIndexes().serialize(columnFamily, bufOut);
}
}
else
@ -1417,7 +1410,7 @@ public class ColumnFamilyStore
if( columnFamily != null )
{
/* serialize the cf with column indexes */
ColumnFamily.serializer2().serialize(columnFamily, bufOut);
ColumnFamily.serializerWithIndexes().serialize(columnFamily, bufOut);
}
}
else

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

@ -36,14 +36,11 @@ import org.apache.cassandra.concurrent.ThreadFactoryImpl;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.io.DataOutputBuffer;
import org.apache.cassandra.io.SSTable;
import org.apache.cassandra.service.IComponentShutdown;
import org.apache.cassandra.service.PartitionerType;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.BloomFilter;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
import org.apache.cassandra.io.*;
import org.apache.cassandra.utils.*;
/**
* Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@ -480,7 +477,7 @@ public class Memtable implements MemtableMBean, Comparable<Memtable>
if ( columnFamily != null )
{
/* serialize the cf with column indexes */
ColumnFamily.serializer2().serialize( columnFamily, buffer );
ColumnFamily.serializerWithIndexes().serialize( columnFamily, buffer );
/* Now write the key and value to disk */
ssTable.append(pKey.key(), pKey.hash(), buffer);
bf.fill(pKey.key());
@ -507,7 +504,7 @@ public class Memtable implements MemtableMBean, Comparable<Memtable>
if ( columnFamily != null )
{
/* serialize the cf with column indexes */
ColumnFamily.serializer2().serialize( columnFamily, buffer );
ColumnFamily.serializerWithIndexes().serialize( columnFamily, buffer );
/* Now write the key and value to disk */
ssTable.append(key, buffer);
bf.fill(key);

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

@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.PrimaryKey;
@ -35,7 +34,6 @@ import org.apache.cassandra.io.DataOutputBuffer;
import org.apache.cassandra.io.SSTable;
import org.apache.cassandra.service.PartitionerType;
import org.apache.cassandra.utils.BloomFilter;
import org.apache.cassandra.utils.FBUtilities;
public class SSTableTest
@ -54,7 +52,7 @@ public class SSTableTest
bufOut.reset();
// random.nextBytes(bytes);
cf.createColumn("C", "Avinash Lakshman is a good man".getBytes(), i);
ColumnFamily.serializer2().serialize(cf, bufOut);
ColumnFamily.serializerWithIndexes().serialize(cf, bufOut);
ssTable.append(key, bufOut);
bf.fill(key);
}
@ -92,7 +90,7 @@ public class SSTableTest
if ( columnFamily != null )
{
/* serialize the cf with column indexes */
ColumnFamily.serializer2().serialize( columnFamily, buffer );
ColumnFamily.serializerWithIndexes().serialize( columnFamily, buffer );
/* Now write the key and value to disk */
ssTable.append(pKey.key(), pKey.hash(), buffer);
bf.fill(pKey.key());