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 2010/04/19 16:36:25 UTC

svn commit: r935594 [2/3] - in /cassandra/trunk: conf/ contrib/circuit/src/org/apache/cassandra/contrib/circuit/ contrib/pig/ contrib/property_snitch/src/java/org/apache/cassandra/locator/ contrib/word_count/ src/java/org/apache/cassandra/client/ src/j...

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=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java Mon Apr 19 14:36:24 2010
@@ -65,7 +65,7 @@ public class ReadResponseResolver implem
     {
         long startTime = System.currentTimeMillis();
 		List<ColumnFamily> versions = new ArrayList<ColumnFamily>();
-		List<InetAddress> endPoints = new ArrayList<InetAddress>();
+		List<InetAddress> endpoints = new ArrayList<InetAddress>();
 		DecoratedKey key = null;
 		byte[] digest = new byte[0];
 		boolean isDigestQuery = false;
@@ -89,7 +89,7 @@ public class ReadResponseResolver implem
             else
             {
                 versions.add(result.row().cf);
-                endPoints.add(response.getFrom());
+                endpoints.add(response.getFrom());
                 key = result.row().key;
             }
         }
@@ -109,7 +109,7 @@ public class ReadResponseResolver implem
         }
 
         ColumnFamily resolved = resolveSuperset(versions);
-        maybeScheduleRepairs(resolved, table, key, versions, endPoints);
+        maybeScheduleRepairs(resolved, table, key, versions, endpoints);
 
         if (logger_.isDebugEnabled())
             logger_.debug("resolve: " + (System.currentTimeMillis() - startTime) + " ms.");
@@ -120,7 +120,7 @@ public class ReadResponseResolver implem
      * For each row version, compare with resolved (the superset of all row versions);
      * if it is missing anything, send a mutation to the endpoint it come from.
      */
-    public static void maybeScheduleRepairs(ColumnFamily resolved, String table, DecoratedKey key, List<ColumnFamily> versions, List<InetAddress> endPoints)
+    public static void maybeScheduleRepairs(ColumnFamily resolved, String table, DecoratedKey key, List<ColumnFamily> versions, List<InetAddress> endpoints)
     {
         for (int i = 0; i < versions.size(); i++)
         {
@@ -132,7 +132,7 @@ 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);
+            ReadRepairManager.instance.schedule(endpoints.get(i), rowMutationMessage);
         }
     }
 

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java Mon Apr 19 14:36:24 2010
@@ -69,14 +69,14 @@ public class StorageLoadBalancer impleme
             /*
             int threshold = (int)(StorageLoadBalancer.TOPHEAVY_RATIO * averageSystemLoad());
             int myLoad = localLoad();            
-            InetAddress predecessor = StorageService.instance.getPredecessor(StorageService.getLocalStorageEndPoint());
+            InetAddress predecessor = StorageService.instance.getPredecessor(StorageService.getLocalStorageEndpoint());
             if (logger_.isDebugEnabled())
               logger_.debug("Trying to relocate the predecessor {}", predecessor);
             boolean value = tryThisNode(myLoad, threshold, predecessor);
             if ( !value )
             {
                 loadInfo2_.remove(predecessor);
-                InetAddress successor = StorageService.instance.getSuccessor(StorageService.getLocalStorageEndPoint());
+                InetAddress successor = StorageService.instance.getSuccessor(StorageService.getLocalStorageEndpoint());
                 if (logger_.isDebugEnabled())
                   logger_.debug("Trying to relocate the successor {}", successor);
                 value = tryThisNode(myLoad, threshold, successor);
@@ -136,7 +136,7 @@ public class StorageLoadBalancer impleme
                 BigInteger targetToken = BootstrapAndLbHelper.getTokenBasedOnPrimaryCount(keyCount);
                 // Send a MoveMessage and see if this node is relocateable
                 MoveMessage moveMessage = new MoveMessage(targetToken);
-                Message message = new Message(StorageService.getLocalStorageEndPoint(), StorageLoadBalancer.lbStage_, StorageLoadBalancer.moveMessageVerbHandler_, new Object[]{moveMessage});
+                Message message = new Message(StorageService.getLocalStorageEndpoint(), StorageLoadBalancer.lbStage_, StorageLoadBalancer.moveMessageVerbHandler_, new Object[]{moveMessage});
                 if (logger_.isDebugEnabled())
                   logger_.debug("Sending a move message to {}", target);
                 IAsyncResult result = MessagingService.getMessagingInstance().sendRR(message, target);
@@ -205,7 +205,7 @@ public class StorageLoadBalancer impleme
         if ( isHeavyNode() )
         {
             if (logger_.isDebugEnabled())
-              logger_.debug(StorageService.getLocalStorageEndPoint() + " is a heavy node with load " + localLoad());
+              logger_.debug(StorageService.getLocalStorageEndpoint() + " is a heavy node with load " + localLoad());
             // lb_.schedule( new LoadBalancer(), StorageLoadBalancer.delay_, TimeUnit.MINUTES );
         }
         */
@@ -230,7 +230,7 @@ public class StorageLoadBalancer impleme
         if ( !isMoveable_.get() )
             return false;
         int myload = localLoad();
-        InetAddress successor = StorageService.instance.getSuccessor(StorageService.getLocalStorageEndPoint());
+        InetAddress successor = StorageService.instance.getSuccessor(StorageService.getLocalStorageEndpoint());
         LoadInfo li = loadInfo2_.get(successor);
         // "load" is NULL means that the successor node has not
         // yet gossiped its load information. We should return

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Mon Apr 19 14:36:24 2010
@@ -345,14 +345,14 @@ public class StorageProxy implements Sto
 
         for (ReadCommand command: commands)
         {
-            InetAddress endPoint = StorageService.instance.findSuitableEndPoint(command.table, command.key);
+            InetAddress endpoint = StorageService.instance.findSuitableEndpoint(command.table, command.key);
             Message message = command.makeReadMessage();
 
             if (logger.isDebugEnabled())
-                logger.debug("weakreadremote reading " + command + " from " + message.getMessageId() + "@" + endPoint);
+                logger.debug("weakreadremote reading " + command + " from " + message.getMessageId() + "@" + endpoint);
             if (randomlyReadRepair(command))
                 message.setHeader(ReadCommand.DO_REPAIR, ReadCommand.DO_REPAIR.getBytes());
-            iars.add(MessagingService.instance.sendRR(message, endPoint));
+            iars.add(MessagingService.instance.sendRR(message, endpoint));
         }
 
         for (IAsyncResult iar: iars)
@@ -429,7 +429,7 @@ public class StorageProxy implements Sto
     private static List<Row> strongRead(List<ReadCommand> commands, ConsistencyLevel consistency_level) throws IOException, UnavailableException, TimeoutException
     {
         List<QuorumResponseHandler<Row>> quorumResponseHandlers = new ArrayList<QuorumResponseHandler<Row>>();
-        List<InetAddress[]> commandEndPoints = new ArrayList<InetAddress[]>();
+        List<InetAddress[]> commandEndpoints = new ArrayList<InetAddress[]>();
         List<Row> rows = new ArrayList<Row>();
 
         int commandIndex = 0;
@@ -442,14 +442,14 @@ public class StorageProxy implements Sto
             Message message = command.makeReadMessage();
             Message messageDigestOnly = readMessageDigestOnly.makeReadMessage();
 
-            InetAddress dataPoint = StorageService.instance.findSuitableEndPoint(command.table, command.key);
+            InetAddress dataPoint = StorageService.instance.findSuitableEndpoint(command.table, command.key);
             List<InetAddress> endpointList = StorageService.instance.getLiveNaturalEndpoints(command.table, command.key);
             final String table = command.table;
             int responseCount = determineBlockFor(DatabaseDescriptor.getReplicationFactor(table), consistency_level);
             if (endpointList.size() < responseCount)
                 throw new UnavailableException();
 
-            InetAddress[] endPoints = new InetAddress[endpointList.size()];
+            InetAddress[] endpoints = new InetAddress[endpointList.size()];
             Message messages[] = new Message[endpointList.size()];
             // data-request message is sent to dataPoint, the node that will actually get
             // the data for us. The other replicas are only sent a digest query.
@@ -457,15 +457,15 @@ public class StorageProxy implements Sto
             for (InetAddress endpoint : endpointList)
             {
                 Message m = endpoint.equals(dataPoint) ? message : messageDigestOnly;
-                endPoints[n] = endpoint;
+                endpoints[n] = endpoint;
                 messages[n++] = m;
                 if (logger.isDebugEnabled())
                     logger.debug("strongread reading " + (m == message ? "data" : "digest") + " for " + command + " from " + m.getMessageId() + "@" + endpoint);
             }
             QuorumResponseHandler<Row> quorumResponseHandler = new QuorumResponseHandler<Row>(DatabaseDescriptor.getQuorum(command.table), new ReadResponseResolver(command.table, responseCount));
-            MessagingService.instance.sendRR(messages, endPoints, quorumResponseHandler);
+            MessagingService.instance.sendRR(messages, endpoints, quorumResponseHandler);
             quorumResponseHandlers.add(quorumResponseHandler);
-            commandEndPoints.add(endPoints);
+            commandEndpoints.add(endpoints);
         }
 
         for (QuorumResponseHandler<Row> quorumResponseHandler: quorumResponseHandlers)
@@ -492,7 +492,7 @@ public class StorageProxy implements Sto
                             readResponseResolverRepair);
                     logger.info("DigestMismatchException: " + ex.getMessage());
                     Message messageRepair = command.makeReadMessage();
