Repository: cassandra Updated Branches: refs/heads/trunk c9d209b02 -> 31f67c289
override histogram reservoir getValues to return buckets in correct order Patch by Chris Lohfink; reviewed by tjake for CASSANDRA-10975 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52d8197d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52d8197d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52d8197d Branch: refs/heads/trunk Commit: 52d8197d1bba774b2165fc73f9279f237e27d3d4 Parents: e41fa34 Author: Chris Lohfink <chris.lohf...@datastax.com> Authored: Wed Jan 6 13:43:07 2016 -0600 Committer: T Jake Luciani <j...@apache.org> Committed: Thu Jan 7 12:25:35 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/metrics/EstimatedHistogramReservoir.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/52d8197d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 90d990e..a26f9e0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.5 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975) * Enable GC logging by default (CASSANDRA-10140) * Optimize pending range computation (CASSANDRA-9258) * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) http://git-wip-us.apache.org/repos/asf/cassandra/blob/52d8197d/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java b/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java index 3658f3a..29baad8 100644 --- a/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java +++ b/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java @@ -102,5 +102,10 @@ public class EstimatedHistogramReservoir implements Reservoir { return histogram.rawMean(); } + + @Override + public long[] getValues() { + return histogram.getBuckets(false); + } } }