natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename preloadRowCache to preload_row_cache in yaml for consistency. patch by Vijay Parthasarathy; reviewed by jbellis for CASSANDRA-946 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@938058 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2010-04-26 14:29:49 +00:00
parent 0724fe2f07
commit d338a977e3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/cassandra.yaml
View File

@ -161,7 +161,7 @@ endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch
# - 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'

2
src/java/org/apache/cassandra/config/ColumnFamily.java
View File

@ -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;
}

2
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -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));