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/08/28 17:05:59 UTC
[1/2] cassandra git commit: Add experimental flag to disable MV
coordinator batchlog
Repository: cassandra
Updated Branches:
refs/heads/trunk b9b1ec803 -> 891d6436c
Add experimental flag to disable MV coordinator batchlog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fcdf191f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcdf191f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcdf191f
Branch: refs/heads/trunk
Commit: fcdf191f51572d60df3b889fd11ad37db8c1503a
Parents: c73ec67
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Aug 28 11:05:07 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Aug 28 11:05:15 2015 -0400
----------------------------------------------------------------------
.../apache/cassandra/db/view/MaterializedViewManager.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcdf191f/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 5184d8d..6c108a2 100644
--- a/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
@@ -59,6 +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_disble_coordinator_batchlog");
private final ConcurrentNavigableMap<String, MaterializedView> viewsByName;
@@ -197,15 +198,18 @@ public class MaterializedViewManager
return null;
}
- public static boolean updatesAffectView(Collection<? extends IMutation> mutations, boolean ignoreRf1)
+ public static boolean updatesAffectView(Collection<? extends IMutation> mutations, boolean coordinatorBatchlog)
{
+ if (coordinatorBatchlog && disableCoordinatorBatchlog)
+ return false;
+
for (IMutation mutation : mutations)
{
for (PartitionUpdate cf : mutation.getPartitionUpdates())
{
Keyspace keyspace = Keyspace.open(cf.metadata().ksName);
- if (ignoreRf1 && keyspace.getReplicationStrategy().getReplicationFactor() == 1)
+ if (coordinatorBatchlog && keyspace.getReplicationStrategy().getReplicationFactor() == 1)
continue;
MaterializedViewManager viewManager = keyspace.getColumnFamilyStore(cf.metadata().cfId).materializedViewManager;
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/891d6436
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/891d6436
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/891d6436
Branch: refs/heads/trunk
Commit: 891d6436cc148ffae432709682504e6020a8dcd6
Parents: b9b1ec8 fcdf191
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Aug 28 11:05:46 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Aug 28 11:05:46 2015 -0400
----------------------------------------------------------------------
.../apache/cassandra/db/view/MaterializedViewManager.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------