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:47:37 UTC
svn commit: r935601 [1/2] - in /cassandra/trunk: conf/
contrib/property_snitch/src/java/org/apache/cassandra/locator/
src/java/org/apache/cassandra/config/ src/java/org/apache/cassandra/gms/
src/java/org/apache/cassandra/locator/ src/java/org/apache/ca...
Author: jbellis
Date: Mon Apr 19 14:47:36 2010
New Revision: 935601
URL: http://svn.apache.org/viewvc?rev=935601&view=rev
Log:
rename EndPoint classes -> Endpoint (case change).
patch by Erick Tryzelaar; reviewed by jbellis for CASSANDRA-994
Added:
cassandra/trunk/src/java/org/apache/cassandra/gms/EndpointState.java
- copied, changed from r935594, cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java
cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangePublisher.java
- copied, changed from r935594, cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java
cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangeSubscriber.java
- copied, changed from r935594, cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java
cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndpointSnitch.java
- copied, changed from r935594, cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java
cassandra/trunk/src/java/org/apache/cassandra/locator/EndpointSnitch.java
- copied, changed from r935594, cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java
cassandra/trunk/src/java/org/apache/cassandra/locator/IEndpointSnitch.java
- copied, changed from r935594, cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java
cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java
- copied, changed from r935594, cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
Modified:
cassandra/trunk/conf/cassandra.xml
cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java
cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigest.java
cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java
cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java
cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java
cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java
cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractEndpointSnitch.java
cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java
cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java
cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java
cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java
cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
cassandra/trunk/src/java/org/apache/cassandra/net/Header.java
cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestMetadata.java
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
cassandra/trunk/test/conf/cassandra.xml
cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
cassandra/trunk/test/unit/org/apache/cassandra/locator/RackAwareStrategyTest.java
Modified: cassandra/trunk/conf/cassandra.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/conf/cassandra.xml?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/conf/cassandra.xml (original)
+++ cassandra/trunk/conf/cassandra.xml Mon Apr 19 14:47:36 2010
@@ -52,7 +52,7 @@
~ Out of the box, Cassandra provides org.apache.cassandra.locator.EndPointSnitch,
~ and PropertyFileEndPointSnitch is available in contrib/.
-->
- <EndpointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndpointSnitch>
+ <EndpointSnitch>org.apache.cassandra.locator.EndpointSnitch</EndpointSnitch>
<!--
~ Keyspaces and ColumnFamilies:
Modified: cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java (original)
+++ cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java Mon Apr 19 14:47:36 2010
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* datacenter or on the same rack.
*
*/
-public class PropertyFileEndPointSnitch extends EndPointSnitch implements PropertyFileEndPointSnitchMBean {
+public class PropertyFileEndPointSnitch extends EndpointSnitch implements PropertyFileEndPointSnitchMBean {
/**
* A list of properties with keys being host:port and values being datacenter:rack
*/
Modified: cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Mon Apr 19 14:47:36 2010
@@ -28,7 +28,7 @@ import org.apache.cassandra.db.marshal.T
import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.db.migration.Migration;
import org.apache.cassandra.dht.IPartitioner;
-import org.apache.cassandra.locator.IEndPointSnitch;
+import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.service.StorageService;
@@ -71,7 +71,7 @@ public class DatabaseDescriptor
public static final String random = "RANDOM";
public static final String ophf = "OPHF";
- private static IEndPointSnitch snitch;
+ private static IEndpointSnitch snitch;
private static int storagePort = 7000;
private static int rpcPort = 9160;
private static boolean thriftFramed = false;
@@ -524,9 +524,9 @@ public class DatabaseDescriptor
}
}
- private static IEndPointSnitch createEndpointSnitch(String endpointSnitchClassName) throws ConfigurationException
+ private static IEndpointSnitch createEndpointSnitch(String endpointSnitchClassName) throws ConfigurationException
{
- IEndPointSnitch snitch;
+ IEndpointSnitch snitch;
Class cls;
try
{
@@ -547,7 +547,7 @@ public class DatabaseDescriptor
}
try
{
- snitch = (IEndPointSnitch)ctor.newInstance();
+ snitch = (IEndpointSnitch)ctor.newInstance();
}
catch (InstantiationException e)
{
@@ -872,7 +872,7 @@ public class DatabaseDescriptor
return partitioner;
}
- public static IEndPointSnitch getEndpointSnitch()
+ public static IEndpointSnitch getEndpointSnitch()
{
return snitch;
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java Mon Apr 19 14:47:36 2010
@@ -19,7 +19,6 @@
package org.apache.cassandra.config;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
-import org.apache.cassandra.locator.IEndPointSnitch;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java Mon Apr 19 14:47:36 2010
@@ -23,7 +23,6 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.*;
import org.apache.cassandra.io.ICompactSerializer;
-import org.apache.cassandra.service.StorageService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,9 +32,9 @@ import org.slf4j.LoggerFactory;
* instance. Any state for a given endpoint can be retrieved from this instance.
*/
-public class EndPointState
+public class EndpointState
{
- private static ICompactSerializer<EndPointState> serializer_;
+ private static ICompactSerializer<EndpointState> serializer_;
static
{
serializer_ = new EndPointStateSerializer();
@@ -55,12 +54,12 @@ public class EndPointState
// fat client and will be removed automatically from gossip.
boolean hasToken_;
- public static ICompactSerializer<EndPointState> serializer()
+ public static ICompactSerializer<EndpointState> serializer()
{
return serializer_;
}
- EndPointState(HeartBeatState hbState)
+ EndpointState(HeartBeatState hbState)
{
hbState_ = hbState;
updateTimestamp_ = System.currentTimeMillis();
@@ -155,11 +154,11 @@ public class EndPointState
}
-class EndPointStateSerializer implements ICompactSerializer<EndPointState>
+class EndPointStateSerializer implements ICompactSerializer<EndpointState>
{
private static Logger logger_ = LoggerFactory.getLogger(EndPointStateSerializer.class);
- public void serialize(EndPointState epState, DataOutputStream dos) throws IOException
+ public void serialize(EndpointState epState, DataOutputStream dos) throws IOException
{
/* These are for estimating whether we overshoot the MTU limit */
int estimate = 0;
@@ -195,10 +194,10 @@ class EndPointStateSerializer implements
}
}
- public EndPointState deserialize(DataInputStream dis) throws IOException
+ public EndpointState deserialize(DataInputStream dis) throws IOException
{
HeartBeatState hbState = HeartBeatState.serializer().deserialize(dis);
- EndPointState epState = new EndPointState(hbState);
+ EndpointState epState = new EndpointState(hbState);
int appStateSize = dis.readInt();
for ( int i = 0; i < appStateSize; ++i )
Copied: cassandra/trunk/src/java/org/apache/cassandra/gms/EndpointState.java (from r935594, cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/EndpointState.java?p2=cassandra/trunk/src/java/org/apache/cassandra/gms/EndpointState.java&p1=cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java&r1=935594&r2=935601&rev=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/EndpointState.java Mon Apr 19 14:47:36 2010
@@ -23,7 +23,6 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.*;
import org.apache.cassandra.io.ICompactSerializer;
-import org.apache.cassandra.service.StorageService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,9 +32,9 @@ import org.slf4j.LoggerFactory;
* instance. Any state for a given endpoint can be retrieved from this instance.
*/
-public class EndPointState
+public class EndpointState
{
- private static ICompactSerializer<EndPointState> serializer_;
+ private static ICompactSerializer<EndpointState> serializer_;
static
{
serializer_ = new EndPointStateSerializer();
@@ -55,12 +54,12 @@ public class EndPointState
// fat client and will be removed automatically from gossip.
boolean hasToken_;
- public static ICompactSerializer<EndPointState> serializer()
+ public static ICompactSerializer<EndpointState> serializer()
{
return serializer_;
}
- EndPointState(HeartBeatState hbState)
+ EndpointState(HeartBeatState hbState)
{
hbState_ = hbState;
updateTimestamp_ = System.currentTimeMillis();
@@ -155,11 +154,11 @@ public class EndPointState
}
-class EndPointStateSerializer implements ICompactSerializer<EndPointState>
+class EndPointStateSerializer implements ICompactSerializer<EndpointState>
{
private static Logger logger_ = LoggerFactory.getLogger(EndPointStateSerializer.class);
- public void serialize(EndPointState epState, DataOutputStream dos) throws IOException
+ public void serialize(EndpointState epState, DataOutputStream dos) throws IOException
{
/* These are for estimating whether we overshoot the MTU limit */
int estimate = 0;
@@ -195,10 +194,10 @@ class EndPointStateSerializer implements
}
}
- public EndPointState deserialize(DataInputStream dis) throws IOException
+ public EndpointState deserialize(DataInputStream dis) throws IOException
{
HeartBeatState hbState = HeartBeatState.serializer().deserialize(dis);
- EndPointState epState = new EndPointState(hbState);
+ EndpointState epState = new EndpointState(hbState);
int appStateSize = dis.readInt();
for ( int i = 0; i < appStateSize; ++i )
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java Mon Apr 19 14:47:36 2010
@@ -23,8 +23,6 @@ import java.io.IOException;
import java.io.IOError;
import java.lang.management.ManagementFactory;
import java.util.*;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -120,7 +118,7 @@ public class FailureDetector implements
return true;
/* Incoming port is assumed to be the Storage port. We need to change it to the control port */
- EndPointState epState = Gossiper.instance.getEndpointStateForEndpoint(ep);
+ EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(ep);
return epState.isAlive();
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigest.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigest.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigest.java Mon Apr 19 14:47:36 2010
@@ -23,9 +23,8 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.cassandra.io.ICompactSerializer;
-import org.apache.cassandra.net.CompactEndPointSerializationHelper;
+import org.apache.cassandra.net.CompactEndpointSerializationHelper;
import java.net.InetAddress;
-import org.apache.cassandra.net.*;
/**
* Contains information about a specified list of EndPoints and the largest version
@@ -94,14 +93,14 @@ class GossipDigestSerializer implements
{
public void serialize(GossipDigest gDigest, DataOutputStream dos) throws IOException
{
- CompactEndPointSerializationHelper.serialize(gDigest.endpoint_, dos);
+ CompactEndpointSerializationHelper.serialize(gDigest.endpoint_, dos);
dos.writeInt(gDigest.generation_);
dos.writeInt(gDigest.maxVersion_);
}
public GossipDigest deserialize(DataInputStream dis) throws IOException
{
- InetAddress endpoint = CompactEndPointSerializationHelper.deserialize(dis);
+ InetAddress endpoint = CompactEndpointSerializationHelper.deserialize(dis);
int generation = dis.readInt();
int version = dis.readInt();
return new GossipDigest(endpoint, generation, version);
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java Mon Apr 19 14:47:36 2010
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.*;
import org.apache.cassandra.io.ICompactSerializer;
import java.net.InetAddress;
-import org.apache.cassandra.net.*;
/**
@@ -40,19 +39,19 @@ class GossipDigestAck2Message
serializer_ = new GossipDigestAck2MessageSerializer();
}
- Map<InetAddress, EndPointState> epStateMap_ = new HashMap<InetAddress, EndPointState>();
+ Map<InetAddress, EndpointState> epStateMap_ = new HashMap<InetAddress, EndpointState>();
public static ICompactSerializer<GossipDigestAck2Message> serializer()
{
return serializer_;
}
- GossipDigestAck2Message(Map<InetAddress, EndPointState> epStateMap)
+ GossipDigestAck2Message(Map<InetAddress, EndpointState> epStateMap)
{
epStateMap_ = epStateMap;
}
- Map<InetAddress, EndPointState> getEndpointStateMap()
+ Map<InetAddress, EndpointState> getEndpointStateMap()
{
return epStateMap_;
}
@@ -68,7 +67,7 @@ class GossipDigestAck2MessageSerializer
public GossipDigestAck2Message deserialize(DataInputStream dis) throws IOException
{
- Map<InetAddress, EndPointState> epStateMap = EndPointStatesSerializationHelper.deserialize(dis);
+ Map<InetAddress, EndpointState> epStateMap = EndPointStatesSerializationHelper.deserialize(dis);
return new GossipDigestAck2Message(epStateMap);
}
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java Mon Apr 19 14:47:36 2010
@@ -42,14 +42,14 @@ class GossipDigestAckMessage
}
List<GossipDigest> gDigestList_ = new ArrayList<GossipDigest>();
- Map<InetAddress, EndPointState> epStateMap_ = new HashMap<InetAddress, EndPointState>();
+ Map<InetAddress, EndpointState> epStateMap_ = new HashMap<InetAddress, EndpointState>();
static ICompactSerializer<GossipDigestAckMessage> serializer()
{
return serializer_;
}
- GossipDigestAckMessage(List<GossipDigest> gDigestList, Map<InetAddress, EndPointState> epStateMap)
+ GossipDigestAckMessage(List<GossipDigest> gDigestList, Map<InetAddress, EndpointState> epStateMap)
{
gDigestList_ = gDigestList;
epStateMap_ = epStateMap;
@@ -60,7 +60,7 @@ class GossipDigestAckMessage
return gDigestList_;
}
- Map<InetAddress, EndPointState> getEndpointStateMap()
+ Map<InetAddress, EndpointState> getEndpointStateMap()
{
return epStateMap_;
}
@@ -82,7 +82,7 @@ class GossipDigestAckMessageSerializer i
public GossipDigestAckMessage deserialize(DataInputStream dis) throws IOException
{
- Map<InetAddress, EndPointState> epStateMap = new HashMap<InetAddress, EndPointState>();
+ Map<InetAddress, EndpointState> epStateMap = new HashMap<InetAddress, EndpointState>();
List<GossipDigest> gDigestList = GossipDigestSerializationHelper.deserialize(dis);
boolean bContinue = dis.readBoolean();
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java Mon Apr 19 14:47:36 2010
@@ -25,8 +25,9 @@ import java.util.*;
import java.util.Map.Entry;
import org.apache.cassandra.io.ICompactSerializer;
-import org.apache.cassandra.net.CompactEndPointSerializationHelper;
+import org.apache.cassandra.net.CompactEndpointSerializationHelper;
import java.net.InetAddress;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -115,14 +116,14 @@ class EndPointStatesSerializationHelper
{
private static final Logger logger_ = LoggerFactory.getLogger(EndPointStatesSerializationHelper.class);
- static boolean serialize(Map<InetAddress, EndPointState> epStateMap, DataOutputStream dos) throws IOException
+ static boolean serialize(Map<InetAddress, EndpointState> epStateMap, DataOutputStream dos) throws IOException
{
boolean bVal = true;
int estimate = 0;
int size = epStateMap.size();
dos.writeInt(size);
- for (Entry<InetAddress, EndPointState> entry : epStateMap.entrySet())
+ for (Entry<InetAddress, EndpointState> entry : epStateMap.entrySet())
{
InetAddress ep = entry.getKey();
if ( Gossiper.MAX_GOSSIP_PACKET_SIZE - dos.size() < estimate )
@@ -133,18 +134,18 @@ class EndPointStatesSerializationHelper
}
int pre = dos.size();
- CompactEndPointSerializationHelper.serialize(ep, dos);
- EndPointState.serializer().serialize(entry.getValue(), dos);
+ CompactEndpointSerializationHelper.serialize(ep, dos);
+ EndpointState.serializer().serialize(entry.getValue(), dos);
int post = dos.size();
estimate = post - pre;
}
return bVal;
}
- static Map<InetAddress, EndPointState> deserialize(DataInputStream dis) throws IOException
+ static Map<InetAddress, EndpointState> deserialize(DataInputStream dis) throws IOException
{
int size = dis.readInt();
- Map<InetAddress, EndPointState> epStateMap = new HashMap<InetAddress, EndPointState>();
+ Map<InetAddress, EndpointState> epStateMap = new HashMap<InetAddress, EndpointState>();
for ( int i = 0; i < size; ++i )
{
@@ -154,8 +155,8 @@ class EndPointStatesSerializationHelper
break;
}
// int length = dis.readInt();
- InetAddress ep = CompactEndPointSerializationHelper.deserialize(dis);
- EndPointState epState = EndPointState.serializer().deserialize(dis);
+ InetAddress ep = CompactEndpointSerializationHelper.deserialize(dis);
+ EndpointState epState = EndpointState.serializer().deserialize(dis);
epStateMap.put(ep, epState);
}
return epStateMap;
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Mon Apr 19 14:47:36 2010
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
* of the three above mentioned messages updates the Failure Detector with the liveness information.
*/
-public class Gossiper implements IFailureDetectionEventListener, IEndPointStateChangePublisher
+public class Gossiper implements IFailureDetectionEventListener, IEndpointStateChangePublisher
{
private class GossipTimerTask extends TimerTask
{
@@ -112,7 +112,7 @@ public class Gossiper implements IFailur
private Random random_ = new Random();
/* subscribers for interest in EndPointState change */
- private List<IEndPointStateChangeSubscriber> subscribers_ = new ArrayList<IEndPointStateChangeSubscriber>();
+ private List<IEndpointStateChangeSubscriber> subscribers_ = new ArrayList<IEndpointStateChangeSubscriber>();
/* live member set */
private Set<InetAddress> liveEndpoints_ = new HashSet<InetAddress>();
@@ -124,7 +124,7 @@ public class Gossiper implements IFailur
private Set<InetAddress> seeds_ = new HashSet<InetAddress>();
/* map where key is the endpoint and value is the state associated with the endpoint */
- Map<InetAddress, EndPointState> endpointStateMap_ = new Hashtable<InetAddress, EndPointState>();
+ Map<InetAddress, EndpointState> endpointStateMap_ = new Hashtable<InetAddress, EndpointState>();
/* map where key is endpoint and value is timestamp when this endpoint was removed from
* gossip. We will ignore any gossip regarding these endpoints for Streaming.RING_DELAY time
@@ -144,12 +144,12 @@ public class Gossiper implements IFailur
}
/** Register with the Gossiper for EndPointState notifications */
- public synchronized void register(IEndPointStateChangeSubscriber subscriber)
+ public synchronized void register(IEndpointStateChangeSubscriber subscriber)
{
subscribers_.add(subscriber);
}
- public synchronized void unregister(IEndPointStateChangeSubscriber subscriber)
+ public synchronized void unregister(IEndpointStateChangeSubscriber subscriber)
{
subscribers_.remove(subscriber);
}
@@ -174,7 +174,7 @@ public class Gossiper implements IFailur
*/
public void convict(InetAddress endpoint)
{
- EndPointState epState = endpointStateMap_.get(endpoint);
+ EndpointState epState = endpointStateMap_.get(endpoint);
if (epState.isAlive())
{
logger_.info("InetAddress {} is now dead.", endpoint);
@@ -182,7 +182,7 @@ public class Gossiper implements IFailur
}
}
- int getMaxEndpointStateVersion(EndPointState epState)
+ int getMaxEndpointStateVersion(EndpointState epState)
{
List<Integer> versions = new ArrayList<Integer>();
versions.add( epState.getHeartBeatState().getHeartBeatVersion() );
@@ -233,7 +233,7 @@ public class Gossiper implements IFailur
void makeRandomGossipDigest(List<GossipDigest> gDigests)
{
/* Add the local endpoint state */
- EndPointState epState = endpointStateMap_.get(localEndpoint_);
+ EndpointState epState = endpointStateMap_.get(localEndpoint_);
int generation = epState.getHeartBeatState().getGeneration();
int maxVersion = getMaxEndpointStateVersion(epState);
gDigests.add( new GossipDigest(localEndpoint_, generation, maxVersion) );
@@ -386,7 +386,7 @@ public class Gossiper implements IFailur
continue;
FailureDetector.instance.interpret(endpoint);
- EndPointState epState = endpointStateMap_.get(endpoint);
+ EndpointState epState = endpointStateMap_.get(endpoint);
if ( epState != null )
{
long duration = now - epState.getUpdateTimestamp();
@@ -426,17 +426,17 @@ public class Gossiper implements IFailur
}
}
- EndPointState getEndpointStateForEndpoint(InetAddress ep)
+ EndpointState getEndpointStateForEndpoint(InetAddress ep)
{
return endpointStateMap_.get(ep);
}
- synchronized EndPointState getStateForVersionBiggerThan(InetAddress forEndpoint, int version)
+ synchronized EndpointState getStateForVersionBiggerThan(InetAddress forEndpoint, int version)
{
if (logger_.isTraceEnabled())
logger_.trace("Scanning for state greater than " + version + " for " + forEndpoint);
- EndPointState epState = endpointStateMap_.get(forEndpoint);
- EndPointState reqdEndpointState = null;
+ EndpointState epState = endpointStateMap_.get(forEndpoint);
+ EndpointState reqdEndpointState = null;
if ( epState != null )
{
@@ -451,7 +451,7 @@ public class Gossiper implements IFailur
int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion();
if ( localHbVersion > version )
{
- reqdEndpointState = new EndPointState(epState.getHeartBeatState());
+ reqdEndpointState = new EndpointState(epState.getHeartBeatState());
}
Map<String, ApplicationState> appStateMap = epState.getApplicationStateMap();
/* Accumulate all application states whose versions are greater than "version" variable */
@@ -462,7 +462,7 @@ public class Gossiper implements IFailur
{
if ( reqdEndpointState == null )
{
- reqdEndpointState = new EndPointState(epState.getHeartBeatState());
+ reqdEndpointState = new EndpointState(epState.getHeartBeatState());
}
final String key = entry.getKey();
if (logger_.isTraceEnabled())
@@ -479,7 +479,7 @@ public class Gossiper implements IFailur
IFailureDetector fd = FailureDetector.instance;
for ( GossipDigest gDigest : gDigests )
{
- EndPointState localEndpointState = endpointStateMap_.get(gDigest.endpoint_);
+ EndpointState localEndpointState = endpointStateMap_.get(gDigest.endpoint_);
/*
* If the local endpoint state exists then report to the FD only
* if the versions workout.
@@ -508,14 +508,14 @@ public class Gossiper implements IFailur
}
}
- void notifyFailureDetector(Map<InetAddress, EndPointState> remoteEpStateMap)
+ void notifyFailureDetector(Map<InetAddress, EndpointState> remoteEpStateMap)
{
IFailureDetector fd = FailureDetector.instance;
- for (Entry<InetAddress, EndPointState> entry : remoteEpStateMap.entrySet())
+ for (Entry<InetAddress, EndpointState> entry : remoteEpStateMap.entrySet())
{
InetAddress endpoint = entry.getKey();
- EndPointState remoteEndpointState = entry.getValue();
- EndPointState localEndpointState = endpointStateMap_.get(endpoint);
+ EndpointState remoteEndpointState = entry.getValue();
+ EndpointState localEndpointState = endpointStateMap_.get(endpoint);
/*
* If the local endpoint state exists then report to the FD only
* if the versions workout.
@@ -544,7 +544,7 @@ public class Gossiper implements IFailur
}
}
- void markAlive(InetAddress addr, EndPointState localState)
+ void markAlive(InetAddress addr, EndpointState localState)
{
if (logger_.isTraceEnabled())
logger_.trace("marking as alive {}", addr);
@@ -555,7 +555,7 @@ public class Gossiper implements IFailur
}
}
- private void handleNewJoin(InetAddress ep, EndPointState epState)
+ private void handleNewJoin(InetAddress ep, EndpointState epState)
{
if (justRemovedEndpoints_.containsKey(ep))
return;
@@ -563,7 +563,7 @@ public class Gossiper implements IFailur
handleMajorStateChange(ep, epState, false);
}
- private void handleGenerationChange(InetAddress ep, EndPointState epState)
+ private void handleGenerationChange(InetAddress ep, EndpointState epState)
{
logger_.info("Node {} has restarted, now UP again", ep);
handleMajorStateChange(ep, epState, true);
@@ -580,24 +580,24 @@ public class Gossiper implements IFailur
* @param epState EndPointState for the endpoint
* @param isKnownNode is this node familiar to us already (present in endpointStateMap)
*/
- private void handleMajorStateChange(InetAddress ep, EndPointState epState, boolean isKnownNode)
+ private void handleMajorStateChange(InetAddress ep, EndpointState epState, boolean isKnownNode)
{
endpointStateMap_.put(ep, epState);
isAlive(ep, epState, isKnownNode);
- for (IEndPointStateChangeSubscriber subscriber : subscribers_)
+ for (IEndpointStateChangeSubscriber subscriber : subscribers_)
subscriber.onJoin(ep, epState);
}
- synchronized void applyStateLocally(Map<InetAddress, EndPointState> epStateMap)
+ synchronized void applyStateLocally(Map<InetAddress, EndpointState> epStateMap)
{
- for (Entry<InetAddress, EndPointState> entry : epStateMap.entrySet())
+ for (Entry<InetAddress, EndpointState> entry : epStateMap.entrySet())
{
InetAddress ep = entry.getKey();
if ( ep.equals( localEndpoint_ ) )
continue;
- EndPointState localEpStatePtr = endpointStateMap_.get(ep);
- EndPointState remoteState = entry.getValue();
+ EndpointState localEpStatePtr = endpointStateMap_.get(ep);
+ EndpointState remoteState = entry.getValue();
/*
If state does not exist just add it. If it does then add it only if the version
of the remote copy is greater than the local copy.
@@ -632,7 +632,7 @@ public class Gossiper implements IFailur
}
}
- void applyHeartBeatStateLocally(InetAddress addr, EndPointState localState, EndPointState remoteState)
+ void applyHeartBeatStateLocally(InetAddress addr, EndpointState localState, EndpointState remoteState)
{
HeartBeatState localHbState = localState.getHeartBeatState();
HeartBeatState remoteHbState = remoteState.getHeartBeatState();
@@ -653,7 +653,7 @@ public class Gossiper implements IFailur
}
}
- void applyApplicationStateLocally(InetAddress addr, EndPointState localStatePtr, EndPointState remoteStatePtr)
+ void applyApplicationStateLocally(InetAddress addr, EndpointState localStatePtr, EndpointState remoteStatePtr)
{
Map<String, ApplicationState> localAppStateMap = localStatePtr.getApplicationStateMap();
@@ -700,27 +700,27 @@ public class Gossiper implements IFailur
void doNotifications(InetAddress addr, String stateName, ApplicationState state)
{
- for (IEndPointStateChangeSubscriber subscriber : subscribers_)
+ for (IEndpointStateChangeSubscriber subscriber : subscribers_)
{
subscriber.onChange(addr, stateName, state);
}
}
- synchronized void isAlive(InetAddress addr, EndPointState epState, boolean value)
+ synchronized void isAlive(InetAddress addr, EndpointState epState, boolean value)
{
epState.isAlive(value);
if (value)
{
liveEndpoints_.add(addr);
unreachableEndpoints_.remove(addr);
- for (IEndPointStateChangeSubscriber subscriber : subscribers_)
+ for (IEndpointStateChangeSubscriber subscriber : subscribers_)
subscriber.onAlive(addr, epState);
}
else
{
liveEndpoints_.remove(addr);
unreachableEndpoints_.add(addr);
- for (IEndPointStateChangeSubscriber subscriber : subscribers_)
+ for (IEndpointStateChangeSubscriber subscriber : subscribers_)
subscriber.onDead(addr, epState);
}
if (epState.isAGossiper())
@@ -736,9 +736,9 @@ public class Gossiper implements IFailur
}
/* Send all the data with version greater than maxRemoteVersion */
- void sendAll(GossipDigest gDigest, Map<InetAddress, EndPointState> deltaEpStateMap, int maxRemoteVersion)
+ void sendAll(GossipDigest gDigest, Map<InetAddress, EndpointState> deltaEpStateMap, int maxRemoteVersion)
{
- EndPointState localEpStatePtr = getStateForVersionBiggerThan(gDigest.getEndpoint(), maxRemoteVersion) ;
+ EndpointState localEpStatePtr = getStateForVersionBiggerThan(gDigest.getEndpoint(), maxRemoteVersion) ;
if ( localEpStatePtr != null )
deltaEpStateMap.put(gDigest.getEndpoint(), localEpStatePtr);
}
@@ -747,14 +747,14 @@ public class Gossiper implements IFailur
This method is used to figure the state that the Gossiper has but Gossipee doesn't. The delta digests
and the delta state are built up.
*/
- synchronized void examineGossiper(List<GossipDigest> gDigestList, List<GossipDigest> deltaGossipDigestList, Map<InetAddress, EndPointState> deltaEpStateMap)
+ synchronized void examineGossiper(List<GossipDigest> gDigestList, List<GossipDigest> deltaGossipDigestList, Map<InetAddress, EndpointState> deltaEpStateMap)
{
for ( GossipDigest gDigest : gDigestList )
{
int remoteGeneration = gDigest.getGeneration();
int maxRemoteVersion = gDigest.getMaxVersion();
/* Get state associated with the end point in digest */
- EndPointState epStatePtr = endpointStateMap_.get(gDigest.getEndpoint());
+ EndpointState epStatePtr = endpointStateMap_.get(gDigest.getEndpoint());
/*
Here we need to fire a GossipDigestAckMessage. If we have some data associated with this endpoint locally
then we follow the "if" path of the logic. If we have absolutely nothing for this endpoint we need to
@@ -823,11 +823,11 @@ public class Gossiper implements IFailur
}
/* initialize the heartbeat state for this localEndpoint */
- EndPointState localState = endpointStateMap_.get(localEndpoint_);
+ EndpointState localState = endpointStateMap_.get(localEndpoint_);
if ( localState == null )
{
HeartBeatState hbState = new HeartBeatState(generationNbr);
- localState = new EndPointState(hbState);
+ localState = new EndpointState(hbState);
localState.isAlive(true);
localState.isAGossiper(true);
endpointStateMap_.put(localEndpoint_, localState);
@@ -840,7 +840,7 @@ public class Gossiper implements IFailur
public synchronized void addLocalApplicationState(String key, ApplicationState appState)
{
assert !StorageService.instance.isClientMode();
- EndPointState epState = endpointStateMap_.get(localEndpoint_);
+ EndpointState epState = endpointStateMap_.get(localEndpoint_);
assert epState != null;
epState.addApplicationState(key, appState);
}
@@ -881,7 +881,7 @@ public class Gossiper implements IFailur
doSort(gDigestList);
List<GossipDigest> deltaGossipDigestList = new ArrayList<GossipDigest>();
- Map<InetAddress, EndPointState> deltaEpStateMap = new HashMap<InetAddress, EndPointState>();
+ Map<InetAddress, EndpointState> deltaEpStateMap = new HashMap<InetAddress, EndpointState>();
Gossiper.instance.examineGossiper(gDigestList, deltaGossipDigestList, deltaEpStateMap);
GossipDigestAckMessage gDigestAck = new GossipDigestAckMessage(deltaGossipDigestList, deltaEpStateMap);
@@ -920,7 +920,7 @@ public class Gossiper implements IFailur
for ( GossipDigest gDigest : gDigestList )
{
InetAddress ep = gDigest.getEndpoint();
- EndPointState epState = Gossiper.instance.getEndpointStateForEndpoint(ep);
+ EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(ep);
int version = (epState != null) ? Gossiper.instance.getMaxEndpointStateVersion( epState ) : 0;
int diffVersion = Math.abs(version - gDigest.getMaxVersion() );
diffDigests.add( new GossipDigest(ep, gDigest.getGeneration(), diffVersion) );
@@ -957,7 +957,7 @@ public class Gossiper implements IFailur
{
GossipDigestAckMessage gDigestAckMessage = GossipDigestAckMessage.serializer().deserialize(dis);
List<GossipDigest> gDigestList = gDigestAckMessage.getGossipDigestList();
- Map<InetAddress, EndPointState> epStateMap = gDigestAckMessage.getEndpointStateMap();
+ Map<InetAddress, EndpointState> epStateMap = gDigestAckMessage.getEndpointStateMap();
if ( epStateMap.size() > 0 )
{
@@ -967,11 +967,11 @@ public class Gossiper implements IFailur
}
/* Get the state required to send to this gossipee - construct GossipDigestAck2Message */
- Map<InetAddress, EndPointState> deltaEpStateMap = new HashMap<InetAddress, EndPointState>();
+ Map<InetAddress, EndpointState> deltaEpStateMap = new HashMap<InetAddress, EndpointState>();
for( GossipDigest gDigest : gDigestList )
{
InetAddress addr = gDigest.getEndpoint();
- EndPointState localEpStatePtr = Gossiper.instance.getStateForVersionBiggerThan(addr, gDigest.getMaxVersion());
+ EndpointState localEpStatePtr = Gossiper.instance.getStateForVersionBiggerThan(addr, gDigest.getMaxVersion());
if ( localEpStatePtr != null )
deltaEpStateMap.put(addr, localEpStatePtr);
}
@@ -1010,7 +1010,7 @@ public class Gossiper implements IFailur
{
throw new RuntimeException(e);
}
- Map<InetAddress, EndPointState> remoteEpStateMap = gDigestAck2Message.getEndpointStateMap();
+ Map<InetAddress, EndpointState> remoteEpStateMap = gDigestAck2Message.getEndpointStateMap();
/* Notify the Failure Detector */
Gossiper.instance.notifyFailureDetector(remoteEpStateMap);
Gossiper.instance.applyStateLocally(remoteEpStateMap);
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java Mon Apr 19 14:47:36 2010
@@ -23,17 +23,17 @@ package org.apache.cassandra.gms;
* Interested parties register/unregister interest by invoking the methods of this interface.
*/
-public interface IEndPointStateChangePublisher
+public interface IEndpointStateChangePublisher
{
/**
* Register for interesting state changes.
* @param subcriber module which implements the IEndPointStateChangeSubscriber
*/
- public void register(IEndPointStateChangeSubscriber subcriber);
+ public void register(IEndpointStateChangeSubscriber subcriber);
/**
* Unregister interest for state changes.
* @param subcriber module which implements the IEndPointStateChangeSubscriber
*/
- public void unregister(IEndPointStateChangeSubscriber subcriber);
+ public void unregister(IEndpointStateChangeSubscriber subcriber);
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java Mon Apr 19 14:47:36 2010
@@ -29,7 +29,7 @@ import java.net.InetAddress;
* in all state changes.
*/
-public interface IEndPointStateChangeSubscriber
+public interface IEndpointStateChangeSubscriber
{
/**
* Use to inform interested parties about the change in the state
@@ -38,11 +38,11 @@ public interface IEndPointStateChangeSub
* @param endpoint endpoint for which the state change occurred.
* @param epState state that actually changed for the above endpoint.
*/
- public void onJoin(InetAddress endpoint, EndPointState epState);
+ public void onJoin(InetAddress endpoint, EndpointState epState);
public void onChange(InetAddress endpoint, String stateName, ApplicationState state);
- public void onAlive(InetAddress endpoint, EndPointState state);
+ public void onAlive(InetAddress endpoint, EndpointState state);
- public void onDead(InetAddress endpoint, EndPointState state);
+ public void onDead(InetAddress endpoint, EndpointState state);
}
Copied: cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangePublisher.java (from r935594, cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangePublisher.java?p2=cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangePublisher.java&p1=cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java&r1=935594&r2=935601&rev=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangePublisher.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangePublisher.java Mon Apr 19 14:47:36 2010
@@ -23,17 +23,17 @@ package org.apache.cassandra.gms;
* Interested parties register/unregister interest by invoking the methods of this interface.
*/
-public interface IEndPointStateChangePublisher
+public interface IEndpointStateChangePublisher
{
/**
* Register for interesting state changes.
* @param subcriber module which implements the IEndPointStateChangeSubscriber
*/
- public void register(IEndPointStateChangeSubscriber subcriber);
+ public void register(IEndpointStateChangeSubscriber subcriber);
/**
* Unregister interest for state changes.
* @param subcriber module which implements the IEndPointStateChangeSubscriber
*/
- public void unregister(IEndPointStateChangeSubscriber subcriber);
+ public void unregister(IEndpointStateChangeSubscriber subcriber);
}
Copied: cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangeSubscriber.java (from r935594, cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangeSubscriber.java?p2=cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangeSubscriber.java&p1=cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java&r1=935594&r2=935601&rev=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/IEndpointStateChangeSubscriber.java Mon Apr 19 14:47:36 2010
@@ -29,7 +29,7 @@ import java.net.InetAddress;
* in all state changes.
*/
-public interface IEndPointStateChangeSubscriber
+public interface IEndpointStateChangeSubscriber
{
/**
* Use to inform interested parties about the change in the state
@@ -38,11 +38,11 @@ public interface IEndPointStateChangeSub
* @param endpoint endpoint for which the state change occurred.
* @param epState state that actually changed for the above endpoint.
*/
- public void onJoin(InetAddress endpoint, EndPointState epState);
+ public void onJoin(InetAddress endpoint, EndpointState epState);
public void onChange(InetAddress endpoint, String stateName, ApplicationState state);
- public void onAlive(InetAddress endpoint, EndPointState state);
+ public void onAlive(InetAddress endpoint, EndpointState state);
- public void onDead(InetAddress endpoint, EndPointState state);
+ public void onDead(InetAddress endpoint, EndpointState state);
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractEndpointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractEndpointSnitch.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractEndpointSnitch.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractEndpointSnitch.java Mon Apr 19 14:47:36 2010
@@ -30,7 +30,7 @@ import java.util.*;
* requests more efficiently (with "sortByProximity"). Of the abstract methods, isOnSameRack
* and isInSameDataCenter are always required; getLocation is only used by DatacenterShardStrategy.
*/
-public abstract class AbstractEndpointSnitch implements IEndPointSnitch
+public abstract class AbstractEndpointSnitch implements IEndpointSnitch
{
/**
* Determines if 2 nodes are in the same rack in the data center.
Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java Mon Apr 19 14:47:36 2010
@@ -30,7 +30,6 @@ import com.google.common.collect.Multima
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.gms.FailureDetector;
-import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.service.WriteResponseHandler;
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.cassandra.utils.FBUtilities;
@@ -45,9 +44,9 @@ public abstract class AbstractReplicatio
protected static final Logger logger_ = LoggerFactory.getLogger(AbstractReplicationStrategy.class);
private TokenMetadata tokenMetadata_;
- protected final IEndPointSnitch snitch_;
+ protected final IEndpointSnitch snitch_;
- AbstractReplicationStrategy(TokenMetadata tokenMetadata, IEndPointSnitch snitch)
+ AbstractReplicationStrategy(TokenMetadata tokenMetadata, IEndpointSnitch snitch)
{
tokenMetadata_ = tokenMetadata;
snitch_ = snitch;
@@ -79,7 +78,7 @@ public abstract class AbstractReplicatio
{
Multimap<InetAddress, InetAddress> map = HashMultimap.create(targets.size(), 1);
- IEndPointSnitch endpointSnitch = DatabaseDescriptor.getEndpointSnitch();
+ IEndpointSnitch endpointSnitch = DatabaseDescriptor.getEndpointSnitch();
// first, add the live endpoints
for (InetAddress ep : targets)
Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java Mon Apr 19 14:47:36 2010
@@ -41,7 +41,7 @@ import org.xml.sax.SAXException;
* EndPoints and also get details from the same.
*/
-public class DatacenterEndPointSnitch extends AbstractEndpointSnitch
+public class DatacenterEndpointSnitch extends AbstractEndpointSnitch
{
/**
* This Map will contain the information of the EndPoints and its Location
@@ -61,12 +61,12 @@ public class DatacenterEndPointSnitch ex
/**
* Reference to the logger.
*/
- private static Logger logger_ = LoggerFactory.getLogger(DatacenterEndPointSnitch.class);
+ private static Logger logger_ = LoggerFactory.getLogger(DatacenterEndpointSnitch.class);
/**
* Constructor, intialize XML config and read the config in...
*/
- public DatacenterEndPointSnitch() throws IOException, ParserConfigurationException, SAXException
+ public DatacenterEndpointSnitch() throws IOException, ParserConfigurationException, SAXException
{
xmlUtils = new XMLUtils(DEFAULT_RACK_CONFIG_FILE);
reloadConfiguration();
Copied: cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndpointSnitch.java (from r935594, cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndpointSnitch.java?p2=cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndpointSnitch.java&p1=cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java&r1=935594&r2=935601&rev=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndpointSnitch.java Mon Apr 19 14:47:36 2010
@@ -41,7 +41,7 @@ import org.xml.sax.SAXException;
* EndPoints and also get details from the same.
*/
-public class DatacenterEndPointSnitch extends AbstractEndpointSnitch
+public class DatacenterEndpointSnitch extends AbstractEndpointSnitch
{
/**
* This Map will contain the information of the EndPoints and its Location
@@ -61,12 +61,12 @@ public class DatacenterEndPointSnitch ex
/**
* Reference to the logger.
*/
- private static Logger logger_ = LoggerFactory.getLogger(DatacenterEndPointSnitch.class);
+ private static Logger logger_ = LoggerFactory.getLogger(DatacenterEndpointSnitch.class);
/**
* Constructor, intialize XML config and read the config in...
*/
- public DatacenterEndPointSnitch() throws IOException, ParserConfigurationException, SAXException
+ public DatacenterEndpointSnitch() throws IOException, ParserConfigurationException, SAXException
{
xmlUtils = new XMLUtils(DEFAULT_RACK_CONFIG_FILE);
reloadConfiguration();
Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java Mon Apr 19 14:47:36 2010
@@ -28,7 +28,6 @@ import java.net.UnknownHostException;
import java.util.*;
import java.util.Map.Entry;
-import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.*;
import org.apache.cassandra.thrift.ConsistencyLevel;
@@ -69,12 +68,12 @@ public class DatacenterShardStategy exte
private synchronized void loadEndpoints(TokenMetadata metadata) throws IOException
{
this.tokens = new ArrayList<Token>(metadata.sortedTokens());
- String localDC = ((DatacenterEndPointSnitch)snitch_).getLocation(InetAddress.getLocalHost());
+ String localDC = ((DatacenterEndpointSnitch)snitch_).getLocation(InetAddress.getLocalHost());
dcMap = new HashMap<String, List<Token>>();
for (Token token : this.tokens)
{
InetAddress endpoint = metadata.getEndpoint(token);
- String dataCenter = ((DatacenterEndPointSnitch)snitch_).getLocation(endpoint);
+ String dataCenter = ((DatacenterEndpointSnitch)snitch_).getLocation(endpoint);
if (dataCenter.equals(localDC))
{
localEndpoints.add(endpoint);
@@ -93,7 +92,7 @@ public class DatacenterShardStategy exte
Collections.sort(valueList);
dcMap.put(entry.getKey(), valueList);
}
- dcReplicationFactor = ((DatacenterEndPointSnitch)snitch_).getMapReplicationFactor();
+ dcReplicationFactor = ((DatacenterEndpointSnitch)snitch_).getMapReplicationFactor();
for (Entry<String, Integer> entry : dcReplicationFactor.entrySet())
{
String datacenter = entry.getKey();
@@ -106,11 +105,11 @@ public class DatacenterShardStategy exte
}
}
- public DatacenterShardStategy(TokenMetadata tokenMetadata, IEndPointSnitch snitch)
+ public DatacenterShardStategy(TokenMetadata tokenMetadata, IEndpointSnitch snitch)
throws UnknownHostException
{
super(tokenMetadata, snitch);
- if ((!(snitch instanceof DatacenterEndPointSnitch)))
+ if ((!(snitch instanceof DatacenterEndpointSnitch)))
{
throw new IllegalArgumentException("DatacenterShardStrategy requires DatacenterEndPointSnitch");
}
@@ -169,7 +168,7 @@ public class DatacenterShardStategy exte
// Now try to find one on a different rack
if (!bOtherRack)
{
- if (!((DatacenterEndPointSnitch)snitch_).isOnSameRack(primaryHost, endpointOfInterest))
+ if (!((DatacenterEndpointSnitch)snitch_).isOnSameRack(primaryHost, endpointOfInterest))
{
forloopReturn.add(metadata.getEndpoint(t));
bOtherRack = true;
Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java Mon Apr 19 14:47:36 2010
@@ -26,7 +26,7 @@ import java.util.*;
* A simple endpoint snitch implementation that assumes rack and dc information is encoded
* in the ip address.
*/
-public class EndPointSnitch extends AbstractEndpointSnitch
+public class EndpointSnitch extends AbstractEndpointSnitch
{
public boolean isOnSameRack(InetAddress host, InetAddress host2) throws UnknownHostException
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/locator/EndpointSnitch.java (from r935594, cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/EndpointSnitch.java?p2=cassandra/trunk/src/java/org/apache/cassandra/locator/EndpointSnitch.java&p1=cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java&r1=935594&r2=935601&rev=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/EndPointSnitch.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/EndpointSnitch.java Mon Apr 19 14:47:36 2010
@@ -26,7 +26,7 @@ import java.util.*;
* A simple endpoint snitch implementation that assumes rack and dc information is encoded
* in the ip address.
*/
-public class EndPointSnitch extends AbstractEndpointSnitch
+public class EndpointSnitch extends AbstractEndpointSnitch
{
public boolean isOnSameRack(InetAddress host, InetAddress host2) throws UnknownHostException
{
Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java Mon Apr 19 14:47:36 2010
@@ -34,7 +34,7 @@ import java.util.Collection;
* Not all methods will be germate to all implementations. Throw UnsupportedOperation as necessary.
*/
-public interface IEndPointSnitch
+public interface IEndpointSnitch
{
/**
* returns a new List<InetAddress> sorted by proximity to the given endpoint
Copied: cassandra/trunk/src/java/org/apache/cassandra/locator/IEndpointSnitch.java (from r935594, cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/IEndpointSnitch.java?p2=cassandra/trunk/src/java/org/apache/cassandra/locator/IEndpointSnitch.java&p1=cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java&r1=935594&r2=935601&rev=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/IEndPointSnitch.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/IEndpointSnitch.java Mon Apr 19 14:47:36 2010
@@ -34,7 +34,7 @@ import java.util.Collection;
* Not all methods will be germate to all implementations. Throw UnsupportedOperation as necessary.
*/
-public interface IEndPointSnitch
+public interface IEndpointSnitch
{
/**
* returns a new List<InetAddress> sorted by proximity to the given endpoint
Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java Mon Apr 19 14:47:36 2010
@@ -20,14 +20,12 @@ package org.apache.cassandra.locator;
import java.net.UnknownHostException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.Token;
import java.net.InetAddress;
-import org.apache.cassandra.service.StorageService;
/*
* This class returns the nodes responsible for a given
@@ -38,10 +36,10 @@ import org.apache.cassandra.service.Stor
*/
public class RackAwareStrategy extends AbstractReplicationStrategy
{
- public RackAwareStrategy(TokenMetadata tokenMetadata, IEndPointSnitch snitch)
+ public RackAwareStrategy(TokenMetadata tokenMetadata, IEndpointSnitch snitch)
{
super(tokenMetadata, snitch);
- if (!(snitch instanceof EndPointSnitch))
+ if (!(snitch instanceof EndpointSnitch))
throw new IllegalArgumentException(("RackAwareStrategy requires EndPointSnitch."));
}
@@ -66,7 +64,7 @@ public class RackAwareStrategy extends A
{
// First try to find one in a different data center
Token t = iter.next();
- if (!((EndPointSnitch)snitch_).isInSameDataCenter(metadata.getEndpoint(primaryToken), metadata.getEndpoint(t)))
+ if (!((EndpointSnitch)snitch_).isInSameDataCenter(metadata.getEndpoint(primaryToken), metadata.getEndpoint(t)))
{
// If we have already found something in a diff datacenter no need to find another
if (!bDataCenter)
@@ -77,8 +75,8 @@ public class RackAwareStrategy extends A
continue;
}
// Now try to find one on a different rack
- if (!((EndPointSnitch)snitch_).isOnSameRack(metadata.getEndpoint(primaryToken), metadata.getEndpoint(t)) &&
- ((EndPointSnitch)snitch_).isInSameDataCenter(metadata.getEndpoint(primaryToken), metadata.getEndpoint(t)))
+ if (!((EndpointSnitch)snitch_).isOnSameRack(metadata.getEndpoint(primaryToken), metadata.getEndpoint(t)) &&
+ ((EndpointSnitch)snitch_).isInSameDataCenter(metadata.getEndpoint(primaryToken), metadata.getEndpoint(t)))
{
// If we have already found something in a diff rack no need to find another
if (!bOtherRack)
Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java Mon Apr 19 14:47:36 2010
@@ -19,7 +19,6 @@
package org.apache.cassandra.locator;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -35,7 +34,7 @@ import java.net.InetAddress;
*/
public class RackUnawareStrategy extends AbstractReplicationStrategy
{
- public RackUnawareStrategy(TokenMetadata tokenMetadata, IEndPointSnitch snitch)
+ public RackUnawareStrategy(TokenMetadata tokenMetadata, IEndpointSnitch snitch)
{
super(tokenMetadata, snitch);
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java Mon Apr 19 14:47:36 2010
@@ -21,7 +21,7 @@ package org.apache.cassandra.net;
import java.io.*;
import java.net.InetAddress;
-public class CompactEndPointSerializationHelper
+public class CompactEndpointSerializationHelper
{
public static void serialize(InetAddress endpoint, DataOutputStream dos) throws IOException
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java (from r935594, cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java?p2=cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java&p1=cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java&r1=935594&r2=935601&rev=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java Mon Apr 19 14:47:36 2010
@@ -21,7 +21,7 @@ package org.apache.cassandra.net;
import java.io.*;
import java.net.InetAddress;
-public class CompactEndPointSerializationHelper
+public class CompactEndpointSerializationHelper
{
public static void serialize(InetAddress endpoint, DataOutputStream dos) throws IOException
{
Modified: cassandra/trunk/src/java/org/apache/cassandra/net/Header.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/Header.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/net/Header.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/net/Header.java Mon Apr 19 14:47:36 2010
@@ -27,7 +27,6 @@ import java.net.InetAddress;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.GuidGenerator;
public class Header
{
@@ -115,7 +114,7 @@ class HeaderSerializer implements ICompa
public void serialize(Header t, DataOutputStream dos) throws IOException
{
dos.writeUTF(t.getMessageId());
- CompactEndPointSerializationHelper.serialize(t.getFrom(), dos);
+ CompactEndpointSerializationHelper.serialize(t.getFrom(), dos);
dos.writeUTF(t.getMessageType());
dos.writeInt(t.getVerb().ordinal());
@@ -136,7 +135,7 @@ class HeaderSerializer implements ICompa
public Header deserialize(DataInputStream dis) throws IOException
{
String id = dis.readUTF();
- InetAddress from = CompactEndPointSerializationHelper.deserialize(dis);
+ InetAddress from = CompactEndpointSerializationHelper.deserialize(dis);
String type = dis.readUTF();
int verbOrdinal = dis.readInt();
Modified: cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java Mon Apr 19 14:47:36 2010
@@ -29,9 +29,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.locator.DatacenterEndpointSnitch;
import org.apache.cassandra.net.Message;
-import org.apache.cassandra.locator.IEndPointSnitch;
-import org.apache.cassandra.locator.DatacenterEndPointSnitch;
/**
* This class will block for the replication factor which is
@@ -42,14 +41,14 @@ public class DatacenterSyncWriteResponse
{
private final Map<String, Integer> dcResponses = new HashMap<String, Integer>();
private final Map<String, Integer> responseCounts;
- private final DatacenterEndPointSnitch endpointSnitch;
+ private final DatacenterEndpointSnitch endpointSnitch;
public DatacenterSyncWriteResponseHandler(Map<String, Integer> responseCounts, String table)
{
// Response is been managed by the map so make it 1 for the superclass.
super(1, table);
this.responseCounts = responseCounts;
- endpointSnitch = (DatacenterEndPointSnitch) DatabaseDescriptor.getEndpointSnitch();
+ endpointSnitch = (DatacenterEndpointSnitch) DatabaseDescriptor.getEndpointSnitch();
}
@Override
Modified: cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java Mon Apr 19 14:47:36 2010
@@ -29,8 +29,7 @@ import java.net.UnknownHostException;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.locator.IEndPointSnitch;
-import org.apache.cassandra.locator.DatacenterEndPointSnitch;
+import org.apache.cassandra.locator.DatacenterEndpointSnitch;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.utils.FBUtilities;
@@ -42,7 +41,7 @@ import org.apache.cassandra.utils.FBUtil
public class DatacenterWriteResponseHandler extends WriteResponseHandler
{
private final AtomicInteger blockFor;
- private final DatacenterEndPointSnitch endpointsnitch;
+ private final DatacenterEndpointSnitch endpointsnitch;
private final InetAddress localEndpoint;
public DatacenterWriteResponseHandler(int blockFor, String table)
@@ -50,7 +49,7 @@ public class DatacenterWriteResponseHand
// Response is been managed by the map so the waitlist size really doesnt matter.
super(blockFor, table);
this.blockFor = new AtomicInteger(blockFor);
- endpointsnitch = (DatacenterEndPointSnitch) DatabaseDescriptor.getEndpointSnitch();
+ endpointsnitch = (DatacenterEndpointSnitch) DatabaseDescriptor.getEndpointSnitch();
localEndpoint = FBUtilities.getLocalAddress();
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java Mon Apr 19 14:47:36 2010
@@ -24,8 +24,8 @@ import org.apache.cassandra.db.Column;
import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.migration.Migration;
import org.apache.cassandra.gms.ApplicationState;
-import org.apache.cassandra.gms.EndPointState;
-import org.apache.cassandra.gms.IEndPointStateChangeSubscriber;
+import org.apache.cassandra.gms.EndpointState;
+import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.FBUtilities;
@@ -45,13 +45,13 @@ import java.util.Collections;
import java.util.Set;
import java.util.UUID;
-public class MigrationManager implements IEndPointStateChangeSubscriber
+public class MigrationManager implements IEndpointStateChangeSubscriber
{
public static final String MIGRATION_STATE = "MIGRATION";
private static final Logger logger = LoggerFactory.getLogger(MigrationManager.class);
/** I'm not going to act here. */
- public void onJoin(InetAddress endpoint, EndPointState epState) { }
+ public void onJoin(InetAddress endpoint, EndpointState epState) { }
public void onChange(InetAddress endpoint, String stateName, ApplicationState state)
{
@@ -62,7 +62,7 @@ public class MigrationManager implements
}
/** gets called after a this node joins a cluster */
- public void onAlive(InetAddress endpoint, EndPointState state)
+ public void onAlive(InetAddress endpoint, EndpointState state)
{
ApplicationState appState = state.getApplicationState(MIGRATION_STATE);
if (appState != null)
@@ -72,7 +72,7 @@ public class MigrationManager implements
}
}
- public void onDead(InetAddress endpoint, EndPointState state) { }
+ public void onDead(InetAddress endpoint, EndpointState state) { }
/** will either push or pull an updating depending on who is behind. */
public static void rectify(UUID theirVersion, InetAddress endpoint)
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=935601&r1=935600&r2=935601&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:47:36 2010
@@ -22,15 +22,15 @@ import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.cassandra.gms.EndpointState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.gms.ApplicationState;
-import org.apache.cassandra.gms.EndPointState;
import org.apache.cassandra.gms.Gossiper;
-import org.apache.cassandra.gms.IEndPointStateChangeSubscriber;
+import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
import java.net.InetAddress;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
@@ -47,7 +47,7 @@ import org.apache.cassandra.utils.FBUtil
* keys at an Endpoint. Monitor load information for a 5 minute
* interval and then do load balancing operations if necessary.
*/
-public class StorageLoadBalancer implements IEndPointStateChangeSubscriber
+public class StorageLoadBalancer implements IEndpointStateChangeSubscriber
{
class LoadBalancer implements Runnable
{
@@ -211,7 +211,7 @@ public class StorageLoadBalancer impleme
*/
}
- public void onJoin(InetAddress endpoint, EndPointState epState)
+ public void onJoin(InetAddress endpoint, EndpointState epState)
{
ApplicationState loadState = epState.getApplicationState(LoadDisseminator.loadInfo_);
if (loadState != null)
@@ -220,9 +220,9 @@ public class StorageLoadBalancer impleme
}
}
- public void onAlive(InetAddress endpoint, EndPointState state) {}
+ public void onAlive(InetAddress endpoint, EndpointState state) {}
- public void onDead(InetAddress endpoint, EndPointState state) {}
+ public void onDead(InetAddress endpoint, EndpointState state) {}
/*
private boolean isMoveable()
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=935601&r1=935600&r2=935601&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:47:36 2010
@@ -51,7 +51,6 @@ import org.apache.cassandra.streaming.*;
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.cassandra.thrift.UnavailableException;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.cassandra.io.util.FileUtils;
@@ -70,7 +69,7 @@ import com.google.common.collect.HashMul
* This class will also maintain histograms of the load information
* of other nodes in the cluster.
*/
-public class StorageService implements IEndPointStateChangeSubscriber, StorageServiceMBean
+public class StorageService implements IEndpointStateChangeSubscriber, StorageServiceMBean
{
private static Logger logger_ = LoggerFactory.getLogger(StorageService.class);
@@ -270,7 +269,7 @@ public class StorageService implements I
Class<? extends AbstractReplicationStrategy> cls = DatabaseDescriptor.getReplicaPlacementStrategyClass(table);
if (cls == null)
throw new RuntimeException(String.format("No replica strategy configured for %s", table));
- Class [] parameterTypes = new Class[] { TokenMetadata.class, IEndPointSnitch.class};
+ Class [] parameterTypes = new Class[] { TokenMetadata.class, IEndpointSnitch.class};
try
{
Constructor<? extends AbstractReplicationStrategy> constructor = cls.getConstructor(parameterTypes);
@@ -874,7 +873,7 @@ public class StorageService implements I
return changedRanges;
}
- public void onJoin(InetAddress endpoint, EndPointState epState)
+ public void onJoin(InetAddress endpoint, EndpointState epState)
{
for (Map.Entry<String,ApplicationState> entry : epState.getSortedApplicationStates())
{
@@ -882,13 +881,13 @@ public class StorageService implements I
}
}
- public void onAlive(InetAddress endpoint, EndPointState state)
+ public void onAlive(InetAddress endpoint, EndpointState state)
{
if (!isClientMode)
deliverHints(endpoint);
}
- public void onDead(InetAddress endpoint, EndPointState state) {}
+ public void onDead(InetAddress endpoint, EndpointState state) {}
/** raw load value */
public double getLoad()
Modified: cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestMetadata.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestMetadata.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestMetadata.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestMetadata.java Mon Apr 19 14:47:36 2010
@@ -32,7 +32,7 @@ import java.util.List;
import org.apache.cassandra.dht.AbstractBounds;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.ICompactSerializer;
-import org.apache.cassandra.net.CompactEndPointSerializationHelper;
+import org.apache.cassandra.net.CompactEndpointSerializationHelper;
/**
* This encapsulates information of the list of ranges that a target
@@ -84,7 +84,7 @@ class StreamRequestMetadataSerializer im
{
public void serialize(StreamRequestMetadata srMetadata, DataOutputStream dos) throws IOException
{
- CompactEndPointSerializationHelper.serialize(srMetadata.target_, dos);
+ CompactEndpointSerializationHelper.serialize(srMetadata.target_, dos);
dos.writeUTF(srMetadata.table_);
dos.writeInt(srMetadata.ranges_.size());
for (Range range : srMetadata.ranges_)
@@ -95,7 +95,7 @@ class StreamRequestMetadataSerializer im
public StreamRequestMetadata deserialize(DataInputStream dis) throws IOException
{
- InetAddress target = CompactEndPointSerializationHelper.deserialize(dis);
+ InetAddress target = CompactEndpointSerializationHelper.deserialize(dis);
String table = dis.readUTF();
int size = dis.readInt();
List<Range> ranges = (size == 0) ? null : new ArrayList<Range>();
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=935601&r1=935600&r2=935601&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:47:36 2010
@@ -20,13 +20,11 @@ package org.apache.cassandra.thrift;
import java.io.IOException;
import java.util.*;
-import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.config.KSMetaData;
-import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.migration.AddColumnFamily;
import org.apache.cassandra.db.migration.AddKeyspace;
import org.apache.cassandra.db.migration.DropColumnFamily;
@@ -34,7 +32,6 @@ import org.apache.cassandra.db.migration
import org.apache.cassandra.db.migration.RenameColumnFamily;
import org.apache.cassandra.db.migration.RenameKeyspace;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
-import org.apache.cassandra.locator.IEndPointSnitch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.lang.ArrayUtils;
@@ -52,7 +49,6 @@ import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
-import static org.apache.cassandra.utils.FBUtilities.UTF8;
import org.apache.thrift.TException;
public class CassandraServer implements Cassandra.Iface
Modified: cassandra/trunk/test/conf/cassandra.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/conf/cassandra.xml?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/test/conf/cassandra.xml (original)
+++ cassandra/trunk/test/conf/cassandra.xml Mon Apr 19 14:47:36 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"/>
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java?rev=935601&r1=935600&r2=935601&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java Mon Apr 19 14:47:36 2010
@@ -26,10 +26,8 @@ import org.apache.cassandra.config.Confi
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.filter.NamesQueryFilter;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
-import org.apache.cassandra.db.filter.SliceQueryFilter;
import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.db.migration.AddColumnFamily;
import org.apache.cassandra.db.migration.AddKeyspace;
@@ -38,12 +36,11 @@ import org.apache.cassandra.db.migration
import org.apache.cassandra.db.migration.Migration;
import org.apache.cassandra.db.migration.RenameColumnFamily;
import org.apache.cassandra.db.migration.RenameKeyspace;
-import org.apache.cassandra.locator.EndPointSnitch;
import org.apache.cassandra.locator.RackAwareStrategy;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.utils.UUIDGen;
-import org.junit.Before;
+
import org.junit.Test;
import java.io.ByteArrayInputStream;