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 2015/08/14 16:27:24 UTC
[1/3] cassandra git commit: fix histogram overflow exception
Repository: cassandra
Updated Branches:
refs/heads/trunk f43663aaf -> 90bd5cae4
fix histogram overflow exception
Patch by tjake; reviewed by carlyeks for CASSANDRA-9973
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23826f7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23826f7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23826f7a
Branch: refs/heads/trunk
Commit: 23826f7a26f8fb662d78c5ec9976a89c57d8ac9f
Parents: 2d8ccf0
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Aug 11 12:04:35 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Aug 14 10:22:53 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/metrics/EstimatedHistogramReservoir.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23826f7a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3b548e5..6a9dc1e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.1
+ * Fix histogram overflow exception (CASSANDRA-9973)
* Route gossip messages over dedicated socket (CASSANDRA-9237)
* Add checksum to saved cache files (CASSANDRA-9265)
* Log warning when using an aggregate without partition key (CASSANDRA-9737)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23826f7a/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 b7266e4..3051711 100644
--- a/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java
+++ b/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java
@@ -33,9 +33,10 @@ public class EstimatedHistogramReservoir implements Reservoir
{
EstimatedHistogram histogram;
+ // Default to >4 hours of in nanoseconds of buckets
public EstimatedHistogramReservoir()
{
- this(128);
+ this(164);
}
public EstimatedHistogramReservoir(int numBuckets)
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90bd5cae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90bd5cae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90bd5cae
Branch: refs/heads/trunk
Commit: 90bd5cae4a057b716fec653fded6b339a6e30da7
Parents: f43663a 7b02696
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Aug 14 10:27:10 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Aug 14 10:27:10 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/metrics/EstimatedHistogramReservoir.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90bd5cae/CHANGES.txt
----------------------------------------------------------------------
[2/3] 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
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b026964
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b026964
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b026964
Branch: refs/heads/trunk
Commit: 7b026964b86ce07447e7904ab0286d40a203f0c6
Parents: 8b7caa1 23826f7
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Aug 14 10:26:31 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Aug 14 10:26:31 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/metrics/EstimatedHistogramReservoir.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b026964/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fae0cfc,6a9dc1e..e7cc12e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
-2.2.1
+3.0.0-beta1
+ * Add option to only purge repaired tombstones (CASSANDRA-6434)
+ * Change authorization handling for MVs (CASSANDRA-9927)
+ * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
+ * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
+ * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
+ * Fix multiple slices on RowSearchers (CASSANDRA-10002)
+ * Fix bug in merging of collections (CASSANDRA-10001)
+ * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
+ * Repair improvements when using vnodes (CASSANDRA-5220)
+ * Disable scripted UDFs by default (CASSANDRA-9889)
+ * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
+ * Use byte to serialize MT hash length (CASSANDRA-9792)
+ * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
+ * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
+Merged from 2.2:
+ * Fix histogram overflow exception (CASSANDRA-9973)
* Route gossip messages over dedicated socket (CASSANDRA-9237)
* Add checksum to saved cache files (CASSANDRA-9265)
* Log warning when using an aggregate without partition key (CASSANDRA-9737)