revert unintentional commit of SS and AES

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.6@930939 13f79535-47bb-0310-9956-ffa450edef68
apache · Apr 5, 2010 · ba63bfe · ba63bfe
1 parent 09940ac
commit ba63bfe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/java/org/apache/cassandra/service/AntiEntropyService.java b/src/java/org/apache/cassandra/service/AntiEntropyService.java
@@ -43,6 +43,9 @@
 
 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 @@ private ExpiringMap<InetAddress, TreePair> rendezvousPairs(CFPair cf)
     /**
      * 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)));
     }
 
     /**

diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1063,8 +1063,7 @@ public void forceTableRepair(final String tableName, final String... columnFamil
     {
         // 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());