You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/12/03 04:16:59 UTC
[1/6] git commit: Revert "Reduce gossip memory use by interning
VersionedValue strings"
Updated Branches:
refs/heads/cassandra-1.2 7ad39601d -> ecd94221a
refs/heads/cassandra-2.0 41d64cd0a -> ef768a555
refs/heads/trunk f281a837b -> ab9fe1ae8
Revert "Reduce gossip memory use by interning VersionedValue strings"
This reverts commit 7ad39601dd3c248595d84f016c41ac35abd786ed.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecd94221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecd94221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecd94221
Branch: refs/heads/cassandra-1.2
Commit: ecd94221a25494ece1af22e9fa8c1f8d34eaf48d
Parents: 7ad3960
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Dec 2 21:16:24 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Dec 2 21:16:24 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 -
src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecd94221/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 88474ce..c80a00a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,6 @@
* Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
* Change snapshot response message verb (CASSANDRA-6415)
- * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
1.2.12
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecd94221/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java
index 69efb3b..60459c8 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -78,7 +78,7 @@ public class VersionedValue implements Comparable<VersionedValue>
private VersionedValue(String value, int version)
{
assert value != null;
- this.value = value.intern();
+ this.value = value;
this.version = version;
}
[2/6] git commit: Revert "Reduce gossip memory use by interning
VersionedValue strings"
Posted by jb...@apache.org.
Revert "Reduce gossip memory use by interning VersionedValue strings"
This reverts commit 7ad39601dd3c248595d84f016c41ac35abd786ed.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecd94221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecd94221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecd94221
Branch: refs/heads/cassandra-2.0
Commit: ecd94221a25494ece1af22e9fa8c1f8d34eaf48d
Parents: 7ad3960
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Dec 2 21:16:24 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Dec 2 21:16:24 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 -
src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecd94221/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 88474ce..c80a00a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,6 @@
* Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
* Change snapshot response message verb (CASSANDRA-6415)
- * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
1.2.12
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecd94221/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java
index 69efb3b..60459c8 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -78,7 +78,7 @@ public class VersionedValue implements Comparable<VersionedValue>
private VersionedValue(String value, int version)
{
assert value != null;
- this.value = value.intern();
+ this.value = value;
this.version = version;
}
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef768a55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef768a55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef768a55
Branch: refs/heads/trunk
Commit: ef768a555d2423add1a3be649043f6e3725bb5de
Parents: 41d64cd ecd9422
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Dec 2 21:16:33 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Dec 2 21:16:33 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 -
src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef768a55/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b8a477d,c80a00a..8a95fa8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,45 -8,9 +12,44 @@@ Merged from 1.2
* Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
* Change snapshot response message verb (CASSANDRA-6415)
- * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
-1.2.12
+2.0.3
+ * Fix FD leak on slice read path (CASSANDRA-6275)
+ * Cancel read meter task when closing SSTR (CASSANDRA-6358)
+ * free off-heap IndexSummary during bulk (CASSANDRA-6359)
+ * Recover from IOException in accept() thread (CASSANDRA-6349)
+ * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338)
+ * Fix trying to hint timed out counter writes (CASSANDRA-6322)
+ * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)
+ * Avoid flushing compaction_history after each operation (CASSANDRA-6287)
+ * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
+ * Skip loading corrupt key cache (CASSANDRA-6260)
+ * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
+ * Compact hottest sstables first and optionally omit coldest from
+ compaction entirely (CASSANDRA-6109)
+ * Fix modifying column_metadata from thrift (CASSANDRA-6182)
+ * cqlsh: fix LIST USERS output (CASSANDRA-6242)
+ * Add IRequestSink interface (CASSANDRA-6248)
+ * Update memtable size while flushing (CASSANDRA-6249)
+ * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252)
+ * Require Permission.SELECT for CAS updates (CASSANDRA-6247)
+ * New CQL-aware SSTableWriter (CASSANDRA-5894)
+ * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270)
+ * Correctly throw error when frame too large (CASSANDRA-5981)
+ * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299)
+ * Fix CQL3 table validation in Thrift (CASSANDRA-6140)
+ * Fix bug missing results with IN clauses (CASSANDRA-6327)
+ * Fix paging with reversed slices (CASSANDRA-6343)
+ * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337)
+ * Support NaN and Infinity as float literals (CASSANDRA-6003)
+ * Remove RF from nodetool ring output (CASSANDRA-6289)
+ * Fix attempting to flush empty rows (CASSANDRA-6374)
+ * Fix potential out of bounds exception when paging (CASSANDRA-6333)
+Merged from 1.2:
+ * Optimize FD phi calculation (CASSANDRA-6386)
+ * Improve initial FD phi estimate when starting up (CASSANDRA-6385)
+ * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
* Invalidate row cache when dropping CF (CASSANDRA-6351)
* add non-jamm path for cached statements (CASSANDRA-6293)
* (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef768a55/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.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/ab9fe1ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab9fe1ae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab9fe1ae
Branch: refs/heads/trunk
Commit: ab9fe1ae892826e59c926ef66e796c729d2f27a2
Parents: f281a83 ef768a5
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Dec 2 21:16:41 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Dec 2 21:16:41 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 -
src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab9fe1ae/CHANGES.txt
----------------------------------------------------------------------
[3/6] git commit: Revert "Reduce gossip memory use by interning
VersionedValue strings"
Posted by jb...@apache.org.
Revert "Reduce gossip memory use by interning VersionedValue strings"
This reverts commit 7ad39601dd3c248595d84f016c41ac35abd786ed.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecd94221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecd94221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecd94221
Branch: refs/heads/trunk
Commit: ecd94221a25494ece1af22e9fa8c1f8d34eaf48d
Parents: 7ad3960
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Dec 2 21:16:24 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Dec 2 21:16:24 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 -
src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecd94221/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 88474ce..c80a00a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,6 @@
* Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
* Change snapshot response message verb (CASSANDRA-6415)
- * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
1.2.12
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecd94221/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java
index 69efb3b..60459c8 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -78,7 +78,7 @@ public class VersionedValue implements Comparable<VersionedValue>
private VersionedValue(String value, int version)
{
assert value != null;
- this.value = value.intern();
+ this.value = value;
this.version = version;
}
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef768a55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef768a55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef768a55
Branch: refs/heads/cassandra-2.0
Commit: ef768a555d2423add1a3be649043f6e3725bb5de
Parents: 41d64cd ecd9422
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Dec 2 21:16:33 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Dec 2 21:16:33 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 -
src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef768a55/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b8a477d,c80a00a..8a95fa8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,45 -8,9 +12,44 @@@ Merged from 1.2
* Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
* Change snapshot response message verb (CASSANDRA-6415)
- * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
-1.2.12
+2.0.3
+ * Fix FD leak on slice read path (CASSANDRA-6275)
+ * Cancel read meter task when closing SSTR (CASSANDRA-6358)
+ * free off-heap IndexSummary during bulk (CASSANDRA-6359)
+ * Recover from IOException in accept() thread (CASSANDRA-6349)
+ * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338)
+ * Fix trying to hint timed out counter writes (CASSANDRA-6322)
+ * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)
+ * Avoid flushing compaction_history after each operation (CASSANDRA-6287)
+ * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
+ * Skip loading corrupt key cache (CASSANDRA-6260)
+ * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
+ * Compact hottest sstables first and optionally omit coldest from
+ compaction entirely (CASSANDRA-6109)
+ * Fix modifying column_metadata from thrift (CASSANDRA-6182)
+ * cqlsh: fix LIST USERS output (CASSANDRA-6242)
+ * Add IRequestSink interface (CASSANDRA-6248)
+ * Update memtable size while flushing (CASSANDRA-6249)
+ * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252)
+ * Require Permission.SELECT for CAS updates (CASSANDRA-6247)
+ * New CQL-aware SSTableWriter (CASSANDRA-5894)
+ * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270)
+ * Correctly throw error when frame too large (CASSANDRA-5981)
+ * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299)
+ * Fix CQL3 table validation in Thrift (CASSANDRA-6140)
+ * Fix bug missing results with IN clauses (CASSANDRA-6327)
+ * Fix paging with reversed slices (CASSANDRA-6343)
+ * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337)
+ * Support NaN and Infinity as float literals (CASSANDRA-6003)
+ * Remove RF from nodetool ring output (CASSANDRA-6289)
+ * Fix attempting to flush empty rows (CASSANDRA-6374)
+ * Fix potential out of bounds exception when paging (CASSANDRA-6333)
+Merged from 1.2:
+ * Optimize FD phi calculation (CASSANDRA-6386)
+ * Improve initial FD phi estimate when starting up (CASSANDRA-6385)
+ * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
* Invalidate row cache when dropping CF (CASSANDRA-6351)
* add non-jamm path for cached statements (CASSANDRA-6293)
* (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef768a55/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------