raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Added test for serializing stateless actor + made mailbox accessible

Browse source
This commit is contained in:
Jonas Bonér 2010-06-22 10:02:19 +02:00
parent aad718937a
commit e3d661517e
4 changed files with 74 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

103
akka-core/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java
View file

@ -632,20 +632,20 @@ public final class RemoteProtocol {
public boolean hasActorClassname() { return hasActorClassname; }
public java.lang.String getActorClassname() { return actorClassname_; }
// required bytes actorInstance = 4;
public static final int ACTORINSTANCE_FIELD_NUMBER = 4;
private boolean hasActorInstance;
private com.google.protobuf.ByteString actorInstance_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasActorInstance() { return hasActorInstance; }
public com.google.protobuf.ByteString getActorInstance() { return actorInstance_; }
// required .AddressProtocol originalAddress = 5;
public static final int ORIGINALADDRESS_FIELD_NUMBER = 5;
// required .AddressProtocol originalAddress = 4;
public static final int ORIGINALADDRESS_FIELD_NUMBER = 4;
private boolean hasOriginalAddress;
private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol originalAddress_;
public boolean hasOriginalAddress() { return hasOriginalAddress; }
public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol getOriginalAddress() { return originalAddress_; }
// optional bytes actorInstance = 5;
public static final int ACTORINSTANCE_FIELD_NUMBER = 5;
private boolean hasActorInstance;
private com.google.protobuf.ByteString actorInstance_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasActorInstance() { return hasActorInstance; }
public com.google.protobuf.ByteString getActorInstance() { return actorInstance_; }
// optional string serializerClassname = 6;
public static final int SERIALIZERCLASSNAME_FIELD_NUMBER = 6;
private boolean hasSerializerClassname;
@ -697,7 +697,6 @@ public final class RemoteProtocol {
if (!hasUuid) return false;
if (!hasId) return false;
if (!hasActorClassname) return false;
if (!hasActorInstance) return false;
if (!hasOriginalAddress) return false;
if (!getOriginalAddress().isInitialized()) return false;
if (hasLifeCycle()) {
@ -721,11 +720,11 @@ public final class RemoteProtocol {
if (hasActorClassname()) {
output.writeString(3, getActorClassname());
}
if (hasActorInstance()) {
output.writeBytes(4, getActorInstance());
}
if (hasOriginalAddress()) {
output.writeMessage(5, getOriginalAddress());
output.writeMessage(4, getOriginalAddress());
}
if (hasActorInstance()) {
output.writeBytes(5, getActorInstance());
}
if (hasSerializerClassname()) {
output.writeString(6, getSerializerClassname());
@ -766,13 +765,13 @@ public final class RemoteProtocol {
size += com.google.protobuf.CodedOutputStream
.computeStringSize(3, getActorClassname());
}
if (hasActorInstance()) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(4, getActorInstance());
}
if (hasOriginalAddress()) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, getOriginalAddress());
.computeMessageSize(4, getOriginalAddress());
}
if (hasActorInstance()) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(5, getActorInstance());
}
if (hasSerializerClassname()) {
size += com.google.protobuf.CodedOutputStream
@ -965,12 +964,12 @@ public final class RemoteProtocol {
if (other.hasActorClassname()) {
setActorClassname(other.getActorClassname());
}
if (other.hasActorInstance()) {
setActorInstance(other.getActorInstance());
}
if (other.hasOriginalAddress()) {
mergeOriginalAddress(other.getOriginalAddress());
}
if (other.hasActorInstance()) {
setActorInstance(other.getActorInstance());
}
if (other.hasSerializerClassname()) {
setSerializerClassname(other.getSerializerClassname());
}
@ -1027,10 +1026,6 @@ public final class RemoteProtocol {
break;
}
case 34: {
setActorInstance(input.readBytes());
break;
}
case 42: {
se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.Builder subBuilder = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.newBuilder();
if (hasOriginalAddress()) {
subBuilder.mergeFrom(getOriginalAddress());
@ -1039,6 +1034,10 @@ public final class RemoteProtocol {
setOriginalAddress(subBuilder.buildPartial());
break;
}
case 42: {
setActorInstance(input.readBytes());
break;
}
case 50: {
setSerializerClassname(input.readString());
break;
@ -1141,28 +1140,7 @@ public final class RemoteProtocol {
return this;
}
// required bytes actorInstance = 4;
public boolean hasActorInstance() {
return result.hasActorInstance();
}
public com.google.protobuf.ByteString getActorInstance() {
return result.getActorInstance();
}
public Builder setActorInstance(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
result.hasActorInstance = true;
result.actorInstance_ = value;
return this;
}
public Builder clearActorInstance() {
result.hasActorInstance = false;
result.actorInstance_ = getDefaultInstance().getActorInstance();
return this;
}
// required .AddressProtocol originalAddress = 5;
// required .AddressProtocol originalAddress = 4;
public boolean hasOriginalAddress() {
return result.hasOriginalAddress();
}
@ -1199,6 +1177,27 @@ public final class RemoteProtocol {
return this;
}
// optional bytes actorInstance = 5;
public boolean hasActorInstance() {
return result.hasActorInstance();
}
public com.google.protobuf.ByteString getActorInstance() {
return result.getActorInstance();
}
public Builder setActorInstance(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
result.hasActorInstance = true;
result.actorInstance_ = value;
return this;
}
public Builder clearActorInstance() {
result.hasActorInstance = false;
result.actorInstance_ = getDefaultInstance().getActorInstance();
return this;
}
// optional string serializerClassname = 6;
public boolean hasSerializerClassname() {
return result.hasSerializerClassname();
@ -3874,9 +3873,9 @@ public final class RemoteProtocol {
"\030\002 \002(\t\022%\n\013homeAddress\030\003 \002(\0132\020.AddressPro" +
"tocol\022\017\n\007timeout\030\004 \001(\004\"\276\002\n\032SerializedAct" +
"orRefProtocol\022\014\n\004uuid\030\001 \002(\t\022\n\n\002id\030\002 \002(\t\022" +
"\026\n\016actorClassname\030\003 \002(\t\022\025\n\ractorInstance" +
"\030\004 \002(\014\022)\n\017originalAddress\030\005 \002(\0132\020.Addres" +
"sProtocol\022\033\n\023serializerClassname\030\006 \001(\t\022\024" +
"\026\n\016actorClassname\030\003 \002(\t\022)\n\017originalAddre" +
"ss\030\004 \002(\0132\020.AddressProtocol\022\025\n\ractorInsta" +
"nce\030\005 \001(\014\022\033\n\023serializerClassname\030\006 \001(\t\022\024" +
"\n\014isTransactor\030\007 \001(\010\022\017\n\007timeout\030\010 \001(\004\022%\n" +
"\tlifeCycle\030\t \001(\0132\022.LifeCycleProtocol\022+\n\n",
"supervisor\030\n \001(\0132\027.RemoteActorRefProtoco" +
@ -3924,7 +3923,7 @@ public final class RemoteProtocol {
internal_static_SerializedActorRefProtocol_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_SerializedActorRefProtocol_descriptor,
new java.lang.String[] { "Uuid", "Id", "ActorClassname", "ActorInstance", "OriginalAddress", "SerializerClassname", "IsTransactor", "Timeout", "LifeCycle", "Supervisor", "HotswapStack", },
new java.lang.String[] { "Uuid", "Id", "ActorClassname", "OriginalAddress", "ActorInstance", "SerializerClassname", "IsTransactor", "Timeout", "LifeCycle", "Supervisor", "HotswapStack", },
se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.class,
se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder.class);
internal_static_RemoteRequestProtocol_descriptor =

4
akka-core/src/main/protocol/RemoteProtocol.proto
View file

@ -31,8 +31,8 @@ message SerializedActorRefProtocol {
required string uuid = 1;
required string id = 2;
required string actorClassname = 3;
required bytes actorInstance = 4;
required AddressProtocol originalAddress = 5;
required AddressProtocol originalAddress = 4;
optional bytes actorInstance = 5;
optional string serializerClassname = 6;
optional bool isTransactor = 7;
optional uint64 timeout = 8;

16
akka-core/src/main/scala/actor/ActorRef.scala
View file

@ -726,8 +726,8 @@ sealed class LocalActorRef private[akka](
if (actorInstance.isInstanceOf[StatelessSerializableActor]) {
actorInstance.asInstanceOf[Actor]
} else if (actorInstance.isInstanceOf[StatefulSerializerSerializableActor]) {
__serializer
.getOrElse(throw new IllegalStateException("No serializer defined for SerializableActor [" + actorClass.getName + "]"))
__serializer.getOrElse(throw new IllegalStateException(
"No serializer defined for SerializableActor [" + actorClass.getName + "]"))
.fromBinary(__actorBytes, Some(actorClass)).asInstanceOf[Actor]
} else if (actorInstance.isInstanceOf[StatefulWrappedSerializableActor]) {
val instance = actorInstance.asInstanceOf[StatefulWrappedSerializableActor]
@ -818,28 +818,32 @@ sealed class LocalActorRef private[akka](
}
}
val originalAddress = AddressProtocol.newBuilder.setHostname(homeAddress.getHostName).setPort(homeAddress.getPort).build
val originalAddress = AddressProtocol.newBuilder
.setHostname(homeAddress.getHostName)
.setPort(homeAddress.getPort)
.build
val builder = SerializedActorRefProtocol.newBuilder
.setUuid(uuid)
.setId(id)
.setActorClassname(actorClass.getName)
.setActorInstance(ByteString.copyFrom(actor.asInstanceOf[StatefulSerializableActor].toBinary))
.setOriginalAddress(originalAddress)
.setIsTransactor(isTransactor)
.setTimeout(timeout)
if (actor.isInstanceOf[StatefulSerializableActor]) builder.setActorInstance(
ByteString.copyFrom(actor.asInstanceOf[StatefulSerializableActor].toBinary))
serializer.foreach(s => builder.setSerializerClassname(s.getClass.getName))
lifeCycleProtocol.foreach(builder.setLifeCycle(_))
supervisor.foreach(s => builder.setSupervisor(s.toRemoteActorRefProtocol))
// FIXME: how to serialize the hotswap PartialFunction ??
// hotswap.foreach(builder.setHotswapStack(_))
//hotswap.foreach(builder.setHotswapStack(_))
builder.build
}
/**
* Returns the mailbox.
*/
protected[akka] def mailbox: Deque[MessageInvocation] = _mailbox
def mailbox: Deque[MessageInvocation] = _mailbox
/**
* Serializes the ActorRef instance into a byte array (Array[Byte]).

49
akka-core/src/test/scala/SerializableActorSpec.scala
View file

@ -41,32 +41,16 @@ class SerializableActorSpec extends
(actor2 !! "hello").getOrElse("_") should equal("world 3")
}
/*
it("should be able to serialize and deserialize a JavaJSONSerializableActor") {
val actor1 = actorOf[JavaJSONSerializableTestActor].start
val serializer = actor1.serializer.getOrElse(fail("Serializer not defined"))
(actor1 !! "hello").getOrElse("_") should equal("world 1")
(actor1 !! "hello").getOrElse("_") should equal("world 2")
it("should be able to serialize and deserialize a StatelessSerializableActor") {
val actor1 = actorOf[StatelessSerializableTestActor].start
(actor1 !! "hello").getOrElse("_") should equal("world")
val bytes = actor1.toBinary
val actor2 = ActorRef.fromBinaryToLocalActorRef(bytes)
actor2.start
(actor2 !! "hello").getOrElse("_") should equal("world 3")
(actor2 !! "hello").getOrElse("_") should equal("world")
}
it("should be able to serialize and deserialize a ScalaJSONSerializableActor") {
val actor1 = actorOf[ScalaJSONSerializableTestActor].start
val serializer = actor1.serializer.getOrElse(fail("Serializer not defined"))
(actor1 !! "hello").getOrElse("_") should equal("world 1")
val bytes = actor1.toBinary
val actor2 = ActorRef.fromBinaryToLocalActorRef(bytes)
actor2.start
(actor2 !! "hello").getOrElse("_") should equal("world 2")
}
*/
}
}
@ -79,6 +63,13 @@ class SerializableActorSpec extends
}
}
class StatelessSerializableTestActor extends StatelessSerializableActor {
def receive = {
case "hello" =>
self.reply("world")
}
}
class ProtobufSerializableTestActor extends ProtobufSerializableActor[ProtobufProtocol.Counter] {
val clazz = classOf[ProtobufProtocol.Counter]
private var count = 0
@ -92,21 +83,3 @@ class ProtobufSerializableTestActor extends ProtobufSerializableActor[ProtobufPr
self.reply("world " + count)
}
}
class JavaJSONSerializableTestActor extends JavaJSONSerializableActor {
private var count = 0
def receive = {
case "hello" =>
count = count + 1
self.reply("world " + count)
}
}
@scala.reflect.BeanInfo class ScalaJSONSerializableTestActor extends ScalaJSONSerializableActor {
private var count = 0
def receive = {
case "hello" =>
count = count + 1
self.reply("world " + count)
}
}