svn commit: r943343 - in /cassandra/trunk/src/java/org/apache/cassandra: service/ReadRepairManager.java service/ReadResponseResolver.java utils/ExpiringMap.java

[jbellis]

Author: jbellis
Date: Wed May 12 00:11:26 2010
New Revision: 943343

URL: http://svn.apache.org/viewvc?rev=943343&view=rev
Log:
inline ReadRepairManager and r/m unused code
patch by jbellis; reviewed by gdusbabek for CASSANDRA-1077

Removed:
    cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
Modified:
    
cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
    cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java?rev=943343&r1=943342&r2=943343&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java 
(original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java 
Wed May 12 00:11:26 2010
@@ -20,6 +20,7 @@ package org.apache.cassandra.service;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
+import java.io.IOError;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,6 +30,7 @@ import java.util.List;
 import org.apache.cassandra.db.*;
 import java.net.InetAddress;
 import org.apache.cassandra.net.Message;
+import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.config.DatabaseDescriptor;
 
@@ -132,7 +134,16 @@ public class ReadResponseResolver implem
             RowMutation rowMutation = new RowMutation(table, key.key);
             rowMutation.add(diffCf);
             RowMutationMessage rowMutationMessage = new 
RowMutationMessage(rowMutation);
-            ReadRepairManager.instance.schedule(endpoints.get(i), 
rowMutationMessage);
+            Message repairMessage;
+            try
+            {
+                repairMessage = 
rowMutationMessage.makeRowMutationMessage(StorageService.Verb.READ_REPAIR);
+            }
+            catch (IOException e)
+            {
+                throw new IOError(e);
+            }
+            MessagingService.instance.sendOneWay(repairMessage, 
endpoints.get(i));
         }
     }
 

Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java?rev=943343&r1=943342&r2=943343&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java Wed 
May 12 00:11:26 2010
@@ -105,16 +105,11 @@ public class ExpiringMap<K, V>
                 {
                     hook.callMe(key, value);
                 }
-                else if (globalHook_ != null)
-                {
-                    globalHook_.callMe(key, value);
-                }
             }
             expungedValues.clear();
         }
     }
 
-    private ICacheExpungeHook<K, V> globalHook_;
     private Hashtable<K, CacheableObject> cache_;
     private Map<K, ICacheExpungeHook<K, V>> hooks_;
     private Timer timer_;
@@ -143,18 +138,6 @@ public class ExpiringMap<K, V>
         init(expiration);
     }
 
-    /*
-    * Specify the TTL for objects in the cache
-    * in milliseconds and a global expunge hook. If
-    * a key has a key-specific hook installed invoke that
-    * instead.
-    */
-    public ExpiringMap(long expiration, ICacheExpungeHook<K, V> global)
-    {
-        init(expiration);
-        globalHook_ = global;
-    }
-
     public void shutdown()
     {
         timer_.cancel();
@@ -203,11 +186,6 @@ public class ExpiringMap<K, V>
         return cache_.containsKey(key);
     }
 
-    public boolean containsValue(V value)
-    {
-        return cache_.containsValue(new CacheableObject(value));
-    }
-
     public boolean isEmpty()
     {
         return cache_.isEmpty();