You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/06/26 22:57:16 UTC
[1/3] git commit: Fix backward VV serialization of the LEFT state
Updated Branches:
refs/heads/cassandra-1.2 b97b490df -> 54266ea70
refs/heads/trunk 29232a88d -> 1dacd2b6d
Fix backward VV serialization of the LEFT state
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54266ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54266ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54266ea7
Branch: refs/heads/cassandra-1.2
Commit: 54266ea705b20e12a6f03dab69fa5d6b05e160a7
Parents: b97b490
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 26 15:52:43 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 26 15:52:43 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +++
NEWS.txt | 10 ++++++++++
src/java/org/apache/cassandra/gms/VersionedValue.java | 4 ++--
3 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2931916..cb3fede 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+1.2.7
+ * Fix serialization of the LEFT gossip value (CASSANDRA-5696)
+
1.2.6
* Fix tracing when operation completes before all responses arrive (CASSANDRA-5668)
* Fix cross-DC mutation forwarding (CASSANDRA-5632)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index cb40981..d4d127b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,16 @@ restore snapshots created with the previous major version using the
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+1.2.7
+=====
+Upgrading
+---------
+ - If you have decommissioned a node in the past 72 hours, it is imperative
+ that you not upgrade until such time has passed, or do a full cluster
+ restart (not rolling) before beginning the upgrade. This only applies to
+ decommission, not removetoken.
+
+
1.2.6
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/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 5841c4b..60459c8 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -148,8 +148,8 @@ public class VersionedValue implements Comparable<VersionedValue>
public VersionedValue left(Collection<Token> tokens, long expireTime)
{
return new VersionedValue(versionString(VersionedValue.STATUS_LEFT,
- Long.toString(expireTime),
- makeTokenString(tokens)));
+ makeTokenString(tokens),
+ Long.toString(expireTime)));
}
public VersionedValue moving(Token token)
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Conflicts:
CHANGES.txt
NEWS.txt
src/java/org/apache/cassandra/gms/VersionedValue.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dacd2b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dacd2b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dacd2b6
Branch: refs/heads/trunk
Commit: 1dacd2b6d1e76a4a55181e7a78978f3a9335fd32
Parents: 29232a8 54266ea
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 26 15:56:59 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 26 15:56:59 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
NEWS.txt | 10 ++++++++++
src/java/org/apache/cassandra/gms/VersionedValue.java | 4 ++--
3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dacd2b6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a79d2db,cb3fede..1c5abd0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,77 -1,5 +1,77 @@@
+2.0
+ * Removed on-heap row cache (CASSANDRA-5348)
+ * use nanotime consistently for node-local timeouts (CASSANDRA-5581)
+ * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577)
+ * Experimental triggers (CASSANDRA-1311)
+ * JEMalloc support for off-heap allocation (CASSANDRA-3997)
+ * Single-pass compaction (CASSANDRA-4180)
+ * Removed token range bisection (CASSANDRA-5518)
+ * Removed compatibility with pre-1.2.5 sstables and network messages
+ (CASSANDRA-5511)
+ * removed PBSPredictor (CASSANDRA-5455)
+ * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619)
+ * Leveled compaction performs size-tiered compactions in L0
+ (CASSANDRA-5371, 5439)
+ * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339)
+ * Log when a node is down longer than the hint window (CASSANDRA-4554)
+ * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917)
+ * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407)
+ * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430)
+ * Change Message IDs to ints (CASSANDRA-5307)
+ * Move sstable level information into the Stats component, removing the
+ need for a separate Manifest file (CASSANDRA-4872)
+ * avoid serializing to byte[] on commitlog append (CASSANDRA-5199)
+ * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650)
+ * add default_time_to_live (CASSANDRA-3974)
+ * add memtable_flush_period_in_ms (CASSANDRA-4237)
+ * replace supercolumns internally by composites (CASSANDRA-3237, 5123)
+ * upgrade thrift to 0.9.0 (CASSANDRA-3719)
+ * drop unnecessary keyspace parameter from user-defined compaction API
+ (CASSANDRA-5139)
+ * more robust solution to incomplete compactions + counters (CASSANDRA-5151)
+ * Change order of directory searching for c*.in.sh (CASSANDRA-3983)
+ * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271)
+ * Allow custom configuration loader (CASSANDRA-5045)
+ * Remove memory emergency pressure valve logic (CASSANDRA-3534)
+ * Reduce request latency with eager retry (CASSANDRA-4705)
+ * cqlsh: Remove ASSUME command (CASSANDRA-5331)
+ * Rebuild BF when loading sstables if bloom_filter_fp_chance
+ has changed since compaction (CASSANDRA-5015)
+ * remove row-level bloom filters (CASSANDRA-4885)
+ * Change Kernel Page Cache skipping into row preheating (disabled by default)
+ (CASSANDRA-4937)
+ * Improve repair by deciding on a gcBefore before sending
+ out TreeRequests (CASSANDRA-4932)
+ * Add an official way to disable compactions (CASSANDRA-5074)
+ * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919)
+ * Add binary protocol versioning (CASSANDRA-5436)
+ * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530)
+ * Add alias support to SELECT statement (CASSANDRA-5075)
+ * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541)
+ * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579)
+ * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585)
+ * Track max/min column names in sstables to be able to optimize slice
+ queries (CASSANDRA-5514, CASSANDRA-5595, CASSANDRA-5600)
+ * Binary protocol: allow batching already prepared statements (CASSANDRA-4693)
+ * Allow preparing timestamp, ttl and limit in CQL3 queries (CASSANDRA-4450)
+ * Support native link w/o JNA in Java7 (CASSANDRA-3734)
+ * Use SASL authentication in binary protocol v2 (CASSANDRA-5545)
+ * Replace Thrift HsHa with LMAX Disruptor based implementation (CASSANDRA-5582)
+ * cqlsh: Add row count to SELECT output (CASSANDRA-5636)
+ * Include a timestamp with all read commands to determine column expiration
+ (CASSANDRA-5149)
+ * Streaming 2.0 (CASSANDRA-5286)
+ * Conditional create/drop ks/table/index statements in CQL3 (CASSANDRA-2737)
+ * more pre-table creation property validation (CASSANDRA-5693)
+ * Redesign repair messages (CASSANDRA-5426)
+ * Fix ALTER RENAME post-5125 (CASSANDRA-5702)
+ * Disallow renaming a 2ndary indexed column (CASSANDRA-5705)
+
+
1.2.7
+ * Fix ReadResponseSerializer.serializedSize() for digest reads (CASSANDRA-5476)
+ * allow sstable2json on 2i CFs (CASSANDRA-5694)
-
+ * Fix serialization of the LEFT gossip value (CASSANDRA-5696)
1.2.6
* Fix tracing when operation completes before all responses arrive (CASSANDRA-5668)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dacd2b6/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 5e784d1,d4d127b..7e12e2c
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,64 -13,16 +13,74 @@@ restore snapshots created with the prev
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+2.0.0
+=====
+
+Upgrading
+---------
+ - CAS and new features in CQL such as DROP COLUMN assume that cell
+ timestamps are microseconds-since-epoch. Do not use these
+ features if you are using client-specified timestamps with some
+ other source.
+ - Upgrading is ONLY supported from Cassandra 1.2.5 or later. This
+ goes for sstable compatibility as well as network. When
+ upgrading from an earlier release, upgrade to 1.2.5 first and
+ run upgradesstables before proceeding to 2.0.
+ - Replication and strategy options do not accept unknown options anymore.
+ This was already the case for CQL3 in 1.2 but this is now the case for
+ thrift too.
+ - auto_bootstrap of a single-token node with no initial_token will
+ now pick a random token instead of bisecting an existing token
+ range. We recommend upgrading to vnodes; failing that, we
+ recommend specifying initial_token.
+ - reduce_cache_sizes_at, reduce_cache_capacity_to, and
+ flush_largest_memtables_at options have been removed from cassandra.yaml.
+ - CacheServiceMBean.reduceCacheSizes() has been removed.
+ Use CacheServiceMBean.set{Key,Row}CacheCapacityInMB() instead.
+ - authority option in cassandra.yaml has been deprecated since 1.2.0,
+ but it has been completely removed in 2.0. Please use 'authorizer' option.
+ - ASSUME command has been removed from cqlsh. Use CQL3 blobAsType() and
+ typeAsBlob() conversion functions instead.
+ See https://cassandra.apache.org/doc/cql3/CQL.html#blobFun for details.
+ - Inputing blobs as string constants is now fully deprecated in
+ favor of blob constants. Make sure to update your applications to use
+ the new syntax while you are still on 1.2 (which supports both string
+ and blob constants for blob input) before upgrading to 2.0.
+
+Operations
+----------
+ - Major compactions, cleanup, scrub, and upgradesstables will interrupt
+ any in-progress compactions (but not repair validations) when invoked.
+ - Disabling autocompactions by setting min/max compaction threshold to 0
+ has been deprecated, instead, use the nodetool commands 'disableautocompaction'
+ and 'enableautocompaction' or set the compaction strategy option enabled = false
+ - ALTER TABLE DROP has been reenabled for CQL3 tables and has new semantics now.
+ See https://cassandra.apache.org/doc/cql3/CQL.html#alterTableStmt and
+ https://issues.apache.org/jira/browse/CASSANDRA-3919 for details.
+ - CAS uses gc_grace_seconds to determine how long to keep unused paxos
+ state around for, or a minimum of three hours.
+
+Features
+--------
+ - Alias support has been added to CQL3 SELECT statement. Refer to
+ CQL3 documentation (http://cassandra.apache.org/doc/cql3/CQL.html) for details.
+ - JEMalloc support (see memory_allocator in cassandra.yaml)
+ - Experimental triggers support. See examples/ for how to use. "Experimental"
+ means "tied closely to internal data structures; we plan to decouple this in
+ the future, which will probably break triggers written against this initial
+ API."
+
+
+ 1.2.7
+ =====
+ Upgrading
+ ---------
+ - If you have decommissioned a node in the past 72 hours, it is imperative
+ that you not upgrade until such time has passed, or do a full cluster
+ restart (not rolling) before beginning the upgrade. This only applies to
+ decommission, not removetoken.
+
+
1.2.6
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dacd2b6/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/VersionedValue.java
index b4cfa41,60459c8..efb40e7
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@@ -150,8 -148,8 +150,8 @@@ public class VersionedValue implements
public VersionedValue left(Collection<Token> tokens, long expireTime)
{
return new VersionedValue(versionString(VersionedValue.STATUS_LEFT,
- Long.toString(expireTime),
- makeTokenString(tokens)));
- makeTokenString(tokens),
- Long.toString(expireTime)));
++ makeTokenString(tokens),
++ Long.toString(expireTime)));
}
public VersionedValue moving(Token token)
[2/3] git commit: Fix backward VV serialization of the LEFT state
Posted by br...@apache.org.
Fix backward VV serialization of the LEFT state
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54266ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54266ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54266ea7
Branch: refs/heads/trunk
Commit: 54266ea705b20e12a6f03dab69fa5d6b05e160a7
Parents: b97b490
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 26 15:52:43 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 26 15:52:43 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +++
NEWS.txt | 10 ++++++++++
src/java/org/apache/cassandra/gms/VersionedValue.java | 4 ++--
3 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2931916..cb3fede 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+1.2.7
+ * Fix serialization of the LEFT gossip value (CASSANDRA-5696)
+
1.2.6
* Fix tracing when operation completes before all responses arrive (CASSANDRA-5668)
* Fix cross-DC mutation forwarding (CASSANDRA-5632)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index cb40981..d4d127b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,16 @@ restore snapshots created with the previous major version using the
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+1.2.7
+=====
+Upgrading
+---------
+ - If you have decommissioned a node in the past 72 hours, it is imperative
+ that you not upgrade until such time has passed, or do a full cluster
+ restart (not rolling) before beginning the upgrade. This only applies to
+ decommission, not removetoken.
+
+
1.2.6
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/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 5841c4b..60459c8 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -148,8 +148,8 @@ public class VersionedValue implements Comparable<VersionedValue>
public VersionedValue left(Collection<Token> tokens, long expireTime)
{
return new VersionedValue(versionString(VersionedValue.STATUS_LEFT,
- Long.toString(expireTime),
- makeTokenString(tokens)));
+ makeTokenString(tokens),
+ Long.toString(expireTime)));
}
public VersionedValue moving(Token token)