svn commit: r930939 - in /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service: AntiEntropyService.java StorageService.java

[jbellis]

Author: jbellis
Date: Mon Apr  5 19:51:37 2010
New Revision: 930939

URL: http://svn.apache.org/viewvc?rev=930939&view=rev
Log:
revert unintentional commit of SS and AES

Modified:
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=930939&r1=930938&r2=930939&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java
 Mon Apr  5 19:51:37 2010
@@ -43,6 +43,9 @@ import org.apache.cassandra.utils.*;
 
 import org.apache.log4j.Logger;
 
+import com.google.common.collect.Collections2;
+import com.google.common.base.Predicates;
+
 /**
  * AntiEntropyService encapsulates "validating" (hashing) individual column 
families,
  * exchanging MerkleTrees with remote nodes via a TreeRequest/Response 
conversation,
@@ -138,18 +141,12 @@ public class AntiEntropyService
     /**
      * Return all of the neighbors with whom we share data.
      */
-    public static Set<InetAddress> getNeighbors(String table)
+    private static Collection<InetAddress> getNeighbors(String table)
     {
+        InetAddress local = FBUtilities.getLocalAddress();
         StorageService ss = StorageService.instance;
-        Set<InetAddress> neighbors = new HashSet<InetAddress>();
-        Map<Range, List<InetAddress>> replicaSets = 
ss.getRangeToAddressMap(table);
-        for (Range range : ss.getLocalRanges(table))
-        {
-            // for every range stored locally (replica or original) collect 
neighbors storing copies
-            neighbors.addAll(replicaSets.get(range));
-        }
-        neighbors.remove(FBUtilities.getLocalAddress());
-        return neighbors;
+        return Collections2.filter(ss.getNaturalEndpoints(table, 
ss.getLocalToken()),
+                                   Predicates.not(Predicates.equalTo(local)));
     }
 
     /**

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java?rev=930939&r1=930938&r2=930939&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
 Mon Apr  5 19:51:37 2010
@@ -1063,8 +1063,7 @@ public class StorageService implements I
     {
         // request that all relevant endpoints generate trees
         final MessagingService ms = MessagingService.instance;
-        final Set<InetAddress> endpoints = 
AntiEntropyService.getNeighbors(tableName);
-        endpoints.add(FBUtilities.getLocalAddress());
+        final List<InetAddress> endpoints = getNaturalEndpoints(tableName, 
getLocalToken());
         for (ColumnFamilyStore cfStore : getValidColumnFamilies(tableName, 
columnFamilies))
         {
             Message request = TreeRequestVerbHandler.makeVerb(tableName, 
cfStore.getColumnFamilyName());