Author: jbellis
Date: Sat Sep 11 00:11:33 2010
New Revision: 996020
URL: http://svn.apache.org/viewvc?rev=996020&view=rev
Log:
fix QUORUM calculation for RF > 3. patch by Jignesh Dhruv; reviewed by jbellis
for CASSANDRA-1487
Modified:
cassandra/trunk/CHANGES.txt
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=996020&r1=996019&r2=996020&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Sat Sep 11 00:11:33 2010
@@ -64,6 +64,7 @@ dev
* removed keyspace from describe_splits method (CASSANDRA-1425)
* rename check_schema_agreement to describe_schema_versions
(CASSANDRA-1478)
+ * fix QUORUM calculation for RF > 3 (CASSANDRA-1487)
0.7-beta1
Modified:
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=996020&r1=996019&r2=996020&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Sat Sep 11 00:11:33 2010
@@ -836,11 +836,6 @@ public class DatabaseDescriptor
return tables.get(table).replicationFactor;
}
- public static int getQuorum(String table)
- {
- return (tables.get(table).replicationFactor / 2) + 1;
- }
-
public static long getRpcTimeout()
{
return conf.rpc_timeout_in_ms;
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java?rev=996020&r1=996019&r2=996020&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
Sat Sep 11 00:11:33 2010
@@ -109,7 +109,7 @@ public class QuorumResponseHandler<T> im
case ANY:
return 1;
case QUORUM:
- return (DatabaseDescriptor.getQuorum(table)/ 2) + 1;
+ return (DatabaseDescriptor.getReplicationFactor(table) / 2) +
1;
case ALL:
return DatabaseDescriptor.getReplicationFactor(table);
default:
