Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9a4cc22a3 -> 1366c0ad5 refs/heads/cassandra-2.1.0 3adf59486 -> 233bd3c03 refs/heads/trunk da650f3c6 -> 2d0cae4f0
add cast to float Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/233bd3c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/233bd3c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/233bd3c0 Branch: refs/heads/cassandra-2.1 Commit: 233bd3c0340d6bd19fe0c25072bd3b4931be0e1f Parents: 3adf594 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jul 15 15:21:41 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jul 15 15:21:41 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 2 +- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/233bd3c0/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 2438e09..12c07bd 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -93,7 +93,7 @@ public class Config public Integer memtable_flush_writers = null; public Integer memtable_heap_space_in_mb; public Integer memtable_offheap_space_in_mb; - public Double memtable_cleanup_threshold = null; + public Float memtable_cleanup_threshold = null; public Integer storage_port = 7000; public Integer ssl_storage_port = 7001; http://git-wip-us.apache.org/repos/asf/cassandra/blob/233bd3c0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 6730cb5..d56bfe3 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -487,7 +487,7 @@ public class DatabaseDescriptor conf.memtable_flush_writers = Math.min(8, Math.max(2, Math.min(FBUtilities.getAvailableProcessors(), conf.data_file_directories.length))); if (conf.memtable_cleanup_threshold == null) - conf.memtable_cleanup_threshold = 1.0 / (1 + conf.memtable_flush_writers); + conf.memtable_cleanup_threshold = (float) (1.0 / (1 + conf.memtable_flush_writers)); if (conf.concurrent_compactors == null) conf.concurrent_compactors = Math.min(8, Math.max(2, Math.min(FBUtilities.getAvailableProcessors(), conf.data_file_directories.length)));
