svn commit: r1146569 - in /cassandra/trunk/src/java/org/apache/cassandra/db: ColumnFamily.java MemtableAllocator.java marshal/IntegerType.java

[jbellis]

Author: jbellis
Date: Thu Jul 14 05:49:37 2011
New Revision: 1146569

URL: http://svn.apache.org/viewvc?rev=1146569&view=rev
Log:
cleanup

Removed:
    cassandra/trunk/src/java/org/apache/cassandra/db/MemtableAllocator.java
Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
    cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=1146569&r1=1146568&r2=1146569&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java Thu Jul 
14 05:49:37 2011
@@ -59,8 +59,6 @@ public class ColumnFamily extends Abstra
         return new ColumnFamily(cfm);
     }
 
-    private transient IColumnSerializer columnSerializer;
-    
     public ColumnFamily(CFMetaData cfm)
     {
         this(cfm, new ConcurrentSkipListMap<ByteBuffer, 
IColumn>(cfm.comparator));
@@ -71,7 +69,6 @@ public class ColumnFamily extends Abstra
         super(map);
         assert cfm != null;
         this.cfm = cfm;
-        columnSerializer = cfm.getColumnSerializer();
     }
     
     public ColumnFamily cloneMeShallow()
@@ -84,7 +81,8 @@ public class ColumnFamily extends Abstra
 
     public AbstractType getSubComparator()
     {
-        return (columnSerializer instanceof SuperColumnSerializer) ? 
((SuperColumnSerializer)columnSerializer).getComparator() : null;
+        IColumnSerializer s = getColumnSerializer();
+        return (s instanceof SuperColumnSerializer) ? ((SuperColumnSerializer) 
s).getComparator() : null;
     }
 
     public ColumnFamilyType getType()
@@ -115,7 +113,7 @@ public class ColumnFamily extends Abstra
 
     public IColumnSerializer getColumnSerializer()
     {
-        return columnSerializer;
+        return cfm.getColumnSerializer();
     }
 
     public boolean isSuper()

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java?rev=1146569&r1=1146568&r2=1146569&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java 
Thu Jul 14 05:49:37 2011
@@ -24,7 +24,6 @@ import java.nio.ByteBuffer;
 import java.sql.Types;
 
 import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.thrift.TBaseHelper;
 
 public final class IntegerType extends AbstractType<BigInteger>
 {