You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ac...@apache.org on 2013/04/16 07:21:11 UTC
[2/6] git commit: updated refs/heads/release-1.0.0 to 2537201
GIRAPH-634: InternalGiraphRunner with TestGraph is broken (majakabiljo)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/38f1f179
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/38f1f179
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/38f1f179
Branch: refs/heads/release-1.0.0
Commit: 38f1f179361105f925106c5a17e9cb54a068b682
Parents: b408ed1
Author: Maja Kabiljo <ma...@maja-mbp.thefacebook.com>
Authored: Mon Apr 15 12:20:11 2013 -0700
Committer: Maja Kabiljo <ma...@maja-mbp.thefacebook.com>
Committed: Mon Apr 15 12:20:33 2013 -0700
----------------------------------------------------------------------
CHANGELOG | 1 +
.../apache/giraph/utils/InternalVertexRunner.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/38f1f179/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 98d5490..149eb7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Giraph Change Log
Release 1.0.1 - unreleased
Release 1.0.0 - 2013-04-12
+ GIRAPH-634: InternalGiraphRunner with TestGraph is broken (majakabiljo)
GIRAPH-630: Convergence detection broken in
o.a.g.examples.PageRankVertex. (ssc via aching)
http://git-wip-us.apache.org/repos/asf/giraph/blob/38f1f179/giraph-core/src/main/java/org/apache/giraph/utils/InternalVertexRunner.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/InternalVertexRunner.java b/giraph-core/src/main/java/org/apache/giraph/utils/InternalVertexRunner.java
index bb60436..029cb5d 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/InternalVertexRunner.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/InternalVertexRunner.java
@@ -221,8 +221,10 @@ public class InternalVertexRunner {
File zkMgrDir = FileUtils.createTempDir(tmpDir, "_defaultZkManagerDir");
File checkpointsDir = FileUtils.createTempDir(tmpDir, "_checkpoints");
+ conf.setVertexInputFormatClass(InMemoryVertexInputFormat.class);
+
// Create and configure the job to run the vertex
- GiraphJob job = new GiraphJob(conf.getVertexClass().getName());
+ GiraphJob job = new GiraphJob(conf, conf.getVertexClass().getName());
InMemoryVertexInputFormat.setGraph(graph);