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/03/25 21:46:54 UTC
incubator-tinkerpop git commit: GryoReader and GryoWriter now use
InputStream and OutputStream. This allows HadoopGremlin tests to run in
IntelliJ.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 6087286e1 -> f4425dc68
GryoReader and GryoWriter now use InputStream and OutputStream. This allows HadoopGremlin tests to run in IntelliJ.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f4425dc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f4425dc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f4425dc6
Branch: refs/heads/master
Commit: f4425dc68825cf0dca15924b7cb606733d8bb774
Parents: 6087286
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Mar 25 14:46:50 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Mar 25 14:46:50 2015 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/gryo/GryoReader.java | 4 ++--
.../tinkerpop/gremlin/structure/io/gryo/GryoWriter.java | 4 +++-
.../gremlin/hadoop/structure/io/ObjectWritable.java | 9 ++-------
.../gremlin/hadoop/structure/io/VertexWritable.java | 1 -
4 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f4425dc6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index 8cf752f..596a863 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -332,8 +332,8 @@ public class GryoReader implements GraphReader {
}
}
- public <T> T readObject(final Input input) {
- return (T) this.kryo.readClassAndObject(input);
+ public <T> T readObject(final InputStream inputStream) {
+ return (T) this.kryo.readClassAndObject(new Input(inputStream));
}
public static Builder build() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f4425dc6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
index 65d128b..da33a3f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
@@ -149,8 +149,10 @@ public class GryoWriter implements GraphWriter {
kryo.writeClassAndObject(output, EdgeTerminator.INSTANCE);
}
- public void writeObject(final Output output, final Object object) {
+ public void writeObject(final OutputStream outputStream, final Object object) {
+ final Output output = new Output(outputStream);
this.kryo.writeClassAndObject(output, object);
+ output.flush();
}
public static Builder build() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f4425dc6/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java
index 72833f6..54c2896 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java
@@ -20,8 +20,6 @@ package org.apache.tinkerpop.gremlin.hadoop.structure.io;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableUtils;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoInput;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoOutput;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -63,7 +61,7 @@ public final class ObjectWritable<T> implements WritableComparable<ObjectWritabl
public void readFields(final DataInput input) throws IOException {
this.t = HadoopPools.GRYO_POOL.doWithReader(gryoReader -> {
try {
- return gryoReader.readObject(new GryoInput(new ByteArrayInputStream(WritableUtils.readCompressedByteArray(input))));
+ return gryoReader.readObject(new ByteArrayInputStream(WritableUtils.readCompressedByteArray(input)));
} catch (IOException e) {
throw new IllegalStateException(e.getMessage(), e);
}
@@ -75,11 +73,8 @@ public final class ObjectWritable<T> implements WritableComparable<ObjectWritabl
HadoopPools.GRYO_POOL.doWithWriter(gryoWriter -> {
try {
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- final GryoOutput out = new GryoOutput(outputStream);
- gryoWriter.writeObject(out, this.t);
- out.flush();
+ gryoWriter.writeObject(outputStream, this.t);
WritableUtils.writeCompressedByteArray(output, outputStream.toByteArray());
- out.close();
} catch (IOException e) {
throw new IllegalStateException(e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f4425dc6/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java
index 9608e7d..2afe369 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java
@@ -48,7 +48,6 @@ public final class VertexWritable implements Writable, Serializable {
}
- // TODO: REMOVE!!!
public VertexWritable(final Vertex vertex) {
this.vertex = vertex;
}