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 2015/09/16 15:33:22 UTC

cassandra git commit: Default coordinator batchlog off with option to enable

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 649a106c3 -> a22d16b7a


Default coordinator batchlog off with option to enable

Patch by tjake; reviewed by Joel Knighton for CASSANDRA-10230


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a22d16b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a22d16b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a22d16b7

Branch: refs/heads/cassandra-3.0
Commit: a22d16b7a347ea43631d343eec47209904bd42d3
Parents: 649a106
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Sep 15 14:22:35 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Sep 16 09:30:11 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 .../org/apache/cassandra/db/view/MaterializedViewManager.java    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22d16b7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b2ce1e..7bb5b71 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.0-rc1
+ * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230)
  * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318)
  * Give index implementations more control over rebuild operations (CASSANDRA-10312)
  * Update index file format (CASSANDRA-10314)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22d16b7/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java b/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
index ac6a256..41f4ed0 100644
--- a/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
@@ -59,7 +59,7 @@ import org.apache.cassandra.service.StorageService;
 public class MaterializedViewManager
 {
     private static final Striped<Lock> LOCKS = Striped.lazyWeakLock(DatabaseDescriptor.getConcurrentWriters() * 1024);
-    private static final boolean disableCoordinatorBatchlog = Boolean.getBoolean("cassandra.mv_disable_coordinator_batchlog");
+    private static final boolean enableCoordinatorBatchlog = Boolean.getBoolean("cassandra.mv_enable_coordinator_batchlog");
 
     private final ConcurrentNavigableMap<String, MaterializedView> viewsByName;
 
@@ -196,7 +196,7 @@ public class MaterializedViewManager
 
     public static boolean updatesAffectView(Collection<? extends IMutation> mutations, boolean coordinatorBatchlog)
     {
-        if (coordinatorBatchlog && disableCoordinatorBatchlog)
+        if (coordinatorBatchlog && !enableCoordinatorBatchlog)
             return false;
 
         for (IMutation mutation : mutations)