Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-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 0C4A519837 for ; Wed, 6 Apr 2016 14:27:53 +0000 (UTC) Received: (qmail 14352 invoked by uid 500); 6 Apr 2016 14:27:53 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 14318 invoked by uid 500); 6 Apr 2016 14:27:52 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 14309 invoked by uid 99); 6 Apr 2016 14:27:52 -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; Wed, 06 Apr 2016 14:27:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9793DFDE0; Wed, 6 Apr 2016 14:27:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: srowen@apache.org To: commits@spark.apache.org Message-Id: <24b9e58698ca46d1b231848a9e9bbd3a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: Added omitted word in error message Date: Wed, 6 Apr 2016 14:27:52 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master 25a4c8e0c -> 24015199f Added omitted word in error message ## What changes were proposed in this pull request? Added an omitted word in the error message displayed by the Graphx Pregel API when `maxIterations <= 0` ## How was this patch tested? Manual test Author: Victor Chima Closes #12205 from blazy2k9/hotfix/pregel-error-message. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/24015199 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/24015199 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/24015199 Branch: refs/heads/master Commit: 24015199f46b5934d3000960538539495e025acf Parents: 25a4c8e Author: Victor Chima Authored: Wed Apr 6 15:27:46 2016 +0100 Committer: Sean Owen Committed: Wed Apr 6 15:27:46 2016 +0100 ---------------------------------------------------------------------- graphx/src/main/scala/org/apache/spark/graphx/Pregel.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/24015199/graphx/src/main/scala/org/apache/spark/graphx/Pregel.scala ---------------------------------------------------------------------- diff --git a/graphx/src/main/scala/org/apache/spark/graphx/Pregel.scala b/graphx/src/main/scala/org/apache/spark/graphx/Pregel.scala index d2e51d2..646462b 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/Pregel.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/Pregel.scala @@ -119,7 +119,7 @@ object Pregel extends Logging { mergeMsg: (A, A) => A) : Graph[VD, ED] = { - require(maxIterations > 0, s"Maximum of iterations must be greater than 0," + + require(maxIterations > 0, s"Maximum number of iterations must be greater than 0," + s" but got ${maxIterations}") var g = graph.mapVertices((vid, vdata) => vprog(vid, vdata, initialMsg)).cache() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org