svn commit: r902861 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra/db: ColumnFamily.java ColumnFamilyStore.java Table.java

[jbellis]

Author: jbellis
Date: Mon Jan 25 16:29:11 2010
New Revision: 902861

URL: http://svn.apache.org/viewvc?rev=902861&view=rev
Log:
r/m unused code.  patch by jbellis

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=902861&r1=902860&r2=902861&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java 
Mon Jan 25 16:29:11 2010
@@ -388,16 +388,6 @@
         return subcolumnComparator == null ? "" : 
subcolumnComparator.getClass().getCanonicalName();
     }
 
-    public int serializedSize()
-    {
-        int subtotal = 4 * IColumn.UtfPrefix_ + name_.length() + 
type_.length() +  getComparatorName().length() + 
getSubComparatorName().length() + 4 + 8 + 4;
-        for (IColumn column : columns_.values())
-        {
-            subtotal += column.serializedSize();
-        }
-        return subtotal;
-    }
-
     public static AbstractType getComparatorFor(String table, String 
columnFamilyName, byte[] superColumnName)
     {
         return superColumnName == null

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=902861&r1=902860&r2=902861&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Mon Jan 25 16:29:11 2010
@@ -120,8 +120,6 @@
     private TimedStatsDeque readStats_ = new TimedStatsDeque(60000);
     private TimedStatsDeque writeStats_ = new TimedStatsDeque(60000);
     
-    private final IPartitioner partitioner = StorageService.getPartitioner();
-
     ColumnFamilyStore(String table, String columnFamilyName, boolean isSuper, 
int indexValue) throws IOException
     {
         table_ = table;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=902861&r1=902860&r2=902861&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java 
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Mon 
Jan 25 16:29:11 2010
@@ -319,10 +319,7 @@
         }
     }
 
-    /*
-     * Get the list of all SSTables on disk.
-    */
-    public List<SSTableReader> getAllSSTablesOnDisk()
+    List<SSTableReader> getAllSSTablesOnDisk()
     {
         List<SSTableReader> list = new ArrayList<SSTableReader>();
         Set<String> columnFamilies = tableMetadata.getColumnFamilies();
@@ -464,22 +461,6 @@
         }
     }
 
-    public SortedSet<String> getApplicationColumnFamilies()
-    {
-        if (applicationColumnFamilies == null)
-        {
-            applicationColumnFamilies = new TreeSet<String>();
-            for (String cfName : getColumnFamilies())
-            {
-                if (DatabaseDescriptor.isApplicationColumnFamily(cfName))
-                {
-                    applicationColumnFamilies.add(cfName);
-                }
-            }
-        }
-        return applicationColumnFamilies;
-    }
-
     public String getDataFileLocation(long expectedCompactedFileSize)
     {
         return DatabaseDescriptor.getDataFileLocationForTable(name, 
expectedCompactedFileSize);