cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r938058 - in /cassandra/trunk: conf/cassandra.yaml src/java/org/apache/cassandra/config/ColumnFamily.java src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Date Mon, 26 Apr 2010 14:29:49 GMT
Author: jbellis
Date: Mon Apr 26 14:29:49 2010
New Revision: 938058

URL: http://svn.apache.org/viewvc?rev=938058&view=rev
Log:
rename preloadRowCache to preload_row_cache in yaml for consistency.  patch by Vijay Parthasarathy;
reviewed by jbellis for CASSANDRA-946

Modified:
    cassandra/trunk/conf/cassandra.yaml
    cassandra/trunk/src/java/org/apache/cassandra/config/ColumnFamily.java
    cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java

Modified: cassandra/trunk/conf/cassandra.yaml
URL: http://svn.apache.org/viewvc/cassandra/trunk/conf/cassandra.yaml?rev=938058&r1=938057&r2=938058&view=diff
==============================================================================
--- cassandra/trunk/conf/cassandra.yaml (original)
+++ cassandra/trunk/conf/cassandra.yaml Mon Apr 26 14:29:49 2010
@@ -161,7 +161,7 @@ endpoint_snitch: org.apache.cassandra.lo
 # - read_repair_chance: specifies the probability with which read
 #   repairs should be invoked on non-quorum reads.  must be between 0
 #   and 1. defaults to 1.0 (always read repair).
-# - preloadRowCache: If true, will populate row cache on startup.
+# - preload_row_cache: If true, will populate row cache on startup.
 #   Defaults to false.
 #
 keyspaces:
@@ -188,7 +188,7 @@ keyspaces:
         - name: Super2
           column_type: Super
           compare_subcolumns_with: UTF8Type
-          preloadRowCache: true
+          preload_row_cache: true
           rows_cached: 10000
           keys_cached: 50
           comment: 'A column family with supercolumns, whose column and subcolumn names are
UTF8 strings'

Modified: cassandra/trunk/src/java/org/apache/cassandra/config/ColumnFamily.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/ColumnFamily.java?rev=938058&r1=938057&r2=938058&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/ColumnFamily.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/ColumnFamily.java Mon Apr 26 14:29:49
2010
@@ -9,5 +9,5 @@ public class ColumnFamily {
     public double rows_cached = CFMetaData.DEFAULT_ROW_CACHE_SIZE; 
     public double keys_cached = CFMetaData.DEFAULT_KEY_CACHE_SIZE; 
     public double read_repair_chance = CFMetaData.DEFAULT_READ_REPAIR_CHANCE;
-    public boolean preloadRowCache = CFMetaData.DEFAULT_PRELOAD_ROW_CACHE;
+    public boolean preload_row_cache = CFMetaData.DEFAULT_PRELOAD_ROW_CACHE;
 }

Modified: cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=938058&r1=938057&r2=938058&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Mon Apr 26
14:29:49 2010
@@ -487,7 +487,7 @@ public class DatabaseDescriptor
                 {                        
                     throw new ConfigurationException("read_repair_chance must be between
0.0 and 1.0");
                 }
-                cfDefs[j++] = new CFMetaData(keyspace.name, cf.name, columnType, comparator,
subcolumnComparator, cf.comment, cf.rows_cached, cf.preloadRowCache, cf.keys_cached, cf.read_repair_chance);
+                cfDefs[j++] = new CFMetaData(keyspace.name, cf.name, columnType, comparator,
subcolumnComparator, cf.comment, cf.rows_cached, cf.preload_row_cache, cf.keys_cached, cf.read_repair_chance);
             }
             defs.add(new KSMetaData(keyspace.name, strategyClass, keyspace.replication_factor,
cfDefs));
             



Mime
View raw message