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/01/21 22:23:14 UTC
svn commit: r901860 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra: db/ dht/ gms/ io/
net/ net/io/ service/
Author: jbellis
Date: Thu Jan 21 21:23:13 2010
New Revision: 901860
URL: http://svn.apache.org/viewvc?rev=901860&view=rev
Log:
convert verbs to enums
patch by jbellis; reviewed by Stu Hood for CASSANDRA-717
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationMessage.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/StreamInitiateMessage.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/StreamRequestMessage.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Header.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Message.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/StreamContextManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java Thu Jan 21 21:23:13 2010
@@ -101,7 +101,7 @@
serializer.serialize(this, dob);
return new Message(FBUtilities.getLocalAddress(),
StageManager.READ_STAGE,
- StorageService.rangeSliceVerbHandler_,
+ StorageService.Verb.RANGE_SLICE,
Arrays.copyOf(dob.getData(), dob.getLength()));
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java Thu Jan 21 21:23:13 2010
@@ -54,7 +54,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
ReadCommand.serializer().serialize(this, dos);
- return new Message(FBUtilities.getLocalAddress(), StageManager.READ_STAGE, StorageService.readVerbHandler_, bos.toByteArray());
+ return new Message(FBUtilities.getLocalAddress(), StageManager.READ_STAGE, StorageService.Verb.READ, bos.toByteArray());
}
public final QueryPath queryPath;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java Thu Jan 21 21:23:13 2010
@@ -211,7 +211,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
serializer().serialize(this, dos);
- return new Message(FBUtilities.getLocalAddress(), StageManager.MUTATION_STAGE, StorageService.mutationVerbHandler_, bos.toByteArray());
+ return new Message(FBUtilities.getLocalAddress(), StageManager.MUTATION_STAGE, StorageService.Verb.MUTATION, bos.toByteArray());
}
public static RowMutation getRowMutationFromMutations(String keyspace, String key, Map<String, List<Mutation>> cfmap)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationMessage.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationMessage.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationMessage.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationMessage.java Thu Jan 21 21:23:13 2010
@@ -43,15 +43,15 @@
public Message makeRowMutationMessage() throws IOException
{
- return makeRowMutationMessage(StorageService.mutationVerbHandler_);
+ return makeRowMutationMessage(StorageService.Verb.MUTATION);
}
- public Message makeRowMutationMessage(String verbHandlerName) throws IOException
+ public Message makeRowMutationMessage(StorageService.Verb verb) throws IOException
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream( bos );
RowMutationMessage.serializer().serialize(this, dos);
- return new Message(FBUtilities.getLocalAddress(), StageManager.MUTATION_STAGE, verbHandlerName, bos.toByteArray());
+ return new Message(FBUtilities.getLocalAddress(), StageManager.MUTATION_STAGE, verb, bos.toByteArray());
}
@XmlElement(name="RowMutation")
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java Thu Jan 21 21:23:13 2010
@@ -180,7 +180,7 @@
private static Token<?> getBootstrapTokenFrom(InetAddress maxEndpoint)
{
- Message message = new Message(FBUtilities.getLocalAddress(), "", StorageService.bootstrapTokenVerbHandler_, ArrayUtils.EMPTY_BYTE_ARRAY);
+ Message message = new Message(FBUtilities.getLocalAddress(), "", StorageService.Verb.BOOTSTRAP_TOKEN, ArrayUtils.EMPTY_BYTE_ARRAY);
BootstrapTokenCallback btc = new BootstrapTokenCallback();
MessagingService.instance.sendRR(message, maxEndpoint, btc);
return btc.getToken();
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/StreamInitiateMessage.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/StreamInitiateMessage.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/StreamInitiateMessage.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/StreamInitiateMessage.java Thu Jan 21 21:23:13 2010
@@ -48,7 +48,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream( bos );
StreamInitiateMessage.serializer().serialize(biMessage, dos);
- return new Message(FBUtilities.getLocalAddress(), "", StorageService.streamInitiateVerbHandler_, bos.toByteArray() );
+ return new Message(FBUtilities.getLocalAddress(), "", StorageService.Verb.STREAM_INITIATE, bos.toByteArray() );
}
protected StreamContextManager.StreamContext[] streamContexts_ = new StreamContextManager.StreamContext[0];
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Thu Jan 21 21:23:13 2010
@@ -259,7 +259,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream(Gossiper.MAX_GOSSIP_PACKET_SIZE);
DataOutputStream dos = new DataOutputStream( bos );
GossipDigestSynMessage.serializer().serialize(gDigestMessage, dos);
- return new Message(localEndPoint_, StageManager.GOSSIP_STAGE, StorageService.GOSSIP_DIGEST_SYN_VERB, bos.toByteArray());
+ return new Message(localEndPoint_, StageManager.GOSSIP_STAGE, StorageService.Verb.GOSSIP_DIGEST_SYN, bos.toByteArray());
}
Message makeGossipDigestAckMessage(GossipDigestAckMessage gDigestAckMessage) throws IOException
@@ -269,7 +269,7 @@
GossipDigestAckMessage.serializer().serialize(gDigestAckMessage, dos);
if (logger_.isTraceEnabled())
logger_.trace("@@@@ Size of GossipDigestAckMessage is " + bos.toByteArray().length);
- return new Message(localEndPoint_, StageManager.GOSSIP_STAGE, StorageService.GOSSIP_DIGEST_ACK_VERB, bos.toByteArray());
+ return new Message(localEndPoint_, StageManager.GOSSIP_STAGE, StorageService.Verb.GOSSIP_DIGEST_ACK, bos.toByteArray());
}
Message makeGossipDigestAck2Message(GossipDigestAck2Message gDigestAck2Message) throws IOException
@@ -277,7 +277,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream(Gossiper.MAX_GOSSIP_PACKET_SIZE);
DataOutputStream dos = new DataOutputStream(bos);
GossipDigestAck2Message.serializer().serialize(gDigestAck2Message, dos);
- return new Message(localEndPoint_, StageManager.GOSSIP_STAGE, StorageService.GOSSIP_DIGEST_ACK2_VERB, bos.toByteArray());
+ return new Message(localEndPoint_, StageManager.GOSSIP_STAGE, StorageService.Verb.GOSSIP_DIGEST_ACK2, bos.toByteArray());
}
/**
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/StreamRequestMessage.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/StreamRequestMessage.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/StreamRequestMessage.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/StreamRequestMessage.java Thu Jan 21 21:23:13 2010
@@ -55,7 +55,7 @@
{
throw new IOError(e);
}
- return new Message(FBUtilities.getLocalAddress(), StageManager.STREAM_STAGE, StorageService.streamRequestVerbHandler_, bos.toByteArray() );
+ return new Message(FBUtilities.getLocalAddress(), StageManager.STREAM_STAGE, StorageService.Verb.STREAM_REQUEST, bos.toByteArray() );
}
protected StreamRequestMetadata[] streamRequestMetadata_ = new StreamRequestMetadata[0];
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java Thu Jan 21 21:23:13 2010
@@ -201,7 +201,7 @@
StreamContextManager.registerStreamCompletionHandler(message.getFrom(), new StreamCompletionHandler());
if (logger.isDebugEnabled())
logger.debug("Sending a stream initiate done message ...");
- Message doneMessage = new Message(FBUtilities.getLocalAddress(), "", StorageService.streamInitiateDoneVerbHandler_, new byte[0] );
+ Message doneMessage = new Message(FBUtilities.getLocalAddress(), "", StorageService.Verb.STREAM_INITIATE_DONE, new byte[0] );
MessagingService.instance.sendOneWay(doneMessage, message.getFrom());
}
catch (IOException ex)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Header.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Header.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Header.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Header.java Thu Jan 21 21:23:13 2010
@@ -26,6 +26,7 @@
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
@@ -45,11 +46,11 @@
private InetAddress from_;
private String type_;
- private String verb_;
+ private StorageService.Verb verb_;
private String messageId_;
protected Map<String, byte[]> details_ = new Hashtable<String, byte[]>();
- Header(String id, InetAddress from, String messageType, String verb)
+ Header(String id, InetAddress from, String messageType, StorageService.Verb verb)
{
assert id != null;
assert from != null;
@@ -62,13 +63,13 @@
verb_ = verb;
}
- Header(String id, InetAddress from, String messageType, String verb, Map<String, byte[]> details)
+ Header(String id, InetAddress from, String messageType, StorageService.Verb verb, Map<String, byte[]> details)
{
this(id, from, messageType, verb);
details_ = details;
}
- Header(InetAddress from, String messageType, String verb)
+ Header(InetAddress from, String messageType, StorageService.Verb verb)
{
this(Integer.toString(idGen_.incrementAndGet()), from, messageType, verb);
}
@@ -83,7 +84,7 @@
return type_;
}
- String getVerb()
+ StorageService.Verb getVerb()
{
return verb_;
}
@@ -103,7 +104,7 @@
type_ = type;
}
- void setMessageVerb(String verb)
+ void setMessageVerb(StorageService.Verb verb)
{
verb_ = verb;
}
@@ -136,7 +137,7 @@
dos.writeUTF(t.getMessageId());
CompactEndPointSerializationHelper.serialize(t.getFrom(), dos);
dos.writeUTF(t.getMessageType());
- dos.writeUTF( t.getVerb() );
+ dos.writeInt(t.getVerb().ordinal());
/* Serialize the message header */
int size = t.details_.size();
@@ -157,7 +158,7 @@
String id = dis.readUTF();
InetAddress from = CompactEndPointSerializationHelper.deserialize(dis);
String type = dis.readUTF();
- String verb = dis.readUTF();
+ int verbOrdinal = dis.readInt();
/* Deserializing the message header */
int size = dis.readInt();
@@ -171,7 +172,7 @@
details.put(key, bytes);
}
- return new Header(id, from, type, verb, details);
+ return new Header(id, from, type, StorageService.VERBS[verbOrdinal], details);
}
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Message.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Message.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Message.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Message.java Thu Jan 21 21:23:13 2010
@@ -54,7 +54,7 @@
body_ = body;
}
- public Message(InetAddress from, String messageType, String verb, byte[] body)
+ public Message(InetAddress from, String messageType, StorageService.Verb verb, byte[] body)
{
this(new Header(from, messageType, verb), body);
}
@@ -64,21 +64,6 @@
return header_.getDetail(key);
}
- public void removeHeader(Object key)
- {
- header_.removeDetail(key);
- }
-
- public void setMessageType(String type)
- {
- header_.setMessageType(type);
- }
-
- public void setMessageVerb(String verb)
- {
- header_.setMessageVerb(verb);
- }
-
public void addHeader(String key, byte[] value)
{
header_.addDetail(key, value);
@@ -104,7 +89,7 @@
return header_.getMessageType();
}
- public String getVerb()
+ public StorageService.Verb getVerb()
{
return header_.getVerb();
}
@@ -122,7 +107,7 @@
// TODO should take byte[] + length so we don't have to copy to a byte[] of exactly the right len
public Message getReply(InetAddress from, byte[] args)
{
- Header header = new Header(getMessageId(), from, StageManager.RESPONSE_STAGE, StorageService.responseVerbHandler_);
+ Header header = new Header(getMessageId(), from, StageManager.RESPONSE_STAGE, StorageService.Verb.READ_RESPONSE);
return new Message(header, args);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java Thu Jan 21 21:23:13 2010
@@ -20,6 +20,8 @@
import org.apache.log4j.Logger;
+import org.apache.cassandra.service.StorageService;
+
public class MessageDeliveryTask implements Runnable
{
private Message message_;
@@ -32,7 +34,7 @@
public void run()
{
- String verb = message_.getVerb();
+ StorageService.Verb verb = message_.getVerb();
IVerbHandler verbHandler = MessagingService.instance.getVerbHandler(verb);
assert verbHandler != null : "unknown verb " + verb;
verbHandler.doVerb(message_);
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Thu Jan 21 21:23:13 2010
@@ -25,6 +25,7 @@
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.net.io.SerializerType;
import org.apache.cassandra.net.sink.SinkManager;
+import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.*;
import org.cliffc.high_scale_lib.NonBlockingHashMap;
@@ -59,7 +60,7 @@
private static ExpiringMap<String, IAsyncResult> taskCompletionMap_;
/* Lookup table for registering message handlers based on the verb. */
- private static Map<String, IVerbHandler> verbHandlers_;
+ private static Map<StorageService.Verb, IVerbHandler> verbHandlers_;
/* Thread pool to handle deserialization of messages read from the socket. */
private static ExecutorService messageDeserializerExecutor_;
@@ -86,7 +87,7 @@
protected MessagingService()
{
- verbHandlers_ = new HashMap<String, IVerbHandler>();
+ verbHandlers_ = new HashMap<StorageService.Verb, IVerbHandler>();
/*
* Leave callbacks in the cachetable long enough that any related messages will arrive
* before the callback is evicted from the table. The concurrency level is set at 128
@@ -179,13 +180,13 @@
/**
* Register a verb and the corresponding verb handler with the
* Messaging Service.
- * @param type name of the verb.
+ * @param verb
* @param verbHandler handler for the specified verb
*/
- public void registerVerbHandlers(String type, IVerbHandler verbHandler)
+ public void registerVerbHandlers(StorageService.Verb verb, IVerbHandler verbHandler)
{
- assert !verbHandlers_.containsKey(type);
- verbHandlers_.put(type, verbHandler);
+ assert !verbHandlers_.containsKey(verb);
+ verbHandlers_.put(verb, verbHandler);
}
/**
@@ -194,7 +195,7 @@
* @param type for which the verb handler is sought
* @return a reference to IVerbHandler which is the handler for the specified verb
*/
- public IVerbHandler getVerbHandler(String type)
+ public IVerbHandler getVerbHandler(StorageService.Verb type)
{
return verbHandlers_.get(type);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/StreamContextManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/StreamContextManager.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/StreamContextManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/StreamContextManager.java Thu Jan 21 21:23:13 2010
@@ -219,7 +219,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream( bos );
StreamStatusMessage.serializer().serialize(streamStatusMessage, dos);
- return new Message(FBUtilities.getLocalAddress(), "", StorageService.streamFinishedVerbHandler_, bos.toByteArray());
+ return new Message(FBUtilities.getLocalAddress(), "", StorageService.Verb.STREAM_FINISHED, bos.toByteArray());
}
protected StreamContextManager.StreamStatus streamStatus_;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java Thu Jan 21 21:23:13 2010
@@ -657,7 +657,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
SERIALIZER.serialize(new CFPair(table, cf), dos);
- return new Message(FBUtilities.getLocalAddress(), StageManager.AE_SERVICE_STAGE, StorageService.TREE_REQUEST_VERB, bos.toByteArray());
+ return new Message(FBUtilities.getLocalAddress(), StageManager.AE_SERVICE_STAGE, StorageService.Verb.TREE_REQUEST, bos.toByteArray());
}
catch(IOException e)
{
@@ -715,7 +715,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
SERIALIZER.serialize(validator, dos);
- return new Message(local, StageManager.AE_SERVICE_STAGE, StorageService.TREE_RESPONSE_VERB, bos.toByteArray());
+ return new Message(local, StageManager.AE_SERVICE_STAGE, StorageService.Verb.TREE_RESPONSE, bos.toByteArray());
}
catch(IOException e)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java Thu Jan 21 21:23:13 2010
@@ -93,7 +93,7 @@
{
try
{
- Message message = rowMutationMessage.makeRowMutationMessage(StorageService.readRepairVerbHandler_);
+ Message message = rowMutationMessage.makeRowMutationMessage(StorageService.Verb.READ_REPAIR);
String key = target.getHostAddress() + ":" + message.getMessageId();
readRepairTable_.put(key, message);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java Thu Jan 21 21:23:13 2010
@@ -169,7 +169,6 @@
public static final StorageLoadBalancer instance = new StorageLoadBalancer();
private static final Logger logger_ = Logger.getLogger(StorageLoadBalancer.class);
- private static final String moveMessageVerbHandler_ = "MOVE-MESSAGE-VERB-HANDLER";
/* time to delay in minutes the actual load balance procedure if heavily loaded */
private static final int delay_ = 5;
/* If a node's load is this factor more than the average, it is considered Heavy */
@@ -190,7 +189,6 @@
private StorageLoadBalancer()
{
- MessagingService.instance.registerVerbHandlers(StorageLoadBalancer.moveMessageVerbHandler_, new MoveMessageVerbHandler());
Gossiper.instance.register(this);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=901860&r1=901859&r2=901860&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Thu Jan 21 21:23:13 2010
@@ -75,27 +75,28 @@
public final static String LEFT_NORMALLY = "left";
/* All verb handler identifiers */
- public final static String mutationVerbHandler_ = "ROW-MUTATION-VERB-HANDLER";
- public final static String binaryVerbHandler_ = "BINARY-VERB-HANDLER";
- public final static String readRepairVerbHandler_ = "READ-REPAIR-VERB-HANDLER";
- public final static String readVerbHandler_ = "ROW-READ-VERB-HANDLER";
- public final static String streamInitiateVerbHandler_ = "BOOTSTRAP-INITIATE-VERB-HANDLER";
- public final static String streamInitiateDoneVerbHandler_ = "BOOTSTRAP-INITIATE-DONE-VERB-HANDLER";
- public final static String streamFinishedVerbHandler_ = "BOOTSTRAP-TERMINATE-VERB-HANDLER";
- public final static String streamRequestVerbHandler_ = "BS-METADATA-VERB-HANDLER";
- public final static String rangeSliceVerbHandler_ = "RANGE-SLICE-VERB-HANDLER";
- public final static String bootstrapTokenVerbHandler_ = "SPLITS-VERB-HANDLER";
- public final static String TREE_REQUEST_VERB = "TREE-REQUEST-VERB";
- public final static String TREE_RESPONSE_VERB = "TREE-RESPONSE-VERB";
- public static final String responseVerbHandler_ = "RESPONSE";
- /* GSV - abbreviation for GOSSIP-DIGEST-SYN-VERB */
- public final static String JOIN_VERB = "JVH";
- /* GSV - abbreviation for GOSSIP-DIGEST-SYN-VERB */
- public final static String GOSSIP_DIGEST_SYN_VERB = "GSV";
- /* GAV - abbreviation for GOSSIP-DIGEST-ACK-VERB */
- public final static String GOSSIP_DIGEST_ACK_VERB = "GAV";
- /* GA2V - abbreviation for GOSSIP-DIGEST-ACK2-VERB */
- public final static String GOSSIP_DIGEST_ACK2_VERB = "GA2V";
+ public enum Verb
+ {
+ MUTATION,
+ BINARY,
+ READ_REPAIR,
+ READ,
+ READ_RESPONSE,
+ STREAM_INITIATE,
+ STREAM_INITIATE_DONE,
+ STREAM_FINISHED,
+ STREAM_REQUEST,
+ RANGE_SLICE,
+ BOOTSTRAP_TOKEN,
+ TREE_REQUEST,
+ TREE_RESPONSE,
+ JOIN,
+ GOSSIP_DIGEST_SYN,
+ GOSSIP_DIGEST_ACK,
+ GOSSIP_DIGEST_ACK2,
+ // remember to add new verbs at the end, since we serialize by ordinal
+ }
+ public static final Verb[] VERBS = Verb.values();
private static IPartitioner partitioner_ = DatabaseDescriptor.getPartitioner();
@@ -199,25 +200,25 @@
endPointSnitch_ = DatabaseDescriptor.getEndPointSnitch();
/* register the verb handlers */
- MessagingService.instance.registerVerbHandlers(binaryVerbHandler_, new BinaryVerbHandler());
- MessagingService.instance.registerVerbHandlers(mutationVerbHandler_, new RowMutationVerbHandler());
- MessagingService.instance.registerVerbHandlers(readRepairVerbHandler_, new ReadRepairVerbHandler());
- MessagingService.instance.registerVerbHandlers(readVerbHandler_, new ReadVerbHandler());
- MessagingService.instance.registerVerbHandlers(rangeSliceVerbHandler_, new RangeSliceVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.BINARY, new BinaryVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.MUTATION, new RowMutationVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.READ_REPAIR, new ReadRepairVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.READ, new ReadVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.RANGE_SLICE, new RangeSliceVerbHandler());
// see BootStrapper for a summary of how the bootstrap verbs interact
- MessagingService.instance.registerVerbHandlers(bootstrapTokenVerbHandler_, new BootStrapper.BootstrapTokenVerbHandler());
- MessagingService.instance.registerVerbHandlers(streamRequestVerbHandler_, new StreamRequestVerbHandler() );
- MessagingService.instance.registerVerbHandlers(streamInitiateVerbHandler_, new Streaming.StreamInitiateVerbHandler());
- MessagingService.instance.registerVerbHandlers(streamInitiateDoneVerbHandler_, new Streaming.StreamInitiateDoneVerbHandler());
- MessagingService.instance.registerVerbHandlers(streamFinishedVerbHandler_, new Streaming.StreamFinishedVerbHandler());
- MessagingService.instance.registerVerbHandlers(responseVerbHandler_, new ResponseVerbHandler());
- MessagingService.instance.registerVerbHandlers(TREE_REQUEST_VERB, new TreeRequestVerbHandler());
- MessagingService.instance.registerVerbHandlers(TREE_RESPONSE_VERB, new AntiEntropyService.TreeResponseVerbHandler());
-
- MessagingService.instance.registerVerbHandlers(JOIN_VERB, new Gossiper.JoinVerbHandler());
- MessagingService.instance.registerVerbHandlers(GOSSIP_DIGEST_SYN_VERB, new Gossiper.GossipDigestSynVerbHandler());
- MessagingService.instance.registerVerbHandlers(GOSSIP_DIGEST_ACK_VERB, new Gossiper.GossipDigestAckVerbHandler());
- MessagingService.instance.registerVerbHandlers(GOSSIP_DIGEST_ACK2_VERB, new Gossiper.GossipDigestAck2VerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.BOOTSTRAP_TOKEN, new BootStrapper.BootstrapTokenVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.STREAM_REQUEST, new StreamRequestVerbHandler() );
+ MessagingService.instance.registerVerbHandlers(Verb.STREAM_INITIATE, new Streaming.StreamInitiateVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.STREAM_INITIATE_DONE, new Streaming.StreamInitiateDoneVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.STREAM_FINISHED, new Streaming.StreamFinishedVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.READ_RESPONSE, new ResponseVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.TREE_REQUEST, new TreeRequestVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.TREE_RESPONSE, new AntiEntropyService.TreeResponseVerbHandler());
+
+ MessagingService.instance.registerVerbHandlers(Verb.JOIN, new Gossiper.JoinVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_SYN, new Gossiper.GossipDigestSynVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_ACK, new Gossiper.GossipDigestAckVerbHandler());
+ MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_ACK2, new Gossiper.GossipDigestAck2VerbHandler());
replicationStrategy_ = getReplicationStrategy(tokenMetadata_);
}