You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/01/07 18:43:27 UTC
[1/4] cassandra git commit: override histogram reservoir getValues to
return buckets in correct order
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 <Ch...@datastax.com>
Authored: Wed Jan 6 13:43:07 2016 -0600
Committer: T Jake Luciani <ja...@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);
+ }
}
}
[2/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24630b4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24630b4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24630b4a
Branch: refs/heads/trunk
Commit: 24630b4a1fcfe8fc7fdb228a3f87f153905b519f
Parents: b477c0f 52d8197
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Jan 7 12:28:00 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Jan 7 12:28:00 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/24630b4a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1533619,a26f9e0..7f6b761
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.2.5
+3.0.3
+ * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
+ * Fix potential assertion error during compaction (CASSANDRA-10944)
+ * Fix counting of received sstables in streaming (CASSANDRA-10949)
+ * Implement hints compression (CASSANDRA-9428)
+ * Fix potential assertion error when reading static columns (CASSANDRA-10903)
+ * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
+ * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
+ * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
+ * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
+ * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
+ * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
+ * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
+Merged from 2.2:
+ * 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)
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17e79b7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17e79b7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17e79b7a
Branch: refs/heads/trunk
Commit: 17e79b7acde24b159fdf820c6b8b5f5c45743e59
Parents: caedc8f 24630b4
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Jan 7 12:42:37 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Jan 7 12:42:37 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
.../apache/cassandra/metrics/EstimatedHistogramReservoir.java | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17e79b7a/CHANGES.txt
----------------------------------------------------------------------
[4/4] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31f67c28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31f67c28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31f67c28
Branch: refs/heads/trunk
Commit: 31f67c2898a9d4b310de513737f703dc2514b84c
Parents: c9d209b 17e79b7
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Jan 7 12:43:13 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Jan 7 12:43:13 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
.../apache/cassandra/metrics/EstimatedHistogramReservoir.java | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31f67c28/CHANGES.txt
----------------------------------------------------------------------