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 2016/02/13 16:35:04 UTC
[10/17] incubator-tinkerpop git commit: there is a bug in
GiraphGraphComputer when chaining jobs together. damn. I have things a bit
cleaner. committing what I have for now.
there is a bug in GiraphGraphComputer when chaining jobs together. damn. I have things a bit cleaner. committing what I have for now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/66d86cdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/66d86cdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/66d86cdf
Branch: refs/heads/master
Commit: 66d86cdfbb00bf1eb74f067815181f90b40d6feb
Parents: 17bfdb8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 11 14:53:00 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 11 14:53:00 2016 -0700
----------------------------------------------------------------------
.../giraph/process/computer/GiraphGraphComputer.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66d86cdf/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
----------------------------------------------------------------------
diff --git a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
index fdded04..bc6df7a 100644
--- a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
+++ b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
@@ -123,7 +123,6 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple
private Future<ComputerResult> submitWithExecutor(final Executor exec) {
final long startTime = System.currentTimeMillis();
- final Configuration apacheConfiguration = ConfUtil.makeApacheConfiguration(this.giraphConfiguration);
return CompletableFuture.<ComputerResult>supplyAsync(() -> {
try {
final FileSystem fs = FileSystem.get(this.giraphConfiguration);
@@ -133,9 +132,8 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple
//e.printStackTrace();
throw new IllegalStateException(e.getMessage(), e);
}
-
this.memory.setRuntime(System.currentTimeMillis() - startTime);
- return new DefaultComputerResult(InputOutputHelper.getOutputGraph(apacheConfiguration, this.resultGraph, this.persist), this.memory.asImmutable());
+ return new DefaultComputerResult(InputOutputHelper.getOutputGraph(ConfUtil.makeApacheConfiguration(this.giraphConfiguration), this.resultGraph, this.persist), this.memory.asImmutable());
}, exec);
}
@@ -155,7 +153,7 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple
// a way to verify in Giraph whether the traversal will go over the wire or not
try {
VertexProgram.createVertexProgram(this.hadoopGraph, ConfUtil.makeApacheConfiguration(this.giraphConfiguration));
- } catch (IllegalStateException e) {
+ } catch (final IllegalStateException e) {
if (e.getCause() instanceof NumberFormatException)
throw new NotSerializableException("The provided traversal is not serializable and thus, can not be distributed across the cluster");
}
@@ -174,8 +172,6 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple
this.giraphConfiguration.setNumComputeThreads(threadsPerMapper);
}
}
- // prepare the giraph vertex-centric computing job
- final GiraphJob job = new GiraphJob(this.giraphConfiguration, Constants.GREMLIN_HADOOP_GIRAPH_JOB_PREFIX + this.vertexProgram);
// handle input paths (if any)
String inputLocation = this.giraphConfiguration.get(Constants.GREMLIN_HADOOP_INPUT_LOCATION, null);
if (null != inputLocation && FileInputFormat.class.isAssignableFrom(this.giraphConfiguration.getClass(Constants.GREMLIN_HADOOP_GRAPH_INPUT_FORMAT, InputFormat.class))) {
@@ -185,6 +181,8 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple
}
// handle output paths
final Path outputPath = new Path(Constants.getGraphLocation(this.giraphConfiguration.get(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION)));
+ // prepare the giraph vertex-centric computing job
+ final GiraphJob job = new GiraphJob(this.giraphConfiguration, Constants.GREMLIN_HADOOP_GIRAPH_JOB_PREFIX + this.vertexProgram);
FileOutputFormat.setOutputPath(job.getInternalJob(), outputPath);
job.getInternalJob().setJarByClass(GiraphGraphComputer.class);
this.logger.info(Constants.GREMLIN_HADOOP_GIRAPH_JOB_PREFIX + this.vertexProgram);