svn commit: r941443 - /cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

[jbellis]

Author: jbellis
Date: Wed May  5 19:40:06 2010
New Revision: 941443

URL: http://svn.apache.org/viewvc?rev=941443&view=rev
Log:
r/m unused isSuper flag from CFS.  patch by Sylvain Lebresne; reviewed by 
jbellis for CASSANDRA-1054

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

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=941443&r1=941442&r2=941443&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Wed 
May  5 19:40:06 2010
@@ -96,7 +96,6 @@ public class ColumnFamilyStore implement
 
     private final String table_;
     public final String columnFamily_;
-    private final boolean isSuper_;
 
     private volatile Integer memtableSwitchCount = 0;
 
@@ -120,11 +119,10 @@ public class ColumnFamilyStore implement
     private long rowsCompactedTotalSize = 0L;
     private long rowsCompactedCount = 0L;
     
-    ColumnFamilyStore(String table, String columnFamilyName, boolean isSuper, 
int indexValue)
+    ColumnFamilyStore(String table, String columnFamilyName, int indexValue)
     {
         table_ = table;
         columnFamily_ = columnFamilyName;
-        isSuper_ = isSuper;
         fileIndexGenerator_.set(indexValue);
         memtable_ = new Memtable(this);
         binaryMemtable_ = new AtomicReference<BinaryMemtable>(new 
BinaryMemtable(this));
@@ -259,7 +257,7 @@ public class ColumnFamilyStore implement
         Collections.sort(generations);
         int value = (generations.size() > 0) ? 
(generations.get(generations.size() - 1)) : 0;
 
-        ColumnFamilyStore cfs = new ColumnFamilyStore(table, columnFamily, 
"Super".equals(DatabaseDescriptor.getColumnType(table, columnFamily)), value);
+        ColumnFamilyStore cfs = new ColumnFamilyStore(table, columnFamily, 
value);
 
         MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         try
@@ -604,11 +602,6 @@ public class ColumnFamilyStore implement
         return condition;
     }
 
-    public boolean isSuper()
-    {
-        return isSuper_;
-    }
-
     public int getMemtableColumnsCount()
     {
         return getMemtableThreadSafe().getCurrentOperations();