You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/09/20 18:49:11 UTC
[1/5] git commit: Update versions for 2.0.1 release
Updated Branches:
refs/heads/trunk 309324171 -> 4fb090481
Update versions for 2.0.1 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb96db6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb96db6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb96db6c
Branch: refs/heads/trunk
Commit: eb96db6c19515e6d1215230f29d25b46fcd005ef
Parents: 742f6a3
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Sep 19 13:48:30 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Sep 20 12:19:34 2013 +0200
----------------------------------------------------------------------
NEWS.txt | 2 +-
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb96db6c/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 3712073..fc257f4 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,7 +13,7 @@ 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.
-2.0.2
+2.0.1
=====
Upgrading
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb96db6c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 72291e2..5731540 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.0.0"/>
+ <property name="base.version" value="2.0.1"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb96db6c/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 9905726..61a91d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.1) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Thu, 19 Sep 2013 13:47:16 +0200
+
cassandra (2.0.0) unstable; urgency=low
* New release
[5/5] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
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 <al...@apache.org>
Authored: Fri Sep 20 19:49:00 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
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
[4/5] git commit: Replace Iterable->Collection in SSTCN
Posted by al...@apache.org.
Replace Iterable->Collection in SSTCN
ninja-patch by Aleksey Yeschenko; ninja-reviewed by Jonathan Ellis
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d976a8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d976a8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d976a8f
Branch: refs/heads/trunk
Commit: 0d976a8fb57d6524e81a6a3033f7672e5b2be2ae
Parents: bcb4da7
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Sep 20 19:43:15 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Sep 20 19:43:15 2013 +0300
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 2 +-
.../org/apache/cassandra/db/DataTracker.java | 30 ++++++++------------
.../db/compaction/LeveledManifest.java | 8 +++---
.../SSTableListChangedNotification.java | 8 ++++--
4 files changed, 22 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d976a8f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4c9f72d..1ff4832 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1066,7 +1066,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
data.markObsolete(sstables, compactionType);
}
- public void replaceCompactedSSTables(Collection<SSTableReader> sstables, Iterable<SSTableReader> replacements, OperationType compactionType)
+ public void replaceCompactedSSTables(Collection<SSTableReader> sstables, Collection<SSTableReader> replacements, OperationType compactionType)
{
data.replaceCompactedSSTables(sstables, replacements, compactionType);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d976a8f/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java
index e7d26b0..f30ec1e 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -44,14 +44,14 @@ public class DataTracker
{
private static final Logger logger = LoggerFactory.getLogger(DataTracker.class);
- public final Collection<INotificationConsumer> subscribers = new CopyOnWriteArrayList<INotificationConsumer>();
+ public final Collection<INotificationConsumer> subscribers = new CopyOnWriteArrayList<>();
public final ColumnFamilyStore cfstore;
private final AtomicReference<View> view;
public DataTracker(ColumnFamilyStore cfstore)
{
this.cfstore = cfstore;
- this.view = new AtomicReference<View>();
+ this.view = new AtomicReference<>();
this.init();
}
@@ -231,7 +231,7 @@ public class DataTracker
notifySSTablesChanged(sstables, Collections.<SSTableReader>emptyList(), compactionType);
}
- public void replaceCompactedSSTables(Collection<SSTableReader> sstables, Iterable<SSTableReader> replacements, OperationType compactionType)
+ public void replaceCompactedSSTables(Collection<SSTableReader> sstables, Collection<SSTableReader> replacements, OperationType compactionType)
{
replace(sstables, replacements);
notifySSTablesChanged(sstables, replacements, compactionType);
@@ -285,15 +285,13 @@ public class DataTracker
void removeUnreadableSSTables(File directory)
{
View currentView, newView;
- List<SSTableReader> remaining = new ArrayList<SSTableReader>();
+ List<SSTableReader> remaining = new ArrayList<>();
do
{
currentView = view.get();
for (SSTableReader r : currentView.nonCompactingSStables())
- {
if (!r.descriptor.directory.equals(directory))
remaining.add(r);
- }
if (remaining.size() == currentView.nonCompactingSStables().size())
return;
@@ -379,9 +377,7 @@ public class DataTracker
{
long n = 0;
for (SSTableReader sstable : getSSTables())
- {
n += sstable.estimatedKeys();
- }
return n;
}
@@ -415,13 +411,11 @@ public class DataTracker
return 0;
}
- public void notifySSTablesChanged(Iterable<SSTableReader> removed, Iterable<SSTableReader> added, OperationType compactionType)
+ public void notifySSTablesChanged(Collection<SSTableReader> removed, Collection<SSTableReader> added, OperationType compactionType)
{
+ INotification notification = new SSTableListChangedNotification(added, removed, compactionType);
for (INotificationConsumer subscriber : subscribers)
- {
- INotification notification = new SSTableListChangedNotification(added, removed, compactionType);
subscriber.handleNotification(notification, this);
- }
}
public void notifyAdded(SSTableReader added)
@@ -451,7 +445,7 @@ public class DataTracker
public static SSTableIntervalTree buildIntervalTree(Iterable<SSTableReader> sstables)
{
- List<Interval<RowPosition, SSTableReader>> intervals = new ArrayList<Interval<RowPosition, SSTableReader>>(Iterables.size(sstables));
+ List<Interval<RowPosition, SSTableReader>> intervals = new ArrayList<>(Iterables.size(sstables));
for (SSTableReader sstable : sstables)
intervals.add(Interval.<RowPosition, SSTableReader>create(sstable.first, sstable.last, sstable));
return new SSTableIntervalTree(intervals);
@@ -519,8 +513,8 @@ public class DataTracker
{
Set<Memtable> newPending = ImmutableSet.copyOf(Sets.difference(memtablesPendingFlush, Collections.singleton(flushedMemtable)));
Set<SSTableReader> newSSTables = newSSTable == null
- ? sstables
- : newSSTables(newSSTable);
+ ? sstables
+ : newSSTables(newSSTable);
SSTableIntervalTree intervalTree = buildIntervalTree(newSSTables);
return new View(memtable, newPending, newSSTables, compacting, intervalTree);
}
@@ -556,12 +550,12 @@ public class DataTracker
ImmutableSet<SSTableReader> oldSet = ImmutableSet.copyOf(oldSSTables);
int newSSTablesSize = sstables.size() - oldSSTables.size() + Iterables.size(replacements);
assert newSSTablesSize >= Iterables.size(replacements) : String.format("Incoherent new size %d replacing %s by %s in %s", newSSTablesSize, oldSSTables, replacements, this);
- Set<SSTableReader> newSSTables = new HashSet<SSTableReader>(newSSTablesSize);
+ Set<SSTableReader> newSSTables = new HashSet<>(newSSTablesSize);
+
for (SSTableReader sstable : sstables)
- {
if (!oldSet.contains(sstable))
newSSTables.add(sstable);
- }
+
Iterables.addAll(newSSTables, replacements);
assert newSSTables.size() == newSSTablesSize : String.format("Expecting new size of %d, got %d while replacing %s by %s in %s", newSSTablesSize, newSSTables.size(), oldSSTables, replacements, this);
return ImmutableSet.copyOf(newSSTables);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d976a8f/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index bc6824a..82aa2d6 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@ -127,9 +127,9 @@ public class LeveledManifest
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) + "]");
@@ -140,7 +140,7 @@ public class LeveledManifest
remove(sstable);
// it's valid to do a remove w/o an add (e.g. on truncate)
- if (!added.iterator().hasNext())
+ if (added.isEmpty())
return;
if (logger.isDebugEnabled())
@@ -198,7 +198,7 @@ public class LeveledManifest
}
}
- private String toString(Iterable<SSTableReader> sstables)
+ private String toString(Collection<SSTableReader> sstables)
{
StringBuilder builder = new StringBuilder();
for (SSTableReader sstable : sstables)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d976a8f/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java b/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java
index ca7ead9..c36583c 100644
--- a/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java
+++ b/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java
@@ -17,17 +17,19 @@
*/
package org.apache.cassandra.notifications;
+import java.util.Collection;
+
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.db.compaction.OperationType;
public class SSTableListChangedNotification implements INotification
{
- public final Iterable<SSTableReader> removed;
- public final Iterable<SSTableReader> added;
+ public final Collection<SSTableReader> removed;
+ public final Collection<SSTableReader> added;
public final OperationType compactionType;
- public SSTableListChangedNotification(Iterable<SSTableReader> added, Iterable<SSTableReader> removed, OperationType compactionType)
+ public SSTableListChangedNotification(Collection<SSTableReader> added, Collection<SSTableReader> removed, OperationType compactionType)
{
this.removed = removed;
this.added = added;
[3/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@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/bcb4da73
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcb4da73
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcb4da73
Branch: refs/heads/trunk
Commit: bcb4da739cc6a0fdb83f49772dc0de1659bc8ced
Parents: eb96db6 a0fa697
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 20 10:49:10 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 20 10:49:10 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Cql.g | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcb4da73/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Cql.g
index 6fb0db4,7101c71..17afb00
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@@ -869,10 -789,9 +869,11 @@@ relation[List<Relation> clauses
for (ColumnIdentifier id : l)
$clauses.add(new Relation(id, type, t, true));
}
+ | name=cident K_IN { Term.Raw marker = null; } (QMARK { marker = newINBindVariables(null); } | ':' mid=cident { marker = newINBindVariables(mid); })
+ { $clauses.add(new Relation(name, Relation.Type.IN, marker)); }
| name=cident K_IN { Relation rel = Relation.createInRelation($name.id); }
'(' ( f1=term { rel.addInValue(f1); } (',' fN=term { rel.addInValue(fN); } )* )? ')' { $clauses.add(rel); }
+ | '(' relation[$clauses] ')'
;
comparatorType returns [CQL3Type t]
[2/5] git commit: allow parenthesis around where conditions in cql
patch by dbrosius reviewed by slebresne for cassandra-6037
Posted by al...@apache.org.
allow parenthesis around where conditions in cql
patch by dbrosius reviewed by slebresne for cassandra-6037
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0fa6971
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0fa6971
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0fa6971
Branch: refs/heads/trunk
Commit: a0fa69715f7913804fbd55c1280e0d35edd3bf0f
Parents: df046d6
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 20 10:47:36 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 20 10:47:36 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Cql.g | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0fa6971/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g
index 2445bf2..7101c71 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -791,6 +791,7 @@ relation[List<Relation> clauses]
}
| name=cident K_IN { Relation rel = Relation.createInRelation($name.id); }
'(' ( f1=term { rel.addInValue(f1); } (',' fN=term { rel.addInValue(fN); } )* )? ')' { $clauses.add(rel); }
+ | '(' relation[$clauses] ')'
;
comparatorType returns [CQL3Type t]