Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 5b8ae9f03 -> f3e38cb63 refs/heads/cassandra-3.11 90c5c8bfe -> d370d0570 refs/heads/trunk 6608bea00 -> 159007859
Ensure int overflow doesn't occur when calculating large partition warning size Patch by Kurt Greaves; Reviewed by Jeff Jirsa for CASSANDRA-13172 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3e38cb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3e38cb6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3e38cb6 Branch: refs/heads/cassandra-3.0 Commit: f3e38cb638113c2a23855a104d6082da5bc10ddb Parents: 5b8ae9f Author: kurt <k...@instaclustr.com> Authored: Thu Jun 15 22:50:03 2017 +0000 Committer: Jeff Jirsa <jji...@apple.com> Committed: Sun Jun 18 17:44:33 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3e38cb6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 528bbcd..8791ff0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.14 + * Ensure int overflow doesn't occur when calculating large partition warning size (CASSANDRA-13172) * Ensure consistent view of partition columns between coordinator and replica in ColumnFilter (CASSANDRA-13004) * Failed unregistering mbean during drop keyspace (CASSANDRA-13346) * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3e38cb6/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 e9e54c3..0a79f25 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -1219,7 +1219,7 @@ public class DatabaseDescriptor conf.compaction_throughput_mb_per_sec = value; } - public static int getCompactionLargePartitionWarningThreshold() { return conf.compaction_large_partition_warning_threshold_mb * 1024 * 1024; } + public static long getCompactionLargePartitionWarningThreshold() { return conf.compaction_large_partition_warning_threshold_mb * 1024L * 1024L; } public static long getMinFreeSpacePerDriveInBytes() { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
