You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2017/01/04 02:26:58 UTC
[4/9] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cac7364e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cac7364e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cac7364e
Branch: refs/heads/cassandra-3.11
Commit: cac7364e7709b5ef7ef8e9abedb45c9a11ef8853
Parents: 68f7ce4 37e124e
Author: Paulo Motta <pa...@apache.org>
Authored: Wed Jan 4 00:23:25 2017 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Wed Jan 4 00:24:08 2017 -0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Keyspace.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cac7364e/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Keyspace.java
index 6e7e141,7349f42..a550b1b
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@@ -482,15 -456,9 +482,10 @@@ public class Keyspac
if (TEST_FAIL_WRITES && metadata.name.equals(TEST_FAIL_WRITES_KS))
throw new RuntimeException("Testing write failures");
+ Lock[] locks = null;
+
boolean requiresViewUpdate = updateIndexes && viewManager.updatesAffectView(Collections.singleton(mutation), false);
- // If apply is not deferrable, no future is required, returns always null
- if (isDeferrable && future == null) {
- future = new CompletableFuture<>();
- }
-
- Lock lock = null;
if (requiresViewUpdate)
{
mutation.viewLockAcquireStart.compareAndSet(0L, System.currentTimeMillis());