You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ek...@apache.org on 2013/02/05 23:34:35 UTC
git commit: GIRAPH-502: In PageRankBenchmark,
remove unneeded handling of -t 2
Updated Branches:
refs/heads/trunk 0c77d52f3 -> e91875175
GIRAPH-502: In PageRankBenchmark, remove unneeded handling of -t 2
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/e9187517
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/e9187517
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/e9187517
Branch: refs/heads/trunk
Commit: e9187517541f29f162119a2d151d9bdd98e92f49
Parents: 0c77d52
Author: Eugene Joseph Koontz <ek...@apache.org>
Authored: Tue Feb 5 12:31:14 2013 -0800
Committer: Eugene Joseph Koontz <ek...@apache.org>
Committed: Tue Feb 5 14:32:46 2013 -0800
----------------------------------------------------------------------
CHANGELOG | 2 ++
.../apache/giraph/benchmark/PageRankBenchmark.java | 5 +----
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/e9187517/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 2e25026..ae7ee7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-502: In PageRankBenchmark, remove unneeded handling of -t 2 (ekoontz)
+
GIRAPH-500: Refactor job launch code out of graph package and into job package (ereisman)
GIRAPH-493: Remove EdgeWithSource (nitay)
http://git-wip-us.apache.org/repos/asf/giraph/blob/e9187517/giraph-core/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java b/giraph-core/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
index 7ebcb93..19b08bd 100644
--- a/giraph-core/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
+++ b/giraph-core/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
@@ -197,10 +197,7 @@ public class PageRankBenchmark implements Tool {
LOG.info("Using vertex class " +
configuration.get(GiraphConstants.VERTEX_CLASS));
if (!cmd.hasOption('t') ||
- (Integer.parseInt(cmd.getOptionValue('t')) == 2)) {
- configuration.setVertexCombinerClass(
- DoubleSumCombiner.class);
- } else if (Integer.parseInt(cmd.getOptionValue('t')) == 1) {
+ (Integer.parseInt(cmd.getOptionValue('t')) == 1)) {
configuration.setVertexCombinerClass(
DoubleSumCombiner.class);
}