cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/6] git commit: Use LOCAL_QUORUM fordata reads at LOCAL_SERIAL patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6939
Date Tue, 22 Apr 2014 16:09:27 GMT
Use LOCAL_QUORUM fordata reads at LOCAL_SERIAL
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6939


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c2a812a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c2a812a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c2a812a

Branch: refs/heads/trunk
Commit: 1c2a812a9ade93e436f9c7ad1921be2a8f1bbbf5
Parents: 93edb12
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Apr 22 11:08:06 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Apr 22 11:08:17 2014 -0500

----------------------------------------------------------------------
 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/1c2a812a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 89a8725..9b73c89 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.8
+ * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
  * Log a warning for large batches (CASSANDRA-6487)
  * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
  * USING TIMESTAMP for batches does not work (CASSANDRA-7053)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c2a812a/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 dce7256..033ce8e 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1141,7 +1141,7 @@ public class StorageProxy implements StorageProxyMBean
                     throw new ReadTimeoutException(consistency_level, 0, consistency_level.blockFor(Keyspace.open(command.ksName)),
false);
                 }
 
-                rows = fetchRows(commands, ConsistencyLevel.QUORUM);
+                rows = fetchRows(commands, consistency_level == ConsistencyLevel.LOCAL_SERIAL
? ConsistencyLevel.LOCAL_QUORUM : ConsistencyLevel.QUORUM);
             }
             else
             {


Mime
View raw message