Merge branch 'cassandra-2.0' into trunk
Conflicts:
NEWS.txt
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fb09048
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fb09048
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4fb09048
Branch: refs/heads/trunk
Commit: 4fb090481d508aa9c1c18d79cd012702dfc8f45f
Parents: 3093241 0d976a8
Author: Aleksey Yeschenko <[email protected]>
Authored: Fri Sep 20 19:49:00 2013 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Fri Sep 20 19:49:00 2013 +0300
----------------------------------------------------------------------
NEWS.txt | 4 ++-
debian/changelog | 6 ++++
src/java/org/apache/cassandra/cql3/Cql.g | 1 +
.../apache/cassandra/db/ColumnFamilyStore.java | 2 +-
.../org/apache/cassandra/db/DataTracker.java | 30 ++++++++------------
.../db/compaction/LeveledManifest.java | 8 +++---
.../SSTableListChangedNotification.java | 8 ++++--
7 files changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fb09048/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 8990769,fc257f4..a7576d2
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,18 -13,7 +13,20 @@@ restore snapshots created with the prev
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
++
+2.1
+===
++
+Upgrading
+---------
+ - Rolling upgrades from anything pre-2.0 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.
+
+
- 2.0.2
+ 2.0.1
=====
Upgrading
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fb09048/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fb09048/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index 2d5aa27,82aa2d6..23f842d
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@@ -125,12 -127,12 +125,12 @@@ public class LeveledManifes
return newLevel;
}
- public synchronized void replace(Iterable<SSTableReader> removed,
Iterable<SSTableReader> added)
+ public synchronized void replace(Collection<SSTableReader> removed,
Collection<SSTableReader> added)
{
- assert !Iterables.isEmpty(removed); // use add() instead of promote
when adding new sstables
+ assert !removed.isEmpty(); // use add() instead of promote when
adding new sstables
logDistribution();
if (logger.isDebugEnabled())
- logger.debug("Replacing [" + toString(removed) + "]");
+ logger.debug("Replacing [{}]", toString(removed));
// the level for the added sstables is the max of the removed ones,
// plus one if the removed were all on the same level
