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 2009/03/27 03:19:30 UTC
svn commit: r758976 - in
/incubator/cassandra/trunk/src/org/apache/cassandra: db/WriteResponse.java
db/WriteResponseMessage.java service/QuorumResponseHandler.java
service/WriteResponseResolver.java
Author: jbellis
Date: Fri Mar 27 02:19:30 2009
New Revision: 758976
URL: http://svn.apache.org/viewvc?rev=758976&view=rev
Log:
rename WriteResponseMessage -> WriteResponse (it has no relationship to Message class)
Added:
incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponse.java
- copied, changed from r758975, incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponseMessage.java
Removed:
incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponseMessage.java
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/service/QuorumResponseHandler.java
incubator/cassandra/trunk/src/org/apache/cassandra/service/WriteResponseResolver.java
Copied: incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponse.java (from r758975, incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponseMessage.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponse.java?p2=incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponse.java&p1=incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponseMessage.java&r1=758975&r2=758976&rev=758976&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponseMessage.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/WriteResponse.java Fri Mar 27 02:19:30 2009
@@ -38,25 +38,25 @@
* key in a table
* Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
*/
-public class WriteResponseMessage implements Serializable
+public class WriteResponse implements Serializable
{
-private static ICompactSerializer<WriteResponseMessage> serializer_;
-
+private static ICompactSerializer<WriteResponse> serializer_;
+
static
{
- serializer_ = new WriteResponseMessageSerializer();
+ serializer_ = new WriteResponseSerializer();
}
- static ICompactSerializer<WriteResponseMessage> serializer()
+ static ICompactSerializer<WriteResponse> serializer()
{
return serializer_;
}
- public static Message makeWriteResponseMessage(WriteResponseMessage writeResponseMessage) throws IOException
+ public static Message makeWriteResponseMessage(WriteResponse writeResponse) throws IOException
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream( bos );
- WriteResponseMessage.serializer().serialize(writeResponseMessage, dos);
+ WriteResponse.serializer().serialize(writeResponse, dos);
Message message = new Message(StorageService.getLocalStorageEndPoint(), MessagingService.responseStage_, MessagingService.responseVerbHandler_, new Object[]{bos.toByteArray()});
return message;
}
@@ -70,10 +70,10 @@
@XmlElement(name = "Status")
private boolean status_;
- private WriteResponseMessage() {
+ private WriteResponse() {
}
- public WriteResponseMessage(String table, String key, boolean bVal) {
+ public WriteResponse(String table, String key, boolean bVal) {
table_ = table;
key_ = key;
status_ = bVal;
@@ -95,20 +95,20 @@
}
}
-class WriteResponseMessageSerializer implements ICompactSerializer<WriteResponseMessage>
+class WriteResponseSerializer implements ICompactSerializer<WriteResponse>
{
- public void serialize(WriteResponseMessage wm, DataOutputStream dos) throws IOException
+ public void serialize(WriteResponse wm, DataOutputStream dos) throws IOException
{
dos.writeUTF(wm.table());
dos.writeUTF(wm.key());
dos.writeBoolean(wm.isSuccess());
}
- public WriteResponseMessage deserialize(DataInputStream dis) throws IOException
+ public WriteResponse deserialize(DataInputStream dis) throws IOException
{
String table = dis.readUTF();
String key = dis.readUTF();
boolean status = dis.readBoolean();
- return new WriteResponseMessage(table, key, status);
+ return new WriteResponse(table, key, status);
}
}
\ No newline at end of file
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/service/QuorumResponseHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/service/QuorumResponseHandler.java?rev=758976&r1=758975&r2=758976&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/service/QuorumResponseHandler.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/service/QuorumResponseHandler.java Fri Mar 27 02:19:30 2009
@@ -26,13 +26,12 @@
import java.util.concurrent.TimeoutException;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.WriteResponseMessage;
import org.apache.cassandra.net.IAsyncCallback;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
-import org.apache.cassandra.utils.*;
+
/**
* Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
*/
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/service/WriteResponseResolver.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/service/WriteResponseResolver.java?rev=758976&r1=758975&r2=758976&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/service/WriteResponseResolver.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/service/WriteResponseResolver.java Fri Mar 27 02:19:30 2009
@@ -20,7 +20,7 @@
import java.util.List;
-import org.apache.cassandra.db.WriteResponseMessage;
+import org.apache.cassandra.db.WriteResponse;
import org.apache.cassandra.net.Message;
import org.apache.log4j.Logger;
@@ -47,11 +47,11 @@
boolean returnValue = false;
for (Message response : responses) {
Object[] body = response.getMessageBody();
- WriteResponseMessage writeResponseMessage = (WriteResponseMessage) body[0];
- boolean result = writeResponseMessage.isSuccess();
+ WriteResponse writeResponse = (WriteResponse) body[0];
+ boolean result = writeResponse.isSuccess();
if (!result) {
logger_.debug("Write at " + response.getFrom()
- + " may have failed for the key " + writeResponseMessage.key());
+ + " may have failed for the key " + writeResponse.key());
}
returnValue |= result;
}