Return-Path: 
 <commits-return-2577-apmail-flink-commits-archive=flink.apache.org@flink.apache.org>
X-Original-To: apmail-flink-commits-archive@minotaur.apache.org
Delivered-To: apmail-flink-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 DD555107F1
	for <apmail-flink-commits-archive@minotaur.apache.org>;
 Wed,  4 Mar 2015 20:33:03 +0000 (UTC)
Received: (qmail 67640 invoked by uid 500); 4 Mar 2015 20:33:03 -0000
Delivered-To: apmail-flink-commits-archive@flink.apache.org
Received: (qmail 67559 invoked by uid 500); 4 Mar 2015 20:33:03 -0000
Mailing-List: contact commits-help@flink.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flink.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flink.apache.org>
List-Post: <mailto:commits@flink.apache.org>
List-Id: <commits.flink.apache.org>
Reply-To: dev@flink.apache.org
Delivered-To: mailing list commits@flink.apache.org
Received: (qmail 67454 invoked by uid 99); 4 Mar 2015 20:33:03 -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, 04 Mar 2015 20:33:03 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 523BAE1034; Wed,  4 Mar 2015 20:33:03 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: vasia@apache.org
To: commits@flink.apache.org
Date: Wed, 04 Mar 2015 20:33:04 -0000
Message-Id: <8e9ea608f7aa48e7a776d34c9e7be3d3@git.apache.org>
In-Reply-To: <66f43b15b7204cbc9fc9a2e55f038278@git.apache.org>
References: <66f43b15b7204cbc9fc9a2e55f038278@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/7] flink git commit: [FLINK-1522][gelly] Fixed faulty split into
 create/runVertexCentricIteration

[FLINK-1522][gelly] Fixed faulty split into create/runVertexCentricIteration

This closes #429


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8961bd19
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8961bd19
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8961bd19

Branch: refs/heads/master
Commit: 8961bd19a82e44eb8655232f37a5baadb59a964b
Parents: f329e4e
Author: andralungu <lungu.andra@gmail.com>
Authored: Wed Mar 4 00:13:08 2015 +0100
Committer: Vasia Kalavri <vasia@apache.org>
Committed: Wed Mar 4 21:03:47 2015 +0100

----------------------------------------------------------------------
 flink-staging/flink-gelly/pom.xml               | 31 ++++++++++++++++++++
 .../library/SingleSourceShortestPaths.java      |  9 +++---
 2 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/8961bd19/flink-staging/flink-gelly/pom.xml
----------------------------------------------------------------------
diff --git a/flink-staging/flink-gelly/pom.xml b/flink-staging/flink-gelly/pom.xml
index af1fcb4..8e00f98 100644
--- a/flink-staging/flink-gelly/pom.xml
+++ b/flink-staging/flink-gelly/pom.xml
@@ -52,4 +52,35 @@ under the License.
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+	<!-- See main pom.xml for explanation of profiles -->
+	<profiles>
+		<profile>
+			<id>hadoop-1</id>
+			<activation>
+				<property>
+					<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
+					<!--hadoop1--><name>hadoop.profile</name><value>1</value>
+				</property>
+			</activation>
+			<dependencies>
+				<!-- Add this here, for hadoop-2 we don't need it since we get guava transitively -->
+				<dependency>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+					<version>${guava.version}</version>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>hadoop-2</id>
+			<activation>
+				<property>
+					<!-- Please do not remove the 'hadoop2' comment. See ./tools/generate_specific_pom.sh -->
+					<!--hadoop2--><name>!hadoop.profile</name>
+				</property>
+			</activation>
+		</profile>
+	</profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/flink/blob/8961bd19/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java
index f069000..3e9a29d 100644
--- a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java
+++ b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java
@@ -45,11 +45,12 @@ public class SingleSourceShortestPaths<K extends Comparable<K> & Serializable>
 	@Override
 	public Graph<K, Double, Double> run(Graph<K, Double, Double> input) {
 
-		VertexCentricIteration<K, Double, Double, Double> iteration = input.mapVertices(
-				new InitVerticesMapper<K>(srcVertexId)).createVertexCentricIteration(new VertexDistanceUpdater<K>(),
-				new MinDistanceMessenger<K>(), maxIterations);
+		Graph<K, Double, Double> mappedInput = input.mapVertices(new InitVerticesMapper<K>(srcVertexId));
 
-		return input.runVertexCentricIteration(iteration);
+		VertexCentricIteration<K, Double, Double, Double> iteration = mappedInput.createVertexCentricIteration(
+				new VertexDistanceUpdater<K>(), new MinDistanceMessenger<K>(), maxIterations);
+
+		return mappedInput.runVertexCentricIteration(iteration);
 	}
 
 	public static final class InitVerticesMapper<K extends Comparable<K> & Serializable>