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/09/24 02:31:31 UTC
incubator-tinkerpop git commit: up to a NullPointerException.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/spark-gryo 5536a2d77 -> 97133cb2d
up to a NullPointerException.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/97133cb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/97133cb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/97133cb2
Branch: refs/heads/spark-gryo
Commit: 97133cb2dd6e56ab29550d019620331456729983
Parents: 5536a2d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 23 18:31:29 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Sep 23 18:31:29 2015 -0600
----------------------------------------------------------------------
.../computer/spark/io/gryo/GryoSerializer.java | 20 ++++++++++++++++++--
.../spark/io/gryo/GryoSerializerInstance.java | 8 ++------
2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/97133cb2/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializer.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializer.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializer.java
index 40b0aef..4775119 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializer.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializer.java
@@ -20,10 +20,18 @@
package org.apache.tinkerpop.gremlin.hadoop.process.computer.spark.io.gryo;
import org.apache.spark.SerializableWritable;
+import org.apache.spark.api.python.PythonBroadcast;
+import org.apache.spark.broadcast.HttpBroadcast;
+import org.apache.spark.scheduler.CompressedMapStatus;
import org.apache.spark.serializer.Serializer;
import org.apache.spark.serializer.SerializerInstance;
+import org.apache.tinkerpop.gremlin.hadoop.process.computer.spark.payload.MessagePayload;
+import org.apache.tinkerpop.gremlin.hadoop.process.computer.spark.payload.ViewIncomingPayload;
+import org.apache.tinkerpop.gremlin.hadoop.process.computer.spark.payload.ViewOutgoingPayload;
+import org.apache.tinkerpop.gremlin.hadoop.process.computer.spark.payload.ViewPayload;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
import org.apache.tinkerpop.shaded.kryo.serializers.JavaSerializer;
+import scala.Tuple2;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -33,8 +41,16 @@ public final class GryoSerializer extends Serializer {
public SerializerInstance newInstance() {
return new GryoSerializerInstance(
GryoMapper.build().
- addCustom(SerializableWritable.class,new JavaSerializer()).
-
+ 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(MessagePayload.class, new JavaSerializer()).
+ addCustom(ViewIncomingPayload.class, new JavaSerializer()).
+ addCustom(ViewOutgoingPayload.class, new JavaSerializer()).
+ addCustom(ViewPayload.class, new JavaSerializer()).
create().createMapper());
+ // kryo.register(org.apache.spark.serializer.JavaIterableWrapperSerializer..MODULE$.wrapperClass(), new JavaIterableWrapperSerializer());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/97133cb2/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializerInstance.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializerInstance.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializerInstance.java
index 256cc8c..6d8fbbf 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializerInstance.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/io/gryo/GryoSerializerInstance.java
@@ -51,17 +51,13 @@ public final class GryoSerializerInstance extends SerializerInstance {
@Override
public <T> T deserialize(final ByteBuffer byteBuffer, final ClassTag<T> classTag) {
- final Input input = new Input();
- input.setBuffer(byteBuffer.array());
- return (T) this.kryo.readClassAndObject(input);
+ return (T) this.kryo.readClassAndObject(new Input(byteBuffer.array()));
}
@Override
public <T> T deserialize(final ByteBuffer byteBuffer, final ClassLoader classLoader, final ClassTag<T> classTag) {
- final Input input = new Input(10000000);
- input.setBuffer(byteBuffer.array());
this.kryo.setClassLoader(classLoader);
- return (T) this.kryo.readClassAndObject(input);
+ return (T) this.kryo.readClassAndObject(new Input(byteBuffer.array()));
}
@Override