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/03/27 03:18:34 UTC
svn commit: r758967 - in
/incubator/cassandra/trunk/src/org/apache/cassandra: db/ColumnFamily.java
db/ColumnFamilyStore.java db/Memtable.java test/SSTableTest.java
Author: jbellis
Date: Fri Mar 27 02:18:34 2009
New Revision: 758967
URL: http://svn.apache.org/viewvc?rev=758967&view=rev
Log:
rename serializer2 -> serializerWithIndexers
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamily.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java
incubator/cassandra/trunk/src/org/apache/cassandra/test/SSTableTest.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamily.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamily.java?rev=758967&r1=758966&r2=758967&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamily.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamily.java Fri Mar 27 02:18:34 2009
@@ -70,7 +70,7 @@
* 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_) );
}
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=758967&r1=758966&r2=758967&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/ColumnFamilyStore.java Fri Mar 27 02:18:34 2009
@@ -22,10 +22,7 @@
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.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 @@
if( columnFamily != null )
{
/* serialize the cf with column indexes */
- ColumnFamily.serializer2().serialize(columnFamily, bufOut);
+ ColumnFamily.serializerWithIndexes().serialize(columnFamily, bufOut);
}
}
else
@@ -1417,7 +1410,7 @@
if( columnFamily != null )
{
/* serialize the cf with column indexes */
- ColumnFamily.serializer2().serialize(columnFamily, bufOut);
+ ColumnFamily.serializerWithIndexes().serialize(columnFamily, bufOut);
}
}
else
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=758967&r1=758966&r2=758967&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java Fri Mar 27 02:18:34 2009
@@ -36,14 +36,11 @@
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 @@
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 @@
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);
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=758967&r1=758966&r2=758967&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/test/SSTableTest.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/test/SSTableTest.java Fri Mar 27 02:18:34 2009
@@ -26,7 +26,6 @@
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.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 @@
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 @@
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());