You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/08/12 16:26:47 UTC
[1/2] git commit: assert renew memtable is only used when durable
writes = false
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 c7834d3da -> bb55843c1
assert renew memtable is only used when durable writes = false
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6caf4265
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6caf4265
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6caf4265
Branch: refs/heads/cassandra-2.1.0
Commit: 6caf4265a41f61e9fbb9b11428702ead8ddb6c69
Parents: 9be6576
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Aug 12 10:24:27 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Aug 12 10:24:27 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/DataTracker.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6caf4265/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 a9eef98..088255e 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -130,6 +130,8 @@ public class DataTracker
*/
public void renewMemtable()
{
+ assert !cfstore.keyspace.metadata.durableWrites;
+
Memtable newMemtable = new Memtable(cfstore, view.get().memtable);
View currentView, newView;
do
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by ja...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb55843c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb55843c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb55843c
Branch: refs/heads/cassandra-2.1.0
Commit: bb55843c1c1d23cf169af2abc5ea4647a84a943f
Parents: c7834d3 6caf426
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Aug 12 10:26:06 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Aug 12 10:26:06 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------