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/12 22:48:21 UTC
incubator-tinkerpop git commit: GiraphVertexWriter is now fast.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 0880e93f3 -> 69b69ee76
GiraphVertexWriter is now fast.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/69b69ee7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/69b69ee7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/69b69ee7
Branch: refs/heads/master
Commit: 69b69ee762bdf470aacee9159c6f3b7c6ed2eda1
Parents: 0880e93
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Mar 12 15:48:18 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Mar 12 15:48:18 2015 -0600
----------------------------------------------------------------------
.../hadoop/process/computer/giraph/GiraphWorkerContext.java | 7 -------
.../process/computer/giraph/io/GiraphVertexWriter.java | 8 +++++---
.../gremlin/hadoop/structure/io/VertexWritable.java | 1 +
3 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/69b69ee7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java
index 4bbef28..d1a851c 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java
@@ -24,7 +24,6 @@ import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil;
import org.apache.tinkerpop.gremlin.process.computer.VertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.util.ImmutableMemory;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -34,7 +33,6 @@ public final class GiraphWorkerContext extends WorkerContext {
private VertexProgram<?> vertexProgram;
private GiraphMemory memory;
private GiraphMessenger messenger;
- private GryoWriter gryoWriter;
private GryoReader gryoReader;
public GiraphWorkerContext() {
@@ -45,7 +43,6 @@ public final class GiraphWorkerContext extends WorkerContext {
this.vertexProgram = VertexProgram.createVertexProgram(ConfUtil.makeApacheConfiguration(this.getContext().getConfiguration()));
this.memory = new GiraphMemory(this, this.vertexProgram);
this.messenger = new GiraphMessenger();
- this.gryoWriter = GryoWriter.build().create();
this.gryoReader = GryoReader.build().create();
}
@@ -77,8 +74,4 @@ public final class GiraphWorkerContext extends WorkerContext {
public GryoReader getReader() {
return gryoReader;
}
-
- public GryoWriter getWriter() {
- return gryoWriter;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/69b69ee7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java
index 1366b71..78a1344 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java
@@ -18,14 +18,14 @@
*/
package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.io;
-import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphComputeVertex;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.io.VertexWriter;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapreduce.OutputFormat;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphComputeVertex;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
import java.io.IOException;
@@ -35,6 +35,7 @@ import java.io.IOException;
public class GiraphVertexWriter extends VertexWriter {
private final OutputFormat<NullWritable, VertexWritable> outputFormat;
private RecordWriter<NullWritable, VertexWritable> recordWriter;
+ private final VertexWritable vertexWritable = new VertexWritable();
public GiraphVertexWriter(final OutputFormat<NullWritable, VertexWritable> outputFormat) {
this.outputFormat = outputFormat;
@@ -52,6 +53,7 @@ public class GiraphVertexWriter extends VertexWriter {
@Override
public void writeVertex(final Vertex vertex) throws IOException, InterruptedException {
- this.recordWriter.write(NullWritable.get(), new VertexWritable(((GiraphComputeVertex) vertex).getBaseVertex()));
+ this.vertexWritable.set(((GiraphComputeVertex) vertex).getBaseVertex());
+ this.recordWriter.write(NullWritable.get(), this.vertexWritable);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/69b69ee7/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 ea70c0e..b8be3b3 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
@@ -49,6 +49,7 @@ public final class VertexWritable implements Writable {
}
+ // TODO: REMOVE!!!
public VertexWritable(final Vertex vertex) {
this.vertex = vertex;
}