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

merge from 1.1

This commit is contained in:
Dave Brosius 2012-06-05 08:53:52 -04:00
parent 604a38645c 0144f2fe41
commit 90ce7ef210
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -1,4 +1,5 @@
1.2-dev
* enforce 1m min keycache for auto (CASSANDRA-4306)
* remove COPP (CASSANDRA-2479)
* Track tombstone expiration and compact when tombstone content is
higher than a configurable threshold, default 20% (CASSANDRA-3442)
@ -15,7 +16,6 @@
(CASSANDRA-4293)
* fix Summary component and caches to use correct partitioner (CASSANDRA-4289)
1.1.1
* add getsstables command to nodetool (CASSANDRA-4199)
* apply parent CF compaction settings to secondary index CFs (CASSANDRA-4280)

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

@ -417,7 +417,7 @@ public class DatabaseDescriptor
{
// if key_cache_size_in_mb option was set to "auto" then size of the cache should be "min(5% of Heap (in MB), 100MB)
keyCacheSizeInMB = (conf.key_cache_size_in_mb == null)
? Math.min((int) (Runtime.getRuntime().totalMemory() * 0.05 / 1024 / 1024), 100)
? Math.min(Math.max(1, (int) (Runtime.getRuntime().totalMemory() * 0.05 / 1024 / 1024)), 100)
: conf.key_cache_size_in_mb;
if (keyCacheSizeInMB < 0)