You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/01/14 21:17:27 UTC

svn commit: r1059153 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service: RepairCallback.java StorageProxy.java

Author: jbellis
Date: Fri Jan 14 20:17:26 2011
New Revision: 1059153

URL: http://svn.apache.org/viewvc?rev=1059153&view=rev
Log:
add comments, remove obsolete TODO
patch by jbellis

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/RepairCallback.java
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/RepairCallback.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/RepairCallback.java?rev=1059153&r1=1059152&r2=1059153&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/RepairCallback.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/RepairCallback.java Fri Jan 14 20:17:26 2011
@@ -51,5 +51,4 @@ public class RepairCallback<T> implement
         if (resolver.getMessageCount() == endpoints.size())
             condition.signal();
     }
-
 }

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1059153&r1=1059152&r2=1059153&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java Fri Jan 14 20:17:26 2011
@@ -389,7 +389,7 @@ public class StorageProxy implements Sto
             try
             {
                 long startTime2 = System.currentTimeMillis();
-                row = readCallback.get();
+                row = readCallback.get(); // CL.ONE is special cased here to ignore digests even if some have arrived
                 if (row != null)
                     rows.add(row);
 
@@ -440,7 +440,6 @@ public class StorageProxy implements Sto
         return new ReadCallback(resolver, consistencyLevel, table);
     }
 
-    // TODO repair resolver shouldn't take consistencylevel (it should repair exactly as many as it receives replies for)
     private static RepairCallback<Row> repair(ReadCommand command, List<InetAddress> endpoints)
     throws IOException
     {