Return-Path: X-Original-To: apmail-giraph-commits-archive@www.apache.org Delivered-To: apmail-giraph-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB1A41070C for ; Fri, 16 Jan 2015 18:42:25 +0000 (UTC) Received: (qmail 57217 invoked by uid 500); 16 Jan 2015 18:42:27 -0000 Delivered-To: apmail-giraph-commits-archive@giraph.apache.org Received: (qmail 57191 invoked by uid 500); 16 Jan 2015 18:42:27 -0000 Mailing-List: contact commits-help@giraph.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@giraph.apache.org Delivered-To: mailing list commits@giraph.apache.org Received: (qmail 57182 invoked by uid 99); 16 Jan 2015 18:42:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jan 2015 18:42:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 552D3E03C4; Fri, 16 Jan 2015 18:42:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: maja@apache.org To: commits@giraph.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/trunk to 43de1d8 Date: Fri, 16 Jan 2015 18:42:27 +0000 (UTC) Repository: giraph Updated Branches: refs/heads/trunk 9d20d69fd -> 43de1d8cd GIRAPH-962: TextAggregatorWriter with frequency AT_THE_END writes in every superstep (mju via majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/43de1d8c Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/43de1d8c Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/43de1d8c Branch: refs/heads/trunk Commit: 43de1d8cddacf02e48cf6a7ac5a5888369e978cd Parents: 9d20d69 Author: Maja Kabiljo Authored: Fri Jan 16 10:41:34 2015 -0800 Committer: Maja Kabiljo Committed: Fri Jan 16 10:41:34 2015 -0800 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../java/org/apache/giraph/aggregators/TextAggregatorWriter.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/43de1d8c/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 6b5f59f..ad94207 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.2.0 - unreleased + GIRAPH-962: TextAggregatorWriter with frequency AT_THE_END writes in every superstep (mju via majakabiljo) + GIRAPH-967: (Strongly Connected Components) bug fix (mhan via majakabiljo) GIRAPH-980 Way to disable checkpoints for particular job and on particular supersteps (edunov) http://git-wip-us.apache.org/repos/asf/giraph/blob/43de1d8c/giraph-core/src/main/java/org/apache/giraph/aggregators/TextAggregatorWriter.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/aggregators/TextAggregatorWriter.java b/giraph-core/src/main/java/org/apache/giraph/aggregators/TextAggregatorWriter.java index 67ce5a4..f9a8d3b 100644 --- a/giraph-core/src/main/java/org/apache/giraph/aggregators/TextAggregatorWriter.java +++ b/giraph-core/src/main/java/org/apache/giraph/aggregators/TextAggregatorWriter.java @@ -114,7 +114,8 @@ public class TextAggregatorWriter */ private boolean shouldWrite(long superstep) { return (frequency == AT_THE_END && superstep == LAST_SUPERSTEP) || - (frequency != NEVER && superstep % frequency == 0); + (frequency != NEVER && frequency != AT_THE_END && + superstep % frequency == 0); } @Override