Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 83F681073C for ; Tue, 14 Jan 2014 17:52:03 +0000 (UTC) Received: (qmail 59559 invoked by uid 500); 14 Jan 2014 17:52:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 59509 invoked by uid 500); 14 Jan 2014 17:52:01 -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 59499 invoked by uid 99); 14 Jan 2014 17:52:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jan 2014 17:52:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E78858BE437; Tue, 14 Jan 2014 17:52:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 14 Jan 2014 17:52:00 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6495 Updated Branches: refs/heads/cassandra-2.0 0e55e9ff6 -> 97c6bbe60 refs/heads/trunk f6f50ddff -> 4910ce802 Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6495 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97c6bbe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97c6bbe6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97c6bbe6 Branch: refs/heads/cassandra-2.0 Commit: 97c6bbe6093de16f3370a511023b861a381da7fe Parents: 0e55e9f Author: Jonathan Ellis Authored: Tue Jan 14 11:51:36 2014 -0600 Committer: Jonathan Ellis Committed: Tue Jan 14 11:51:48 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/97c6bbe6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1bf5615..ef2df51 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.5 + * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) * Delete unfinished compaction incrementally (CASSANDRA-6086) * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) http://git-wip-us.apache.org/repos/asf/cassandra/blob/97c6bbe6/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index be91d0d..c8ee297 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -243,7 +243,7 @@ public class StorageProxy implements StorageProxyMBean assert !expected.isEmpty(); readCommand = new SliceByNamesReadCommand(keyspaceName, key, cfName, timestamp, new NamesQueryFilter(ImmutableSortedSet.copyOf(metadata.comparator, expected.getColumnNames()))); } - List rows = read(Arrays.asList(readCommand), ConsistencyLevel.QUORUM); + List rows = read(Arrays.asList(readCommand), consistencyForPaxos == ConsistencyLevel.LOCAL_SERIAL? ConsistencyLevel.LOCAL_QUORUM : ConsistencyLevel.QUORUM); ColumnFamily current = rows.get(0).cf; if (!casApplies(expected, current)) {