You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/02/05 16:38:30 UTC
[5/5] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
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/58d1a4f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58d1a4f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58d1a4f8
Branch: refs/heads/trunk
Commit: 58d1a4f816251a889f3eb4eed801dc8b0ccfc42d
Parents: c004f9f 49bb972
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 5 16:38:18 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 5 16:38:18 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
NEWS.txt | 13 +++----------
doc/cql3/CQL.textile | 4 +---
3 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58d1a4f8/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58d1a4f8/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 185f60c,b18150f..9dd2ad6
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,47 -13,7 +13,37 @@@ restore snapshots created with the prev
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+2.1
+===
+
+New features
+------------
+ - SSTable data directory name is slightly changed. Each directory will
+ have hex string appended after CF name, e.g.
+ ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
+ This hex string part represents unique ColumnFamily ID.
+ Note that existing directories are used as is, so only newly created
+ directories after upgrade have new directory name format.
+ - Saved key cache files also have ColumnFamily ID in their file name.
+
+Upgrading
+---------
+ - Rolling upgrades from anything pre-2.0.5 is not supported.
+ - For leveled compaction users, 2.0 must be atleast started before
+ upgrading to 2.1 due to the fact that the old JSON leveled
+ manifest is migrated into the sstable metadata files on startup
+ in 2.0 and this code is gone from 2.1.
+ - For size-tiered compaction users, Cassandra now defaults to ignoring
+ the coldest 5% of sstables. This can be customized with the
+ cold_reads_to_omit compaction option; 0.0 omits nothing (the old
+ behavior) and 1.0 omits everything.
+ - Multithreaded compaction has been removed.
+ - Counters implementation has been changed, replaced by a safer one with
+ less caveats, but different performance characteristics. You might have
+ to change your data model to accomodate the new implementation.
+ (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the dev
+ blog post at http://www.datastax.com/dev/blog/<PLACEHOLDER> for details).
- 2.0.6
- =====
-
- New features
- ------------
- - Scrub can now optionally skip corrupt counter partitions. Please note
- that this will lead to the loss of all the counter updates in the skipped
- partition. See the --skip-corrupted option.
-
-
2.0.5
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58d1a4f8/doc/cql3/CQL.textile
----------------------------------------------------------------------