-                    MessagingService.instance.sendRR(messageRepair, commandEndPoints.get(commandIndex), quorumResponseHandlerRepair);
+                    MessagingService.instance.sendRR(messageRepair, commandEndpoints.get(commandIndex), quorumResponseHandlerRepair);
                     try
                     {
                         row = quorumResponseHandlerRepair.get();
@@ -675,7 +675,7 @@ public class StorageProxy implements Sto
             if (endpoints.size() < responseCount)
                 throw new UnavailableException();
 
-            DatabaseDescriptor.getEndPointSnitch().sortByProximity(FBUtilities.getLocalAddress(), endpoints);
+            DatabaseDescriptor.getEndpointSnitch().sortByProximity(FBUtilities.getLocalAddress(), endpoints);
             List<InetAddress> endpointsForCL = endpoints.subList(0, responseCount);
             Set<AbstractBounds> restrictedRanges = queryRange.restrictTo(nodeRange);
             for (AbstractBounds range : restrictedRanges)

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Mon Apr 19 14:36:24 2010
@@ -125,12 +125,12 @@ public class StorageService implements I
 
     public Collection<Range> getLocalRanges(String table)
     {
-        return getRangesForEndPoint(table, FBUtilities.getLocalAddress());
+        return getRangesForEndpoint(table, FBUtilities.getLocalAddress());
     }
 
     public Range getLocalPrimaryRange()
     {
-        return getPrimaryRangeForEndPoint(FBUtilities.getLocalAddress());
+        return getPrimaryRangeForEndpoint(FBUtilities.getLocalAddress());
     }
 
     /* This abstraction maintains the token/endpoint metadata information */
@@ -274,7 +274,7 @@ public class StorageService implements I
         try
         {
             Constructor<? extends AbstractReplicationStrategy> constructor = cls.getConstructor(parameterTypes);
-            replicationStrategy = constructor.newInstance(tokenMetadata, DatabaseDescriptor.getEndPointSnitch());
+            replicationStrategy = constructor.newInstance(tokenMetadata, DatabaseDescriptor.getEndpointSnitch());
         }
         catch (Exception e)
         {
@@ -451,7 +451,7 @@ public class StorageService implements I
      * @param keyspace
      * @return
      */
-    public Map<Range, List<String>> getRangeToEndPointMap(String keyspace)
+    public Map<Range, List<String>> getRangeToEndpointMap(String keyspace)
     {
         // some people just want to get a visual representation of things. Allow null and set it to the first
         // non-system table.
@@ -470,7 +470,7 @@ public class StorageService implements I
     public Map<Range, List<InetAddress>> getRangeToAddressMap(String keyspace)
     {
         List<Range> ranges = getAllRanges(tokenMetadata_.sortedTokens());
-        return constructRangeToEndPointMap(keyspace, ranges);
+        return constructRangeToEndpointMap(keyspace, ranges);
     }
 
     /**
@@ -479,14 +479,14 @@ public class StorageService implements I
      * @param ranges
      * @return mapping of ranges to the replicas responsible for them.
     */
-    private Map<Range, List<InetAddress>> constructRangeToEndPointMap(String keyspace, List<Range> ranges)
+    private Map<Range, List<InetAddress>> constructRangeToEndpointMap(String keyspace, List<Range> ranges)
     {
-        Map<Range, List<InetAddress>> rangeToEndPointMap = new HashMap<Range, List<InetAddress>>();
+        Map<Range, List<InetAddress>> rangeToEndpointMap = new HashMap<Range, List<InetAddress>>();
         for (Range range : ranges)
         {
-            rangeToEndPointMap.put(range, getReplicationStrategy(keyspace).getNaturalEndpoints(range.right, keyspace));
+            rangeToEndpointMap.put(range, getReplicationStrategy(keyspace).getNaturalEndpoints(range.right, keyspace));
         }
-        return rangeToEndPointMap;
+        return rangeToEndpointMap;
     }
 
     /*
@@ -521,32 +521,32 @@ public class StorageService implements I
     /**
      * Handle node bootstrap
      *
-     * @param endPoint bootstrapping node
+     * @param endpoint bootstrapping node
      * @param moveValue bootstrap token as string
      */
-    private void handleStateBootstrap(InetAddress endPoint, String moveValue)
+    private void handleStateBootstrap(InetAddress endpoint, String moveValue)
     {
         Token token = getPartitioner().getTokenFactory().fromString(moveValue);
 
         if (logger_.isDebugEnabled())
-            logger_.debug("Node " + endPoint + " state bootstrapping, token " + token);
+            logger_.debug("Node " + endpoint + " state bootstrapping, token " + token);
 
         // if this node is present in token metadata, either we have missed intermediate states
         // or the node had crashed. Print warning if needed, clear obsolete stuff and
         // continue.
-        if (tokenMetadata_.isMember(endPoint))
+        if (tokenMetadata_.isMember(endpoint))
         {
             // If isLeaving is false, we have missed both LEAVING and LEFT. However, if
             // isLeaving is true, we have only missed LEFT. Waiting time between completing
             // leave operation and rebootstrapping is relatively short, so the latter is quite
             // common (not enough time for gossip to spread). Therefore we report only the
             // former in the log.
-            if (!tokenMetadata_.isLeaving(endPoint))
-                logger_.info("Node " + endPoint + " state jump to bootstrap");
-            tokenMetadata_.removeEndpoint(endPoint);
+            if (!tokenMetadata_.isLeaving(endpoint))
+                logger_.info("Node " + endpoint + " state jump to bootstrap");
+            tokenMetadata_.removeEndpoint(endpoint);
         }
 
-        tokenMetadata_.addBootstrapToken(token, endPoint);
+        tokenMetadata_.addBootstrapToken(token, endpoint);
         calculatePendingRanges();
     }
 
@@ -554,55 +554,55 @@ public class StorageService implements I
      * Handle node move to normal state. That is, node is entering token ring and participating
      * in reads.
      *
-     * @param endPoint node
+     * @param endpoint node
      * @param moveValue token as string
      */
-    private void handleStateNormal(InetAddress endPoint, String moveValue)
+    private void handleStateNormal(InetAddress endpoint, String moveValue)
     {
         Token token = getPartitioner().getTokenFactory().fromString(moveValue);
 
         if (logger_.isDebugEnabled())
-            logger_.debug("Node " + endPoint + " state normal, token " + token);
+            logger_.debug("Node " + endpoint + " state normal, token " + token);
 
-        if (tokenMetadata_.isMember(endPoint))
-            logger_.info("Node " + endPoint + " state jump to normal");
+        if (tokenMetadata_.isMember(endpoint))
+            logger_.info("Node " + endpoint + " state jump to normal");
 
-        tokenMetadata_.updateNormalToken(token, endPoint);
+        tokenMetadata_.updateNormalToken(token, endpoint);
         calculatePendingRanges();
         if (!isClientMode)
-            SystemTable.updateToken(endPoint, token);
+            SystemTable.updateToken(endpoint, token);
     }
 
     /**
      * Handle node preparing to leave the ring
      *
-     * @param endPoint node
+     * @param endpoint node
      * @param moveValue token as string
      */
-    private void handleStateLeaving(InetAddress endPoint, String moveValue)
+    private void handleStateLeaving(InetAddress endpoint, String moveValue)
     {
         Token token = getPartitioner().getTokenFactory().fromString(moveValue);
 
         if (logger_.isDebugEnabled())
-            logger_.debug("Node " + endPoint + " state leaving, token " + token);
+            logger_.debug("Node " + endpoint + " state leaving, token " + token);
 
         // If the node is previously unknown or tokens do not match, update tokenmetadata to
         // have this node as 'normal' (it must have been using this token before the
         // leave). This way we'll get pending ranges right.
-        if (!tokenMetadata_.isMember(endPoint))
+        if (!tokenMetadata_.isMember(endpoint))
         {
-            logger_.info("Node " + endPoint + " state jump to leaving");
-            tokenMetadata_.updateNormalToken(token, endPoint);
+            logger_.info("Node " + endpoint + " state jump to leaving");
+            tokenMetadata_.updateNormalToken(token, endpoint);
         }
-        else if (!tokenMetadata_.getToken(endPoint).equals(token))
+        else if (!tokenMetadata_.getToken(endpoint).equals(token))
         {
-            logger_.warn("Node " + endPoint + " 'leaving' token mismatch. Long network partition?");
-            tokenMetadata_.updateNormalToken(token, endPoint);
+            logger_.warn("Node " + endpoint + " 'leaving' token mismatch. Long network partition?");
+            tokenMetadata_.updateNormalToken(token, endpoint);
         }
 
         // at this point the endpoint is certainly a member with this token, so let's proceed
         // normally
-        tokenMetadata_.addLeavingEndPoint(endPoint);
+        tokenMetadata_.addLeavingEndpoint(endpoint);
         calculatePendingRanges();
     }
 
@@ -610,51 +610,51 @@ public class StorageService implements I
      * Handle node leaving the ring. This can be either because the node was removed manually by
      * removetoken command or because of decommission or loadbalance
      *
-     * @param endPoint If reason for leaving is decommission or loadbalance (LEFT_NORMALLY),
-     * endPoint is the leaving node. If reason manual removetoken (REMOVE_TOKEN), endPoint
+     * @param endpoint If reason for leaving is decommission or loadbalance (LEFT_NORMALLY),
+     * endpoint is the leaving node. If reason manual removetoken (REMOVE_TOKEN), endpoint
      * parameter is ignored and the operation is based on the token inside moveValue.
      * @param moveValue (REMOVE_TOKEN|LEFT_NORMALLY)<Delimiter><token>
      */
-    private void handleStateLeft(InetAddress endPoint, String moveValue)
+    private void handleStateLeft(InetAddress endpoint, String moveValue)
     {
         int index = moveValue.indexOf(Delimiter);
         assert (index != -1);
         String typeOfState = moveValue.substring(0, index);
         Token token = getPartitioner().getTokenFactory().fromString(moveValue.substring(index + 1));
 
-        // endPoint itself is leaving
+        // endpoint itself is leaving
         if (typeOfState.equals(LEFT_NORMALLY))
         {
             if (logger_.isDebugEnabled())
-                logger_.debug("Node " + endPoint + " state left, token " + token);
+                logger_.debug("Node " + endpoint + " state left, token " + token);
 
             // If the node is member, remove all references to it. If not, call
             // removeBootstrapToken just in case it is there (very unlikely chain of events)
-            if (tokenMetadata_.isMember(endPoint))
+            if (tokenMetadata_.isMember(endpoint))
             {
-                if (!tokenMetadata_.getToken(endPoint).equals(token))
-                    logger_.warn("Node " + endPoint + " 'left' token mismatch. Long network partition?");
-                tokenMetadata_.removeEndpoint(endPoint);
+                if (!tokenMetadata_.getToken(endpoint).equals(token))
+                    logger_.warn("Node " + endpoint + " 'left' token mismatch. Long network partition?");
+                tokenMetadata_.removeEndpoint(endpoint);
             }
         }
         else
         {
-            // if we're here, endPoint is not leaving but broadcasting remove token command
+            // if we're here, endpoint is not leaving but broadcasting remove token command
             assert (typeOfState.equals(REMOVE_TOKEN));
-            InetAddress endPointThatLeft = tokenMetadata_.getEndPoint(token);
+            InetAddress endpointThatLeft = tokenMetadata_.getEndpoint(token);
             // let's make sure that we're not removing ourselves. This can happen when a node
             // enters ring as a replacement for a removed node. removeToken for the old node is
             // still in gossip, so we will see it.
-            if (FBUtilities.getLocalAddress().equals(endPointThatLeft))
+            if (FBUtilities.getLocalAddress().equals(endpointThatLeft))
             {
                 logger_.info("Received removeToken gossip about myself. Is this node a replacement for a removed one?");
                 return;
             }
             if (logger_.isDebugEnabled())
-                logger_.debug("Token " + token + " removed manually (endpoint was " + ((endPointThatLeft == null) ? "unknown" : endPointThatLeft) + ")");
-            if (endPointThatLeft != null)
+                logger_.debug("Token " + token + " removed manually (endpoint was " + ((endpointThatLeft == null) ? "unknown" : endpointThatLeft) + ")");
+            if (endpointThatLeft != null)
             {
-                removeEndPointLocally(endPointThatLeft);
+                removeEndpointLocally(endpointThatLeft);
             }
         }
 
@@ -664,14 +664,14 @@ public class StorageService implements I
     }
 
     /**
-     * endPoint was completely removed from ring (as a result of removetoken command). Remove it
+     * endpoint was completely removed from ring (as a result of removetoken command). Remove it
      * from token metadata and gossip and restore replica count.
      */
-    private void removeEndPointLocally(InetAddress endPoint)
+    private void removeEndpointLocally(InetAddress endpoint)
     {
-        restoreReplicaCount(endPoint);
-        Gossiper.instance.removeEndPoint(endPoint);
-        tokenMetadata_.removeEndpoint(endPoint);
+        restoreReplicaCount(endpoint);
+        Gossiper.instance.removeEndpoint(endpoint);
+        tokenMetadata_.removeEndpoint(endpoint);
     }
 
     /**
@@ -709,9 +709,9 @@ public class StorageService implements I
         TokenMetadata tm = StorageService.instance.getTokenMetadata();
         Multimap<Range, InetAddress> pendingRanges = HashMultimap.create();
         Map<Token, InetAddress> bootstrapTokens = tm.getBootstrapTokens();
-        Set<InetAddress> leavingEndPoints = tm.getLeavingEndPoints();
+        Set<InetAddress> leavingEndpoints = tm.getLeavingEndpoints();
 
-        if (bootstrapTokens.isEmpty() && leavingEndPoints.isEmpty())
+        if (bootstrapTokens.isEmpty() && leavingEndpoints.isEmpty())
         {
             if (logger_.isDebugEnabled())
                 logger_.debug("No bootstrapping or leaving nodes -> empty pending ranges for {}", table);
@@ -726,17 +726,17 @@ public class StorageService implements I
 
         // get all ranges that will be affected by leaving nodes
         Set<Range> affectedRanges = new HashSet<Range>();
-        for (InetAddress endPoint : leavingEndPoints)
-            affectedRanges.addAll(addressRanges.get(endPoint));
+        for (InetAddress endpoint : leavingEndpoints)
+            affectedRanges.addAll(addressRanges.get(endpoint));
 
         // for each of those ranges, find what new nodes will be responsible for the range when
         // all leaving nodes are gone.
         for (Range range : affectedRanges)
         {
-            List<InetAddress> currentEndPoints = strategy.getNaturalEndpoints(range.right, tm, table);
-            List<InetAddress> newEndPoints = strategy.getNaturalEndpoints(range.right, allLeftMetadata, table);
-            newEndPoints.removeAll(currentEndPoints);
-            pendingRanges.putAll(range, newEndPoints);
+            List<InetAddress> currentEndpoints = strategy.getNaturalEndpoints(range.right, tm, table);
+            List<InetAddress> newEndpoints = strategy.getNaturalEndpoints(range.right, allLeftMetadata, table);
+            newEndpoints.removeAll(currentEndpoints);
+            pendingRanges.putAll(range, newEndpoints);
         }
 
         // At this stage pendingRanges has been updated according to leave operations. We can
@@ -746,12 +746,12 @@ public class StorageService implements I
         // allLeftMetadata and check in between what their ranges would be.
         for (Map.Entry<Token, InetAddress> entry : bootstrapTokens.entrySet())
         {
-            InetAddress endPoint = entry.getValue();
+            InetAddress endpoint = entry.getValue();
 
-            allLeftMetadata.updateNormalToken(entry.getKey(), endPoint);
-            for (Range range : strategy.getAddressRanges(allLeftMetadata, table).get(endPoint))
-                pendingRanges.put(range, endPoint);
-            allLeftMetadata.removeEndpoint(endPoint);
+            allLeftMetadata.updateNormalToken(entry.getKey(), endpoint);
+            for (Range range : strategy.getAddressRanges(allLeftMetadata, table).get(endpoint))
+                pendingRanges.put(range, endpoint);
+            allLeftMetadata.removeEndpoint(endpoint);
         }
 
         tm.setPendingRanges(table, pendingRanges);
@@ -761,7 +761,7 @@ public class StorageService implements I
     }
 
     /**
-     * Called when an endPoint is removed from the ring without proper
+     * Called when an endpoint is removed from the ring without proper
      * STATE_LEAVING -> STATE_LEFT sequence. This function checks
      * whether this node becomes responsible for new ranges as a
      * consequence and streams data if needed.
@@ -769,9 +769,9 @@ public class StorageService implements I
      * This is rather ineffective, but it does not matter so much
      * since this is called very seldom
      *
-     * @param endPoint node that has left
+     * @param endpoint node that has left
      */
-    private void restoreReplicaCount(InetAddress endPoint)
+    private void restoreReplicaCount(InetAddress endpoint)
     {
         InetAddress myAddress = FBUtilities.getLocalAddress();
 
@@ -779,7 +779,7 @@ public class StorageService implements I
         {
             // get all ranges that change ownership (that is, a node needs
             // to take responsibility for new range)
-            Multimap<Range, InetAddress> changedRanges = getChangedRangesForLeaving(table, endPoint);
+            Multimap<Range, InetAddress> changedRanges = getChangedRangesForLeaving(table, endpoint);
 
             // check if any of these ranges are coming our way
             Set<Range> myNewRanges = new HashSet<Range>();
@@ -792,7 +792,7 @@ public class StorageService implements I
             if (!myNewRanges.isEmpty())
             {
                 if (logger_.isDebugEnabled())
-                    logger_.debug(endPoint + " was removed, my added ranges: " + StringUtils.join(myNewRanges, ", "));
+                    logger_.debug(endpoint + " was removed, my added ranges: " + StringUtils.join(myNewRanges, ", "));
 
                 Multimap<Range, InetAddress> rangeAddresses = getReplicationStrategy(table).getRangeAddresses(tokenMetadata_, table);
                 Multimap<InetAddress, Range> sourceRanges = HashMultimap.create();
@@ -801,13 +801,13 @@ public class StorageService implements I
                 // find alive sources for our new ranges
                 for (Range myNewRange : myNewRanges)
                 {
-                    List<InetAddress> sources = DatabaseDescriptor.getEndPointSnitch().getSortedListByProximity(myAddress, rangeAddresses.get(myNewRange));
+                    List<InetAddress> sources = DatabaseDescriptor.getEndpointSnitch().getSortedListByProximity(myAddress, rangeAddresses.get(myNewRange));
 
                     assert (!sources.contains(myAddress));
 
                     for (InetAddress source : sources)
                     {
-                        if (source.equals(endPoint))
+                        if (source.equals(endpoint))
                             continue;
 
                         if (failureDetector.isAlive(source))
@@ -834,7 +834,7 @@ public class StorageService implements I
     private Multimap<Range, InetAddress> getChangedRangesForLeaving(String table, InetAddress endpoint)
     {
         // First get all ranges the leaving endpoint is responsible for
-        Collection<Range> ranges = getRangesForEndPoint(table, endpoint);
+        Collection<Range> ranges = getRangesForEndpoint(table, endpoint);
 
         if (logger_.isDebugEnabled())
             logger_.debug("Node " + endpoint + " ranges [" + StringUtils.join(ranges, ", ") + "]");
@@ -954,24 +954,24 @@ public class StorageService implements I
         return stringify(Gossiper.instance.getUnreachableMembers());
     }
 
-    private Set<String> stringify(Set<InetAddress> endPoints)
+    private Set<String> stringify(Set<InetAddress> endpoints)
     {
-        Set<String> stringEndPoints = new HashSet<String>();
-        for (InetAddress ep : endPoints)
+        Set<String> stringEndpoints = new HashSet<String>();
+        for (InetAddress ep : endpoints)
         {
-            stringEndPoints.add(ep.getHostAddress());
+            stringEndpoints.add(ep.getHostAddress());
         }
-        return stringEndPoints;
+        return stringEndpoints;
     }
 
-    private List<String> stringify(List<InetAddress> endPoints)
+    private List<String> stringify(List<InetAddress> endpoints)
     {
-        List<String> stringEndPoints = new ArrayList<String>();
-        for (InetAddress ep : endPoints)
+        List<String> stringEndpoints = new ArrayList<String>();
+        for (InetAddress ep : endpoints)
         {
-            stringEndPoints.add(ep.getHostAddress());
+            stringEndpoints.add(ep.getHostAddress());
         }
-        return stringEndPoints;
+        return stringEndpoints;
     }
 
     public int getCurrentGenerationNumber()
@@ -1104,7 +1104,7 @@ public class StorageService implements I
     InetAddress getPredecessor(InetAddress ep)
     {
         Token token = tokenMetadata_.getToken(ep);
-        return tokenMetadata_.getEndPoint(tokenMetadata_.getPredecessor(token));
+        return tokenMetadata_.getEndpoint(tokenMetadata_.getPredecessor(token));
     }
 
     /*
@@ -1114,7 +1114,7 @@ public class StorageService implements I
     public InetAddress getSuccessor(InetAddress ep)
     {
         Token token = tokenMetadata_.getToken(ep);
-        return tokenMetadata_.getEndPoint(tokenMetadata_.getSuccessor(token));
+        return tokenMetadata_.getEndpoint(tokenMetadata_.getSuccessor(token));
     }
 
     /**
@@ -1122,7 +1122,7 @@ public class StorageService implements I
      * @param ep endpoint we are interested in.
      * @return range for the specified endpoint.
      */
-    public Range getPrimaryRangeForEndPoint(InetAddress ep)
+    public Range getPrimaryRangeForEndpoint(InetAddress ep)
     {
         return tokenMetadata_.getPrimaryRangeFor(tokenMetadata_.getToken(ep));
     }
@@ -1132,7 +1132,7 @@ public class StorageService implements I
      * @param ep endpoint we are interested in.
      * @return ranges for the specified endpoint.
      */
-    Collection<Range> getRangesForEndPoint(String table, InetAddress ep)
+    Collection<Range> getRangesForEndpoint(String table, InetAddress ep)
     {
         return getReplicationStrategy(table).getAddressRanges(table).get(ep);
     }
@@ -1216,10 +1216,10 @@ public class StorageService implements I
     /**
      * This function finds the closest live endpoint that contains a given key.
      */
-    public InetAddress findSuitableEndPoint(String table, byte[] key) throws IOException, UnavailableException
+    public InetAddress findSuitableEndpoint(String table, byte[] key) throws IOException, UnavailableException
     {
         List<InetAddress> endpoints = getNaturalEndpoints(table, key);
-        DatabaseDescriptor.getEndPointSnitch().sortByProximity(FBUtilities.getLocalAddress(), endpoints);
+        DatabaseDescriptor.getEndpointSnitch().sortByProximity(FBUtilities.getLocalAddress(), endpoints);
         for (InetAddress endpoint : endpoints)
         {
             if (FailureDetector.instance.isAlive(endpoint))
@@ -1233,7 +1233,7 @@ public class StorageService implements I
         HashMap<String, String> map = new HashMap<String, String>();
         for (Token t : tokenMetadata_.sortedTokens())
         {
-            map.put(t.toString(), tokenMetadata_.getEndPoint(t).getHostAddress());
+            map.put(t.toString(), tokenMetadata_.getEndpoint(t).getHostAddress());
         }
         return map;
     }
@@ -1306,7 +1306,7 @@ public class StorageService implements I
     private void startLeaving()
     {
         Gossiper.instance.addLocalApplicationState(MOVE_STATE, new ApplicationState(STATE_LEAVING + Delimiter + getLocalToken().toString()));
-        tokenMetadata_.addLeavingEndPoint(FBUtilities.getLocalAddress());
+        tokenMetadata_.addLeavingEndpoint(FBUtilities.getLocalAddress());
         calculatePendingRanges();
     }
 
@@ -1470,18 +1470,18 @@ public class StorageService implements I
         // cannot find the endpoint for this token from metadata, but
         // that would prevent this command from being issued by a node
         // that has never seen the failed node.
-        InetAddress endPoint = tokenMetadata_.getEndPoint(token);
-        if (endPoint != null)
+        InetAddress endpoint = tokenMetadata_.getEndpoint(token);
+        if (endpoint != null)
         {
-            if (endPoint.equals(FBUtilities.getLocalAddress()))
+            if (endpoint.equals(FBUtilities.getLocalAddress()))
                 throw new UnsupportedOperationException("Cannot remove node's own token");
 
             // Let's make sure however that we're not removing a live
             // token (member)
-            if (Gossiper.instance.getLiveMembers().contains(endPoint))
-                throw new UnsupportedOperationException("Node " + endPoint + " is alive and owns this token. Use decommission command to remove it from the ring");
+            if (Gossiper.instance.getLiveMembers().contains(endpoint))
+                throw new UnsupportedOperationException("Node " + endpoint + " is alive and owns this token. Use decommission command to remove it from the ring");
 
-            removeEndPointLocally(endPoint);
+            removeEndpointLocally(endpoint);
             calculatePendingRanges();
         }
 

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java Mon Apr 19 14:36:24 2010
@@ -62,7 +62,7 @@ public interface StorageServiceMBean
      *
      * @return mapping of ranges to end points
      */
-    public Map<Range, List<String>> getRangeToEndPointMap(String keyspace);
+    public Map<Range, List<String>> getRangeToEndpointMap(String keyspace);
 
     /**
      * Numeric load value.

Modified: cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java Mon Apr 19 14:36:24 2010
@@ -607,7 +607,7 @@ public class CassandraServer implements 
     public List<TokenRange> describe_ring(String keyspace)
     {
         List<TokenRange> ranges = new ArrayList<TokenRange>();
-        for (Map.Entry<Range, List<String>> entry : StorageService.instance.getRangeToEndPointMap(keyspace).entrySet())
+        for (Map.Entry<Range, List<String>> entry : StorageService.instance.getRangeToEndpointMap(keyspace).entrySet())
         {
             Range range = entry.getKey();
             List<String> endpoints = entry.getValue();

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java Mon Apr 19 14:36:24 2010
@@ -144,9 +144,9 @@ public class ClusterCmd {
         hf.printHelp(usage, "", options, header);
     }
     
-    public void printEndPoints(String keyspace, String key)
+    public void printEndpoints(String keyspace, String key)
     {
-        List<InetAddress> endpoints = probe.getEndPoints(keyspace, key);
+        List<InetAddress> endpoints = probe.getEndpoints(keyspace, key);
         System.out.println(String.format("%-17s: %s", "Key", key));
         System.out.println(String.format("%-17s: %s", "Endpoints", endpoints));
     }
@@ -260,7 +260,7 @@ public class ClusterCmd {
                 ClusterCmd.printUsage();
                 System.exit(1);
             }
-            clusterCmd.printEndPoints(arguments[1], arguments[2]);
+            clusterCmd.printEndpoints(arguments[1], arguments[2]);
         }
         else if (cmdName.equals("global_snapshot"))
         {

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java Mon Apr 19 14:36:24 2010
@@ -92,7 +92,7 @@ public class NodeCmd {
      */
     public void printRing(PrintStream outs)
     {
-        Map<Range, List<String>> rangeMap = probe.getRangeToEndPointMap(null);
+        Map<Range, List<String>> rangeMap = probe.getRangeToEndpointMap(null);
         List<Range> ranges = new ArrayList<Range>(rangeMap.keySet());
         Collections.sort(ranges);
         Set<String> liveNodes = probe.getLiveNodes();

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java Mon Apr 19 14:36:24 2010
@@ -152,9 +152,9 @@ public class NodeProbe
         ssProxy.drain();	
     }
     
-    public Map<Range, List<String>> getRangeToEndPointMap(String tableName)
+    public Map<Range, List<String>> getRangeToEndpointMap(String tableName)
     {
-        return ssProxy.getRangeToEndPointMap(tableName);
+        return ssProxy.getRangeToEndpointMap(tableName);
     }
     
     public Set<String> getLiveNodes()
@@ -169,7 +169,7 @@ public class NodeProbe
      */
     public void printRing(PrintStream outs)
     {
-        Map<Range, List<String>> rangeMap = ssProxy.getRangeToEndPointMap(null);
+        Map<Range, List<String>> rangeMap = ssProxy.getRangeToEndpointMap(null);
         List<Range> ranges = new ArrayList<Range>(rangeMap.keySet());
         Collections.sort(ranges);
         Set<String> liveNodes = ssProxy.getLiveNodes();
@@ -407,7 +407,7 @@ public class NodeProbe
         }
     }
 
-    public List<InetAddress> getEndPoints(String keyspace, String key)
+    public List<InetAddress> getEndpoints(String keyspace, String key)
     {
         // FIXME: string key
         return ssProxy.getNaturalEndpoints(keyspace, key.getBytes(UTF8));

Modified: cassandra/trunk/test/conf/cassandra.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/conf/cassandra.xml?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/test/conf/cassandra.xml (original)
+++ cassandra/trunk/test/conf/cassandra.xml Mon Apr 19 14:36:24 2010
@@ -37,7 +37,7 @@
    <DiskAccessMode>mmap</DiskAccessMode>
    <MemtableThroughputInMB>1</MemtableThroughputInMB>
    <MemtableOperationsInMillions>0.00002</MemtableOperationsInMillions> <!-- 20 -->
-   <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>
+   <EndpointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndpointSnitch>
    <Keyspaces>
      <Keyspace Name = "Keyspace1">
        <ColumnFamily Name="Standard1" RowsCached="10%" KeysCached="0"/>
@@ -58,13 +58,13 @@
        <ColumnFamily ColumnType="Super" CompareSubcolumnsWith="TimeUUIDType" Name="Super4"/>
        <ReplicaPlacementStrategy>org.apache.cassandra.locator.RackUnawareStrategy</ReplicaPlacementStrategy>
        <ReplicationFactor>1</ReplicationFactor>
-       <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>
+       <EndpointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndpointSnitch>
      </Keyspace>
      <Keyspace Name = "Keyspace3">
        <ColumnFamily Name="Standard1"/>
        <ReplicaPlacementStrategy>org.apache.cassandra.locator.RackUnawareStrategy</ReplicaPlacementStrategy>
        <ReplicationFactor>5</ReplicationFactor>
-       <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>
+       <EndpointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndpointSnitch>
      </Keyspace>
      <Keyspace Name = "Keyspace4">
        <ColumnFamily Name="Standard1"/>
@@ -73,7 +73,7 @@
        <ColumnFamily ColumnType="Super" CompareSubcolumnsWith="TimeUUIDType" Name="Super4"/>
        <ReplicaPlacementStrategy>org.apache.cassandra.locator.RackUnawareStrategy</ReplicaPlacementStrategy>
        <ReplicationFactor>3</ReplicationFactor>
-       <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>
+       <EndpointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndpointSnitch>
      </Keyspace>
    </Keyspaces>
    <Seeds>

Modified: cassandra/trunk/test/system/__init__.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/system/__init__.py?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/test/system/__init__.py (original)
+++ cassandra/trunk/test/system/__init__.py Mon Apr 19 14:36:24 2010
@@ -142,7 +142,7 @@ class ThriftTester(BaseTester):
         self.client.transport.close()
         
     def define_schema(self):
-        keyspace1 = Cassandra.KsDef('Keyspace1', 'org.apache.cassandra.locator.RackUnawareStrategy', 1, 'org.apache.cassandra.locator.EndPointSnitch', 
+        keyspace1 = Cassandra.KsDef('Keyspace1', 'org.apache.cassandra.locator.RackUnawareStrategy', 1, 'org.apache.cassandra.locator.EndPointSnitch',
         [
             Cassandra.CfDef('Keyspace1', 'Standard1'),
             Cassandra.CfDef('Keyspace1', 'Standard2'), 

Modified: cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java Mon Apr 19 14:36:24 2010
@@ -92,14 +92,14 @@ public class TestRingCache
             ColumnPath col = new ColumnPath("Standard1").setSuper_column(null).setColumn("col1".getBytes());
             ColumnParent parent = new ColumnParent("Standard1").setSuper_column(null);
 
-            List<InetAddress> endPoints = tester.ringCache.getEndPoint(row);
+            List<InetAddress> endpoints = tester.ringCache.getEndpoint(row);
             String hosts="";
-            for (int i = 0; i < endPoints.size(); i++)
-                hosts = hosts + ((i > 0) ? "," : "") + endPoints.get(i);
-            System.out.println("hosts with key " + new String(row) + " : " + hosts + "; choose " + endPoints.get(0));
+            for (int i = 0; i < endpoints.size(); i++)
+                hosts = hosts + ((i > 0) ? "," : "") + endpoints.get(i);
+            System.out.println("hosts with key " + new String(row) + " : " + hosts + "; choose " + endpoints.get(0));
 
             // now, read the row back directly from the host owning the row locally
-            tester.setup(endPoints.get(0).getHostAddress(), DatabaseDescriptor.getRpcPort());
+            tester.setup(endpoints.get(0).getHostAddress(), DatabaseDescriptor.getRpcPort());
             tester.thriftClient.insert(keyspace, row, parent, new Column("col1".getBytes(), "val1".getBytes(), 1), ConsistencyLevel.ONE);
             Column column = tester.thriftClient.get(keyspace, row, col, ConsistencyLevel.ONE).column;
             System.out.println("read row " + new String(row) + " " + new String(column.name) + ":" + new String(column.value) + ":" + column.timestamp);

Modified: cassandra/trunk/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/dht/BootStrapperTest.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/dht/BootStrapperTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/dht/BootStrapperTest.java Mon Apr 19 14:36:24 2010
@@ -59,7 +59,7 @@ public class BootStrapperTest
         assert three.equals(source);
 
         InetAddress myEndpoint = InetAddress.getByName("127.0.0.1");
-        Range range3 = ss.getPrimaryRangeForEndPoint(three);
+        Range range3 = ss.getPrimaryRangeForEndpoint(three);
         Token fakeToken = ((IPartitioner)StorageService.getPartitioner()).midpoint(range3.left, range3.right);
         assert range3.contains(fakeToken);
         ss.onChange(myEndpoint, StorageService.MOVE_STATE, new ApplicationState(StorageService.STATE_BOOTSTRAPPING + StorageService.Delimiter + ss.getPartitioner().getTokenFactory().toString(fakeToken)));

Modified: cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java Mon Apr 19 14:36:24 2010
@@ -37,12 +37,12 @@ public class GossipDigestTest
     @Test
     public void test() throws IOException
     {
-        InetAddress endPoint = InetAddress.getByName("127.0.0.1");
+        InetAddress endpoint = InetAddress.getByName("127.0.0.1");
         int generation = 0;
         int maxVersion = 123;
-        GossipDigest expected = new GossipDigest(endPoint, generation, maxVersion);
+        GossipDigest expected = new GossipDigest(endpoint, generation, maxVersion);
         //make sure we get the same values out
-        assertEquals(endPoint, expected.getEndPoint());
+        assertEquals(endpoint, expected.getEndpoint());
         assertEquals(generation, expected.getGeneration());
         assertEquals(maxVersion, expected.getMaxVersion());
         

Modified: cassandra/trunk/test/unit/org/apache/cassandra/locator/RackAwareStrategyTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackAwareStrategyTest.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/locator/RackAwareStrategyTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/locator/RackAwareStrategyTest.java Mon Apr 19 14:36:24 2010
@@ -36,7 +36,7 @@ import org.junit.Test;
 
 public class RackAwareStrategyTest
 {
-    private List<Token> endPointTokens;
+    private List<Token> endpointTokens;
     private List<Token> keyTokens;
     private TokenMetadata tmd;
     private Map<String, ArrayList<InetAddress>> expectedResults;
@@ -44,7 +44,7 @@ public class RackAwareStrategyTest
     @Before
     public void init()
     {
-        endPointTokens = new ArrayList<Token>();
+        endpointTokens = new ArrayList<Token>();
         keyTokens = new ArrayList<Token>();
         tmd = new TokenMetadata();
         expectedResults = new HashMap<String, ArrayList<InetAddress>>();
@@ -58,13 +58,13 @@ public class RackAwareStrategyTest
     @Test
     public void testBigIntegerEndpointsA() throws UnknownHostException
     {
-        EndPointSnitch endPointSnitch = new EndPointSnitch();
+        EndPointSnitch endpointSnitch = new EndPointSnitch();
 
-        AbstractReplicationStrategy strategy = new RackAwareStrategy(tmd, endPointSnitch);
-        addEndPoint("0", "5", "254.0.0.1");
-        addEndPoint("10", "15", "254.0.0.2");
-        addEndPoint("20", "25", "254.0.0.3");
-        addEndPoint("30", "35", "254.0.0.4");
+        AbstractReplicationStrategy strategy = new RackAwareStrategy(tmd, endpointSnitch);
+        addEndpoint("0", "5", "254.0.0.1");
+        addEndpoint("10", "15", "254.0.0.2");
+        addEndpoint("20", "25", "254.0.0.3");
+        addEndpoint("30", "35", "254.0.0.4");
 
         expectedResults.put("5", buildResult("254.0.0.2", "254.0.0.3", "254.0.0.4"));
         expectedResults.put("15", buildResult("254.0.0.3", "254.0.0.4", "254.0.0.1"));
@@ -83,13 +83,13 @@ public class RackAwareStrategyTest
     @Test
     public void testBigIntegerEndpointsB() throws UnknownHostException
     {
-        EndPointSnitch endPointSnitch = new EndPointSnitch();
+        EndPointSnitch endpointSnitch = new EndPointSnitch();
 
-        AbstractReplicationStrategy strategy = new RackAwareStrategy(tmd, endPointSnitch);
-        addEndPoint("0", "5", "254.0.0.1");
-        addEndPoint("10", "15", "254.0.0.2");
-        addEndPoint("20", "25", "254.1.0.3");
-        addEndPoint("30", "35", "254.0.0.4");
+        AbstractReplicationStrategy strategy = new RackAwareStrategy(tmd, endpointSnitch);
+        addEndpoint("0", "5", "254.0.0.1");
+        addEndpoint("10", "15", "254.0.0.2");
+        addEndpoint("20", "25", "254.1.0.3");
+        addEndpoint("30", "35", "254.0.0.4");
 
         expectedResults.put("5", buildResult("254.0.0.2", "254.1.0.3", "254.0.0.4"));
         expectedResults.put("15", buildResult("254.1.0.3", "254.0.0.4", "254.0.0.1"));
@@ -109,13 +109,13 @@ public class RackAwareStrategyTest
     @Test
     public void testBigIntegerEndpointsC() throws UnknownHostException
     {
-        EndPointSnitch endPointSnitch = new EndPointSnitch();
+        EndPointSnitch endpointSnitch = new EndPointSnitch();
 
-        AbstractReplicationStrategy strategy = new RackAwareStrategy(tmd, endPointSnitch);
-        addEndPoint("0", "5", "254.0.0.1");
-        addEndPoint("10", "15", "254.0.0.2");
-        addEndPoint("20", "25", "254.0.1.3");
-        addEndPoint("30", "35", "254.1.0.4");
+        AbstractReplicationStrategy strategy = new RackAwareStrategy(tmd, endpointSnitch);
+        addEndpoint("0", "5", "254.0.0.1");
+        addEndpoint("10", "15", "254.0.0.2");
+        addEndpoint("20", "25", "254.0.1.3");
+        addEndpoint("30", "35", "254.1.0.4");
 
         expectedResults.put("5", buildResult("254.0.0.2", "254.0.1.3", "254.1.0.4"));
         expectedResults.put("15", buildResult("254.0.1.3", "254.1.0.4", "254.0.0.1"));
@@ -144,27 +144,27 @@ public class RackAwareStrategyTest
         return result;
     }
 
-    private void addEndPoint(String endPointTokenID, String keyTokenID, String endPointAddress) throws UnknownHostException
+    private void addEndpoint(String endpointTokenID, String keyTokenID, String endpointAddress) throws UnknownHostException
     {
-        BigIntegerToken endPointToken = new BigIntegerToken(endPointTokenID);
-        endPointTokens.add(endPointToken);
+        BigIntegerToken endpointToken = new BigIntegerToken(endpointTokenID);
+        endpointTokens.add(endpointToken);
 
         BigIntegerToken keyToken = new BigIntegerToken(keyTokenID);
         keyTokens.add(keyToken);
 
-        InetAddress ep = InetAddress.getByName(endPointAddress);
-        tmd.updateNormalToken(endPointToken, ep);
+        InetAddress ep = InetAddress.getByName(endpointAddress);
+        tmd.updateNormalToken(endpointToken, ep);
     }
 
     private void testGetEndpoints(AbstractReplicationStrategy strategy, Token[] keyTokens, String table) throws UnknownHostException
     {
         for (Token keyToken : keyTokens)
         {
-            List<InetAddress> endPoints = strategy.getNaturalEndpoints(keyToken, tmd, table);
-            for (int j = 0; j < endPoints.size(); j++)
+            List<InetAddress> endpoints = strategy.getNaturalEndpoints(keyToken, tmd, table);
+            for (int j = 0; j < endpoints.size(); j++)
             {
                 ArrayList<InetAddress> hostsExpected = expectedResults.get(keyToken.toString());
-                assertEquals(endPoints.get(j), hostsExpected.get(j));
+                assertEquals(endpoints.get(j), hostsExpected.get(j));
             }
         }
     }

Modified: cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java?rev=935594&r1=935593&r2=935594&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java Mon Apr 19 14:36:24 2010
@@ -65,14 +65,14 @@ public class RackUnawareStrategyTest ext
         TokenMetadata tmd = new TokenMetadata();
         AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, null);
 
-        List<Token> endPointTokens = new ArrayList<Token>();
+        List<Token> endpointTokens = new ArrayList<Token>();
         List<Token> keyTokens = new ArrayList<Token>();
         for (int i = 0; i < 5; i++) {
-            endPointTokens.add(new BigIntegerToken(String.valueOf(10 * i)));
+            endpointTokens.add(new BigIntegerToken(String.valueOf(10 * i)));
             keyTokens.add(new BigIntegerToken(String.valueOf(10 * i + 5)));
         }
         for (String table : DatabaseDescriptor.getNonSystemTables())
-            testGetEndpoints(tmd, strategy, endPointTokens.toArray(new Token[0]), keyTokens.toArray(new Token[0]), table);
+            testGetEndpoints(tmd, strategy, endpointTokens.toArray(new Token[0]), keyTokens.toArray(new Token[0]), table);
     }
 
     @Test
@@ -82,35 +82,35 @@ public class RackUnawareStrategyTest ext
         IPartitioner partitioner = new OrderPreservingPartitioner();
         AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, null);
 
-        List<Token> endPointTokens = new ArrayList<Token>();
+        List<Token> endpointTokens = new ArrayList<Token>();
         List<Token> keyTokens = new ArrayList<Token>();
         for (int i = 0; i < 5; i++) {
-            endPointTokens.add(new StringToken(String.valueOf((char)('a' + i * 2))));
+            endpointTokens.add(new StringToken(String.valueOf((char)('a' + i * 2))));
             keyTokens.add(partitioner.getToken(String.valueOf((char)('a' + i * 2 + 1)).getBytes()));
         }
         for (String table : DatabaseDescriptor.getNonSystemTables())
-            testGetEndpoints(tmd, strategy, endPointTokens.toArray(new Token[0]), keyTokens.toArray(new Token[0]), table);
+            testGetEndpoints(tmd, strategy, endpointTokens.toArray(new Token[0]), keyTokens.toArray(new Token[0]), table);
     }
 
     // given a list of endpoint tokens, and a set of key tokens falling between the endpoint tokens,
     // make sure that the Strategy picks the right endpoints for the keys.
-    private void testGetEndpoints(TokenMetadata tmd, AbstractReplicationStrategy strategy, Token[] endPointTokens, Token[] keyTokens, String table) throws UnknownHostException
+    private void testGetEndpoints(TokenMetadata tmd, AbstractReplicationStrategy strategy, Token[] endpointTokens, Token[] keyTokens, String table) throws UnknownHostException
     {
         List<InetAddress> hosts = new ArrayList<InetAddress>();
-        for (int i = 0; i < endPointTokens.length; i++)
+        for (int i = 0; i < endpointTokens.length; i++)
         {
             InetAddress ep = InetAddress.getByName("127.0.0." + String.valueOf(i + 1));
-            tmd.updateNormalToken(endPointTokens[i], ep);
+            tmd.updateNormalToken(endpointTokens[i], ep);
             hosts.add(ep);
         }
 
         for (int i = 0; i < keyTokens.length; i++)
         {
-            List<InetAddress> endPoints = strategy.getNaturalEndpoints(keyTokens[i], table);
-            assertEquals(DatabaseDescriptor.getReplicationFactor(table), endPoints.size());
-            for (int j = 0; j < endPoints.size(); j++)
+            List<InetAddress> endpoints = strategy.getNaturalEndpoints(keyTokens[i], table);
+            assertEquals(DatabaseDescriptor.getReplicationFactor(table), endpoints.size());
+            for (int j = 0; j < endpoints.size(); j++)
             {
-                assertEquals(endPoints.get(j), hosts.get((i + j + 1) % hosts.size()));
+                assertEquals(endpoints.get(j), hosts.get((i + j + 1) % hosts.size()));
             }
         }
     }
@@ -124,27 +124,27 @@ public class RackUnawareStrategyTest ext
         TokenMetadata oldTmd = StorageServiceAccessor.setTokenMetadata(tmd);
         AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, null);
 
-        Token[] endPointTokens = new Token[RING_SIZE];
+        Token[] endpointTokens = new Token[RING_SIZE];
         Token[] keyTokens = new Token[RING_SIZE];
         
         for (int i = 0; i < RING_SIZE; i++)
         {
-            endPointTokens[i] = new BigIntegerToken(String.valueOf(RING_SIZE * 2 * i));
+            endpointTokens[i] = new BigIntegerToken(String.valueOf(RING_SIZE * 2 * i));
             keyTokens[i] = new BigIntegerToken(String.valueOf(RING_SIZE * 2 * i + RING_SIZE));
         }
         
         List<InetAddress> hosts = new ArrayList<InetAddress>();
-        for (int i = 0; i < endPointTokens.length; i++)
+        for (int i = 0; i < endpointTokens.length; i++)
         {
             InetAddress ep = InetAddress.getByName("127.0.0." + String.valueOf(i + 1));
-            tmd.updateNormalToken(endPointTokens[i], ep);
+            tmd.updateNormalToken(endpointTokens[i], ep);
             hosts.add(ep);
         }
 
         // bootstrap at the end of the ring
         Token bsToken = new BigIntegerToken(String.valueOf(210));
-        InetAddress bootstrapEndPoint = InetAddress.getByName("127.0.0.11");
-        tmd.addBootstrapToken(bsToken, bootstrapEndPoint);
+        InetAddress bootstrapEndpoint = InetAddress.getByName("127.0.0.11");
+        tmd.addBootstrapToken(bsToken, bootstrapEndpoint);
 
         for (String table : DatabaseDescriptor.getNonSystemTables())
         {
@@ -153,20 +153,20 @@ public class RackUnawareStrategyTest ext
 
             for (int i = 0; i < keyTokens.length; i++)
             {
-                Collection<InetAddress> endPoints = strategy.getWriteEndpoints(keyTokens[i], table, strategy.getNaturalEndpoints(keyTokens[i], table));
-                assertTrue(endPoints.size() >= replicationFactor);
+                Collection<InetAddress> endpoints = strategy.getWriteEndpoints(keyTokens[i], table, strategy.getNaturalEndpoints(keyTokens[i], table));
+                assertTrue(endpoints.size() >= replicationFactor);
 
                 for (int j = 0; j < replicationFactor; j++)
                 {
                     //Check that the old nodes are definitely included
-                    assertTrue(endPoints.contains(hosts.get((i + j + 1) % hosts.size())));
+                    assertTrue(endpoints.contains(hosts.get((i + j + 1) % hosts.size())));
                 }
 
-                // bootstrapEndPoint should be in the endPoints for i in MAX-RF to MAX, but not in any earlier ep.
+                // bootstrapEndpoint should be in the endpoints for i in MAX-RF to MAX, but not in any earlier ep.
                 if (i < RING_SIZE - replicationFactor)
-                    assertFalse(endPoints.contains(bootstrapEndPoint));
+                    assertFalse(endpoints.contains(bootstrapEndpoint));
                 else
-                    assertTrue(endPoints.contains(bootstrapEndPoint));
+                    assertTrue(endpoints.contains(bootstrapEndpoint));
             }
         }