wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-27 21:38:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

[xlang] Cross language serialization for ActorHandle (#10335)

Browse Source
This commit is contained in:
fyrestone
2020-09-02 10:11:53 +08:00
committed by GitHub
parent 65f17f2e14
commit b04222dbd9
8 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/runtime/src/main/java/io/ray/runtime/object/ObjectSerializer.java
+15
View File
@@ -2,6 +2,7 @@ package io.ray.runtime.object;
import com.google.protobuf.InvalidProtocolBufferException;
import io.ray.api.id.ObjectId;
import io.ray.runtime.actor.NativeActorHandle;
import io.ray.runtime.exception.RayActorException;
import io.ray.runtime.exception.RayTaskException;
import io.ray.runtime.exception.RayWorkerException;
@@ -35,6 +36,10 @@ public class ObjectSerializer {
public static final byte[] OBJECT_METADATA_TYPE_JAVA = "JAVA".getBytes();
public static final byte[] OBJECT_METADATA_TYPE_PYTHON = "PYTHON".getBytes();
public static final byte[] OBJECT_METADATA_TYPE_RAW = "RAW".getBytes();
// A constant used as object metadata to indicate the object is an actor handle.
// This value should be synchronized with the Python definition in ray_constants.py
// TODO(fyrestone): Serialize the ActorHandle via the custom type feature of XLANG.
public static final byte[] OBJECT_METADATA_TYPE_ACTOR_HANDLE = "ACTOR_HANDLE".getBytes();
// When an outer object is being serialized, the nested ObjectRefs are all
// serialized and the writeExternal method of the nested ObjectRefs are
@@ -86,6 +91,9 @@ public class ObjectSerializer {
"Can't deserialize RayTaskException object: " + objectId
.toString());
}
} else if (Arrays.equals(meta, OBJECT_METADATA_TYPE_ACTOR_HANDLE)) {
byte[] serialized = Serializer.decode(data, byte[].class);
return NativeActorHandle.fromBytes(serialized);
} else if (Arrays.equals(meta, OBJECT_METADATA_TYPE_PYTHON)) {
throw new IllegalArgumentException("Can't deserialize Python object: " + objectId
.toString());
@@ -129,6 +137,13 @@ public class ObjectSerializer {
// Only OBJECT_METADATA_TYPE_RAW is raw bytes,
// any other type should be the MessagePack serialized bytes.
return new NativeRayObject(serializedBytes, TASK_EXECUTION_EXCEPTION_META);
} else if (object instanceof NativeActorHandle) {
NativeActorHandle actorHandle = (NativeActorHandle)object;
byte[] serializedBytes = Serializer.encode(actorHandle.toBytes()).getLeft();
// serializedBytes is MessagePack serialized bytes
// Only OBJECT_METADATA_TYPE_RAW is raw bytes,
// any other type should be the MessagePack serialized bytes.
return new NativeRayObject(serializedBytes, OBJECT_METADATA_TYPE_ACTOR_HANDLE);
} else {
try {
Pair<byte[], Boolean> serialized = Serializer.encode(object);
java/runtime/src/main/java/io/ray/runtime/task/ArgumentsBuilder.java
+2 -1
View File
@@ -48,7 +48,8 @@ public class ArgumentsBuilder {
if (language != Language.JAVA) {
boolean isCrossData =
Arrays.equals(value.metadata, ObjectSerializer.OBJECT_METADATA_TYPE_CROSS_LANGUAGE) ||
Arrays.equals(value.metadata, ObjectSerializer.OBJECT_METADATA_TYPE_RAW);
Arrays.equals(value.metadata, ObjectSerializer.OBJECT_METADATA_TYPE_RAW) ||
Arrays.equals(value.metadata, ObjectSerializer.OBJECT_METADATA_TYPE_ACTOR_HANDLE);
if (!isCrossData) {
throw new IllegalArgumentException(String.format("Can't transfer %s data to %s",
Arrays.toString(value.metadata), language.getValueDescriptor().getName()));