Author: jbellis
Date: Mon Jan 11 21:20:11 2010
New Revision: 898069
URL: http://svn.apache.org/viewvc?rev=898069&view=rev
Log:
inline FastSerializer. patch by jbellis
Removed:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/FastSerializer.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/Message.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
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=898069&r1=898068&r2=898069&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
Mon Jan 11 21:20:11 2010
@@ -29,14 +29,14 @@
public class Message
{
- private static ICompactSerializer<Message> serializer_;
+ private static MessageSerializer serializer_;
static
{
serializer_ = new MessageSerializer();
}
- public static ICompactSerializer<Message> serializer()
+ public static MessageSerializer serializer()
{
return serializer_;
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java?rev=898069&r1=898068&r2=898069&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
Mon Jan 11 21:20:11 2010
@@ -18,10 +18,10 @@
package org.apache.cassandra.net;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
import java.io.IOException;
-import org.apache.cassandra.net.io.FastSerializer;
-import org.apache.cassandra.net.io.ISerializer;
import org.apache.cassandra.net.sink.SinkManager;
import org.apache.log4j.Logger;
@@ -29,13 +29,10 @@
class MessageDeserializationTask implements Runnable
{
private static Logger logger_ =
Logger.getLogger(MessageDeserializationTask.class);
- private static ISerializer serializer_ = new FastSerializer();
- private int serializerType_;
- private byte[] bytes_ = new byte[0];
+ private byte[] bytes_ = new byte[0];
- MessageDeserializationTask(int serializerType, byte[] bytes)
+ MessageDeserializationTask(byte[] bytes)
{
- serializerType_ = serializerType;
bytes_ = bytes;
}
@@ -44,7 +41,7 @@
Message message = null;
try
{
- message = serializer_.deserialize(bytes_);
+ message = Message.serializer().deserialize(new DataInputStream(new
ByteArrayInputStream(bytes_)));
}
catch (IOException e)
{
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=898069&r1=898068&r2=898069&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
Mon Jan 11 21:20:11 2010
@@ -22,8 +22,7 @@
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.gms.IFailureDetectionEventListener;
-import org.apache.cassandra.net.io.FastSerializer;
-import org.apache.cassandra.net.io.ISerializer;
+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.utils.*;
@@ -82,8 +81,6 @@
private static Logger logger_ = Logger.getLogger(MessagingService.class);
- private static FastSerializer serializer_ = new FastSerializer();
-
private static volatile MessagingService messagingService_ = new
MessagingService();
public static final int MESSAGE_DESERIALIZE_THREADS = 4;
@@ -378,7 +375,9 @@
byte[] data;
try
{
- data = serializer_.serialize(message);
+ DataOutputBuffer buffer = new DataOutputBuffer();
+ Message.serializer().serialize(message, buffer);
+ data = buffer.getData();
}
catch (IOException e)
{
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java?rev=898069&r1=898068&r2=898069&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
Mon Jan 11 21:20:11 2010
@@ -33,8 +33,6 @@
import java.net.InetSocketAddress;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.net.io.FastSerializer;
-import org.apache.cassandra.net.io.ISerializer;
import org.apache.cassandra.net.io.ProtocolState;
import org.apache.cassandra.net.io.StartState;
import org.apache.cassandra.net.io.TcpReader;
@@ -438,7 +436,7 @@
}
/* Deserialize and handle the message */
- MessagingService.getDeserializationExecutor().submit(
new MessageDeserializationTask(pH.serializerType_, bytes) );
+
MessagingService.getDeserializationExecutor().submit(new
MessageDeserializationTask(bytes));
tcpReader_.resetState();
}
else
