fix build

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

Branch: refs/heads/trunk
Commit: d14717504ba1e05e06c6a820166f0c86b4c4f6f5
Parents: 1124615
Author: Jonathan Ellis <jbel...@apache.org>
Authored: Thu Aug 16 17:48:08 2012 -0500
Committer: Jonathan Ellis <jbel...@apache.org>
Committed: Fri Aug 17 10:06:17 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/service/CacheService.java |    2 --
 .../cassandra/service/DatacenterReadCallback.java  |    8 --------
 2 files changed, 0 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1471750/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CacheService.java 
b/src/java/org/apache/cassandra/service/CacheService.java
index 6c7b0a2..58600ef 100644
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@ -334,7 +334,6 @@ public class CacheService implements CacheServiceMBean
             return new Pair<RowCacheKey, IRowCacheEntry>(new 
RowCacheKey(cfs.metadata.cfId, key), data);
         }
 
-        @Override
         public void load(Set<ByteBuffer> buffers, ColumnFamilyStore cfs)
         {
             for (ByteBuffer key : buffers)
@@ -390,7 +389,6 @@ public class CacheService implements CacheServiceMBean
             return null;
         }
 
-        @Override
         public void load(Set<ByteBuffer> buffers, ColumnFamilyStore cfs)
         {
             for (ByteBuffer key : buffers)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1471750/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java 
b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
index 8005073..76d6f01 100644
--- a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
+++ b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
@@ -67,14 +67,6 @@ public class DatacenterReadCallback<TMessage, TResolved> 
extends ReadCallback<TM
     }
 
     @Override
-    protected boolean waitingFor(ReadResponse response)
-    {
-        // cheat and leverage our knowledge that a local read is the only way 
the ReadResponse
-        // version of this method gets called
-        return true;
-    }
-
-    @Override
     public int determineBlockFor(ConsistencyLevel consistency_level, String 
table)
     {
         NetworkTopologyStrategy stategy = (NetworkTopologyStrategy) 
Table.open(table).getReplicationStrategy();

Reply via email to