Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7B5DB200C00 for ; Wed, 4 Jan 2017 03:26:57 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 76D7C160B49; Wed, 4 Jan 2017 02:26:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C06F8160B4A for ; Wed, 4 Jan 2017 03:26:56 +0100 (CET) Received: (qmail 33109 invoked by uid 500); 4 Jan 2017 02:26:55 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 32613 invoked by uid 99); 4 Jan 2017 02:26:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2017 02:26:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 238D6DFE2E; Wed, 4 Jan 2017 02:26:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulo@apache.org To: commits@cassandra.apache.org Date: Wed, 04 Jan 2017 02:27:00 -0000 Message-Id: <7d4f48d45ea54ebc8ac5d6ee8579cba4@git.apache.org> In-Reply-To: <919f140faad34c98b94c224486800a01@git.apache.org> References: <919f140faad34c98b94c224486800a01@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/9] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11 archived-at: Wed, 04 Jan 2017 02:26:57 -0000 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/trunk Commit: cac7364e7709b5ef7ef8e9abedb45c9a11ef8853 Parents: 68f7ce4 37e124e Author: Paulo Motta Authored: Wed Jan 4 00:23:25 2017 -0200 Committer: Paulo Motta 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());