Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 6df316375 -> bbe607f92
Fix UnsupportedOperationException on CAS timeout patch by slebresne; reviewed by jbellis for CASSANDRA-6923 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad81cabd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad81cabd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad81cabd Branch: refs/heads/cassandra-2.1 Commit: ad81cabdce6c7dae46f1a207b0ed4b4bfa479618 Parents: b0841d8 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Mar 25 17:42:20 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 25 17:42:20 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ConsistencyLevel.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad81cabd/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 226855c..81fba5f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -28,6 +28,7 @@ * Extend triggers to support CAS updates (CASSANDRA-6882) * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) Merged from 1.2: * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816) * add extra SSL cipher suites (CASSANDRA-6613) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad81cabd/src/java/org/apache/cassandra/db/ConsistencyLevel.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ConsistencyLevel.java b/src/java/org/apache/cassandra/db/ConsistencyLevel.java index 6d04314..035a670 100644 --- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java +++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java @@ -115,10 +115,12 @@ public enum ConsistencyLevel case THREE: return 3; case QUORUM: + case SERIAL: return quorumFor(keyspace); case ALL: return keyspace.getReplicationStrategy().getReplicationFactor(); case LOCAL_QUORUM: + case LOCAL_SERIAL: return localQuorumFor(keyspace, DatabaseDescriptor.getLocalDataCenter()); case EACH_QUORUM: if (keyspace.getReplicationStrategy() instanceof NetworkTopologyStrategy)
