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 04:00:03 UTC
incubator-tinkerpop git commit: random tweaks,
but still buffer underflow.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/spark-gryo-tp31 9110a1e70 -> a8b1439ac
random tweaks, but still buffer underflow.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a8b1439a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a8b1439a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a8b1439a
Branch: refs/heads/spark-gryo-tp31
Commit: a8b1439acd7098c2ea458f960fadbbbb62bf5f98
Parents: 9110a1e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 23 20:00:04 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Sep 23 20:00:04 2015 -0600
----------------------------------------------------------------------
.../process/computer/io/gryo/GryoDeserializationStream.java | 2 +-
.../spark/process/computer/io/gryo/GryoSerializationStream.java | 5 ++---
.../gremlin/spark/process/computer/io/gryo/GryoSerializer.java | 4 ++--
.../spark/process/computer/io/gryo/GryoSerializerInstance.java | 3 ++-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a8b1439a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoDeserializationStream.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoDeserializationStream.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoDeserializationStream.java
index f5e36f7..1d8039a 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoDeserializationStream.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoDeserializationStream.java
@@ -29,7 +29,7 @@ import java.io.InputStream;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class GryoDeserializationStream extends DeserializationStream {
+public final class GryoDeserializationStream extends DeserializationStream {
private final InputStream inputStream;
private final GryoSerializerInstance serializer;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a8b1439a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializationStream.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializationStream.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializationStream.java
index e5981a0..f51444b 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializationStream.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializationStream.java
@@ -20,7 +20,6 @@
package org.apache.tinkerpop.gremlin.spark.process.computer.io.gryo;
import org.apache.spark.serializer.SerializationStream;
-import org.apache.spark.serializer.SerializerInstance;
import scala.reflect.ClassTag;
import java.io.IOException;
@@ -29,10 +28,10 @@ import java.io.OutputStream;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class GryoSerializationStream extends SerializationStream {
+public final class GryoSerializationStream extends SerializationStream {
private final OutputStream outputStream;
- private final SerializerInstance serializer;
+ private final GryoSerializerInstance serializer;
public GryoSerializationStream(final GryoSerializerInstance serializer, final OutputStream outputStream) {
this.outputStream = outputStream;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a8b1439a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializer.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializer.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializer.java
index c7c1468..c2e99a9 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializer.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializer.java
@@ -39,7 +39,7 @@ import scala.Tuple2;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class GryoSerializer extends Serializer {
+public final class GryoSerializer extends Serializer {
@Override
public SerializerInstance newInstance() {
return new GryoSerializerInstance(
@@ -56,7 +56,7 @@ public class GryoSerializer extends Serializer {
addCustom(SerializableConfiguration.class, new JavaSerializer()).
addCustom(VertexWritable.class, new JavaSerializer()).
addCustom(ObjectWritable.class, new JavaSerializer()).
- create().createMapper());
+ create().createMapper());
// kryo.register(org.apache.spark.serializer.JavaIterableWrapperSerializer..MODULE$.wrapperClass(), new JavaIterableWrapperSerializer());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a8b1439a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializerInstance.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializerInstance.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializerInstance.java
index 212abe2..9c74434 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializerInstance.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/io/gryo/GryoSerializerInstance.java
@@ -34,7 +34,7 @@ import java.nio.ByteBuffer;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class GryoSerializerInstance extends SerializerInstance {
+public final class GryoSerializerInstance extends SerializerInstance {
private final Kryo kryo;
@@ -46,6 +46,7 @@ public class GryoSerializerInstance extends SerializerInstance {
public <T> ByteBuffer serialize(final T t, final ClassTag<T> classTag) {
final Output output = new Output(100000);
this.kryo.writeClassAndObject(output, t);
+ output.flush();
return ByteBuffer.wrap(output.getBuffer());
}