You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/11/03 17:48:57 UTC
[10/14] incubator-tinkerpop git commit: a small tweak to maintain the
configuration as it was prior to Giraph getting its little hands on it.
a small tweak to maintain the configuration as it was prior to Giraph getting its little hands on it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f9d1fa72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f9d1fa72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f9d1fa72
Branch: refs/heads/TINKERPOP3-909
Commit: f9d1fa726dd82d2ebee770d9d321425c91a6e268
Parents: cf0c456
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Oct 30 18:26:24 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Oct 30 18:26:24 2015 -0600
----------------------------------------------------------------------
.../gremlin/giraph/process/computer/GiraphGraphComputer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f9d1fa72/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 0389750..67e8ea3 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
@@ -114,6 +114,7 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple
public Future<ComputerResult> submit() {
final long startTime = System.currentTimeMillis();
super.validateStatePriorToExecution();
+ final Configuration apacheConfiguration = ConfUtil.makeApacheConfiguration(this.giraphConfiguration);
return CompletableFuture.<ComputerResult>supplyAsync(() -> {
try {
final FileSystem fs = FileSystem.get(this.giraphConfiguration);
@@ -126,7 +127,7 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple
}
this.memory.setRuntime(System.currentTimeMillis() - startTime);
- return new DefaultComputerResult(InputOutputHelper.getOutputGraph(ConfUtil.makeApacheConfiguration(this.giraphConfiguration), this.resultGraph, this.persist), this.memory.asImmutable());
+ return new DefaultComputerResult(InputOutputHelper.getOutputGraph(apacheConfiguration, this.resultGraph, this.persist), this.memory.asImmutable());
});
}