Return-Path: X-Original-To: apmail-incubator-giraph-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-giraph-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6E75D9A83 for ; Mon, 20 Feb 2012 17:26:36 +0000 (UTC) Received: (qmail 69143 invoked by uid 500); 20 Feb 2012 17:26:36 -0000 Delivered-To: apmail-incubator-giraph-commits-archive@incubator.apache.org Received: (qmail 69102 invoked by uid 500); 20 Feb 2012 17:26:36 -0000 Mailing-List: contact giraph-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: giraph-dev@incubator.apache.org Delivered-To: mailing list giraph-commits@incubator.apache.org Received: (qmail 69088 invoked by uid 99); 20 Feb 2012 17:26:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Feb 2012 17:26:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Feb 2012 17:26:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 53D8E2388900; Mon, 20 Feb 2012 17:26:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1291382 - in /incubator/giraph/trunk: CHANGELOG src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java Date: Mon, 20 Feb 2012 17:26:12 -0000 To: giraph-commits@incubator.apache.org From: aching@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120220172612.53D8E2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aching Date: Mon Feb 20 17:26:11 2012 New Revision: 1291382 URL: http://svn.apache.org/viewvc?rev=1291382&view=rev Log: GIRAPH-150: PageRankBenchmark accesses wrong conf after GiraphJob is created (aching). Modified: incubator/giraph/trunk/CHANGELOG incubator/giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java Modified: incubator/giraph/trunk/CHANGELOG URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/CHANGELOG?rev=1291382&r1=1291381&r2=1291382&view=diff ============================================================================== --- incubator/giraph/trunk/CHANGELOG (original) +++ incubator/giraph/trunk/CHANGELOG Mon Feb 20 17:26:11 2012 @@ -1,6 +1,9 @@ Giraph Change Log Release 0.2.0 - unreleased + + GIRAPH-150: PageRankBenchmark accesses wrong conf after GiraphJob is + created (aching). GIRAPH-40: Added checkstyle for enforcement of code conventions. All Giraph source files now pass checkstyle. (aching) Modified: incubator/giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java?rev=1291382&r1=1291381&r2=1291382&view=diff ============================================================================== --- incubator/giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java (original) +++ incubator/giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java Mon Feb 20 17:26:11 2012 @@ -124,7 +124,8 @@ public class PageRankBenchmark extends E } else { job.setVertexClass(PageRankBenchmark.class); } - LOG.info("Using class " + BspUtils.getVertexClass(getConf()).getName()); + LOG.info("Using class " + + BspUtils.getVertexClass(job.getConfiguration()).getName()); job.setVertexInputFormatClass(PseudoRandomVertexInputFormat.class); job.setWorkerConfiguration(workers, workers, 100.0f); job.getConfiguration().setLong( @@ -142,8 +143,9 @@ public class PageRankBenchmark extends E isVerbose = true; } if (cmd.hasOption('s')) { - getConf().setInt(PageRankComputation.SUPERSTEP_COUNT, - Integer.parseInt(cmd.getOptionValue('s'))); + job.getConfiguration().setInt( + PageRankComputation.SUPERSTEP_COUNT, + Integer.parseInt(cmd.getOptionValue('s'))); } if (job.run(isVerbose)) { return 0;