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 2016/09/21 23:34:07 UTC

[2/3] cassandra git commit: Skip writing MV mutations to commitlog on mutation.applyUnsafe()

Skip writing MV mutations to commitlog on mutation.applyUnsafe()

Patch by Paulo Motta; Reviewed by Carl Yeksigian for CASSANDRA-11670


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

Branch: refs/heads/trunk
Commit: 88d47911dd9f590a335af7429b128ffc726dc5ff
Parents: fc1cbde
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Sep 19 20:18:51 2016 -0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Sep 21 16:31:42 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                    | 1 +
 src/java/org/apache/cassandra/db/Keyspace.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d47911/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b873eb1..1a97087 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.10
+ * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670)
  * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060)
  * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516)
  * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d47911/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java
index bcf1d24..8d710d1 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -482,7 +482,7 @@ public class Keyspace
                     try
                     {
                         Tracing.trace("Creating materialized view mutations from base table replica");
-                        viewManager.forTable(upd.metadata()).pushViewReplicaUpdates(upd, !isClReplay, baseComplete);
+                        viewManager.forTable(upd.metadata()).pushViewReplicaUpdates(upd, writeCommitLog && !isClReplay, baseComplete);
                     }
                     catch (Throwable t)
                     {