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 <jbel...@apache.org> Authored: Tue Jan 14 11:51:36 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> 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<Row> rows = read(Arrays.asList(readCommand), ConsistencyLevel.QUORUM); + List<Row> rows = read(Arrays.asList(readCommand), consistencyForPaxos == ConsistencyLevel.LOCAL_SERIAL? ConsistencyLevel.LOCAL_QUORUM : ConsistencyLevel.QUORUM); ColumnFamily current = rows.get(0).cf; if (!casApplies(expected, current)) {