mirror of https://github.com/apache/cassandra
rename WriteResponseMessage -> WriteResponse (it has no relationship to Message class)
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759215 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
9049d5919d
commit
2ee9f9e44a
|
|
@ -38,25 +38,25 @@ import org.apache.cassandra.service.StorageService;
|
|||
* 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 @@ private static ICompactSerializer<WriteResponseMessage> serializer_;
|
|||
@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 @@ private static ICompactSerializer<WriteResponseMessage> serializer_;
|
|||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
|
@ -29,16 +29,14 @@ import java.util.concurrent.TimeUnit;
|
|||
import java.util.concurrent.TimeoutException;
|
||||
import org.apache.cassandra.config.DatabaseDescriptor;
|
||||
import org.apache.cassandra.db.ReadMessage;
|
||||
import org.apache.cassandra.db.ReadResponseMessage;
|
||||
import org.apache.cassandra.db.Row;
|
||||
import org.apache.cassandra.db.WriteResponseMessage;
|
||||
import org.apache.cassandra.net.EndPoint;
|
||||
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 )
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -26,13 +26,12 @@ import java.util.concurrent.TimeUnit;
|
|||
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 )
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ package org.apache.cassandra.service;
|
|||
|
||||
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 @@ public class WriteResponseResolver implements IResponseResolver<Boolean> {
|
|||
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue