svn commit: r881282 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: locator/ service/

[jbellis]

Author: jbellis
Date: Tue Nov 17 13:34:13 2009
New Revision: 881282

URL: http://svn.apache.org/viewvc?rev=881282&view=rev
Log:
rename
patch by jbellis; reviewed by Jaakko Laine for CASSANDRA-558

Added:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
      - copied, changed from r881281, 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
      - copied, changed from r881281, 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
Removed:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java
Modified:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java?rev=881282&r1=881281&r2=881282&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
 Tue Nov 17 13:34:13 2009
@@ -206,11 +206,11 @@
     {
         if (consistency_level == ConsistencyLevel.DCQUORUM)
         {
-            return new DatacenterQuorumResponseHandler(locQFactor);
+            return new DatacenterWriteResponseHandler(locQFactor);
         }
         else if (consistency_level == ConsistencyLevel.DCQUORUMSYNC)
         {
-            return new 
DatacenterQuorumSyncResponseHandler(getQuorumRepFactor());
+            return new 
DatacenterSyncWriteResponseHandler(getQuorumRepFactor());
         }
         return super.getWriteResponseHandler(blockFor, consistency_level);
     }

Copied: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
 (from r881281, 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java)
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java&r1=881281&r2=881282&rev=881282&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
 Tue Nov 17 13:34:13 2009
@@ -15,12 +15,12 @@
  * provided in the input map. it will block till we recive response from
  * n nodes in each of our data centers.
  */
-public class DatacenterQuorumSyncResponseHandler extends WriteResponseHandler
+public class DatacenterSyncWriteResponseHandler extends WriteResponseHandler
 {
     private final Map<String, Integer> dcResponses = new HashMap<String, 
Integer>();
     private final Map<String, Integer> responseCounts;
 
-    public DatacenterQuorumSyncResponseHandler(Map<String, Integer> 
responseCounts)
+    public DatacenterSyncWriteResponseHandler(Map<String, Integer> 
responseCounts)
     {
         // Response is been managed by the map so make it 1 for the superclass.
         super(1);

Copied: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
 (from r881281, 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java)
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java&r1=881281&r2=881282&rev=881282&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
 Tue Nov 17 13:34:13 2009
@@ -16,13 +16,13 @@
  * provided in the input map. it will block till we recive response from (DC, 
n)
  * nodes.
  */
-public class DatacenterQuorumResponseHandler extends WriteResponseHandler
+public class DatacenterWriteResponseHandler extends WriteResponseHandler
 {
     private int blockFor;
     private IEndPointSnitch endpointsnitch;
     private InetAddress localEndpoint;
 
-    public DatacenterQuorumResponseHandler(int blockFor)
+    public DatacenterWriteResponseHandler(int blockFor)
     {
         // Response is been managed by the map so the waitlist size really 
doesnt matter.
         super(blockFor);