You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/10/06 22:57:04 UTC
incubator-tinkerpop git commit: if you use a JavaSerializer on a
class htat contains KryoSerializable objects,
it will use the JavaSerializer on those objects. A dead simply fix.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master b9e60b615 -> eb8e106c3
if you use a JavaSerializer on a class htat contains KryoSerializable objects, it will use the JavaSerializer on those objects. A dead simply fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/eb8e106c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/eb8e106c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/eb8e106c
Branch: refs/heads/master
Commit: eb8e106c3c50bd574919dc513bbf89a5e0cb9a70
Parents: b9e60b6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Oct 6 14:56:47 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Oct 6 14:56:47 2015 -0600
----------------------------------------------------------------------
.../process/computer/payload/ViewPayload.java | 6 +++-
.../spark/structure/io/gryo/GryoSerializer.java | 32 ++++++++++----------
2 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eb8e106c/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/payload/ViewPayload.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/payload/ViewPayload.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/payload/ViewPayload.java
index dc9376d..dec0e66 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/payload/ViewPayload.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/payload/ViewPayload.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.spark.process.computer.payload;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import java.util.Collections;
import java.util.List;
/**
@@ -27,7 +28,10 @@ import java.util.List;
*/
public final class ViewPayload implements Payload {
- private final List<DetachedVertexProperty<Object>> view;
+ private List<DetachedVertexProperty<Object>> view;
+
+ private ViewPayload() {
+ }
public ViewPayload(final List<DetachedVertexProperty<Object>> view) {
this.view = view;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eb8e106c/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java
index f0b1147..7202892 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java
@@ -78,22 +78,22 @@ public final class GryoSerializer extends Serializer {
initializeMapper(builder -> {
try {
builder.addCustom(SerializableWritable.class, new JavaSerializer())
- .addCustom(Tuple2.class, new JavaSerializer())
- .addCustom(CompressedMapStatus.class, new JavaSerializer())
- .addCustom(HttpBroadcast.class, new JavaSerializer())
- .addCustom(PythonBroadcast.class, new JavaSerializer())
- .addCustom(BoxedUnit.class, new JavaSerializer())
- .addCustom(Class.forName("scala.reflect.ClassTag$$anon$1"), new JavaSerializer())
- .addCustom(MessagePayload.class, new JavaSerializer())
- .addCustom(ViewIncomingPayload.class, new JavaSerializer())
- .addCustom(ViewOutgoingPayload.class, new JavaSerializer())
- .addCustom(ViewPayload.class, new JavaSerializer())
- .addCustom(SerializableConfiguration.class, new JavaSerializer())
- .addCustom(VertexWritable.class, new JavaSerializer())
- .addCustom(ObjectWritable.class, new JavaSerializer())
- .referenceTracking(referenceTracking)
- .registrationRequired(registrationRequired);
- // add these as we find ClassNotFoundExceptions
+ .addCustom(Tuple2.class, new JavaSerializer())
+ .addCustom(CompressedMapStatus.class, new JavaSerializer())
+ .addCustom(HttpBroadcast.class, new JavaSerializer())
+ .addCustom(PythonBroadcast.class, new JavaSerializer())
+ .addCustom(BoxedUnit.class, new JavaSerializer())
+ .addCustom(Class.forName("scala.reflect.ClassTag$$anon$1"), new JavaSerializer())
+ .addCustom(MessagePayload.class)
+ .addCustom(ViewIncomingPayload.class)
+ .addCustom(ViewOutgoingPayload.class)
+ .addCustom(ViewPayload.class)
+ .addCustom(SerializableConfiguration.class, new JavaSerializer())
+ .addCustom(VertexWritable.class, new JavaSerializer())
+ .addCustom(ObjectWritable.class, new JavaSerializer())
+ .referenceTracking(referenceTracking)
+ .registrationRequired(registrationRequired);
+ // add these as we find ClassNotFoundExceptions
} catch (final ClassNotFoundException e) {
throw new IllegalStateException(e);
}