cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r906999 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: config/DatabaseDescriptor.java db/Table.java
Date Fri, 05 Feb 2010 16:47:53 GMT
Author: jbellis
Date: Fri Feb  5 16:47:53 2010
New Revision: 906999

URL: http://svn.apache.org/viewvc?rev=906999&view=rev
Log:
r/m obsolete "application cf" concept (all system CFs are in system keyspace now).  patch
by jbellis

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=906999&r1=906998&r2=906999&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Fri Feb  5 16:47:53 2010
@@ -84,7 +84,6 @@
     private static double flushIndexBufferSizeInMB_ = 8;
     private static int slicedReadBufferSizeInKB_ = 64;
     private static Set<String> tables_ = new HashSet<String>();
-    private static Set<String> applicationColumnFamilies_ = new HashSet<String>();
     private static int bmtThreshold_ = 256;
 
     private static Map<Pair<String, String>, Double> tableKeysCachedFractions_
= new HashMap<Pair<String, String>, Double>();
@@ -519,9 +518,6 @@
                     }
                     String xqlCF = xqlTable + "ColumnFamily[@Name='" + cfName + "']/";
 
-                    /* squirrel away the application column families */
-                    applicationColumnFamilies_.add(cfName);
-
                     // Parse out the column type
                     String rawColumnType = XMLUtils.getAttributeValue(columnFamily, "ColumnType");
                     String columnType = ColumnFamily.getColumnType(rawColumnType);
@@ -794,11 +790,6 @@
     public static String getConfigFileName() {
         return configFileName_;
     }
-    
-    public static boolean isApplicationColumnFamily(String columnFamily)
-    {
-        return applicationColumnFamilies_.contains(columnFamily);
-    }
 
     public static String getJobJarLocation()
     {

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=906999&r1=906998&r2=906999&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 Fri Feb  5 16:47:53
2010
@@ -286,9 +286,6 @@
         Set<String> columnFamilies = tableMetadata.getColumnFamilies();
         for ( String columnFamily : columnFamilies )
         {
-            if ( !isApplicationColumnFamily(columnFamily) )
-                continue;
-            
             ColumnFamilyStore cfStore = columnFamilyStores.get( columnFamily );
             try
             {
@@ -361,21 +358,11 @@
         }, checkMs, checkMs);
     }
 
-    boolean isApplicationColumnFamily(String columnFamily)
-    {
-        return DatabaseDescriptor.isApplicationColumnFamily(columnFamily);
-    }
-
     int getColumnFamilyId(String columnFamily)
     {
         return tableMetadata.getColumnFamilyId(columnFamily);
     }
 
-    boolean isValidColumnFamily(String columnFamily)
-    {
-        return tableMetadata.isValidColumnFamily(columnFamily);
-    }
-
     /**
      * Selects the specified column family for the specified key.
     */



Mime
View raw message