flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [41/50] [abbrv] flink git commit: [FLINK-1201] [gelly] changed ConstantFields to ForwardedFields
Date Wed, 11 Feb 2015 10:49:43 GMT
[FLINK-1201] [gelly] changed ConstantFields to ForwardedFields

This closes #335


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

Branch: refs/heads/master
Commit: c699557c148614ec8c52611e53aafef75bdcd9eb
Parents: 6296c39
Author: vasia <vasilikikalavri@gmail.com>
Authored: Mon Feb 9 18:05:29 2015 +0100
Committer: Stephan Ewen <sewen@apache.org>
Committed: Wed Feb 11 10:46:16 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/flink/graph/Graph.java          | 8 ++++----
 .../apache/flink/graph/spargel/VertexCentricIteration.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/c699557c/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
index e8b9613..55be728 100644
--- a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
+++ b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
@@ -36,8 +36,8 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.api.java.aggregation.Aggregations;
-import org.apache.flink.api.java.functions.FunctionAnnotation.ConstantFields;
-import org.apache.flink.api.java.functions.FunctionAnnotation.ConstantFieldsFirst;
+import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFields;
+import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFieldsFirst;
 import org.apache.flink.api.java.operators.DeltaIteration;
 import org.apache.flink.api.java.tuple.Tuple1;
 import org.apache.flink.api.java.tuple.Tuple2;
@@ -606,7 +606,7 @@ public class Graph<K extends Comparable<K> & Serializable,
VV extends Serializab
 		return new Graph<K, VV, EV>(this.vertices, filteredEdges, this.context);
 	}
 
-	@ConstantFieldsFirst("0->0;1->1;2->2")
+	@ForwardedFieldsFirst("0->0;1->1;2->2")
 	private static final class ProjectEdge<K extends Comparable<K> & Serializable,
VV extends Serializable, EV extends Serializable>
 			implements FlatJoinFunction<Edge<K, EV>, Vertex<K, VV>, Edge<K, EV>>
{
 		public void join(Edge<K, EV> first, Vertex<K, VV> second, Collector<Edge<K,
EV>> out) {
@@ -848,7 +848,7 @@ public class Graph<K extends Comparable<K> & Serializable,
VV extends Serializab
 		}
 	}
 
-	@ConstantFields("0->1;1->0;2->2")
+	@ForwardedFields("0->1;1->0;2->2")
 	private static final class ReverseEdgesMap<K extends Comparable<K> & Serializable,
EV extends Serializable>
 			implements MapFunction<Edge<K, EV>, Edge<K, EV>> {
 

http://git-wip-us.apache.org/repos/asf/flink/blob/c699557c/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/spargel/VertexCentricIteration.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/spargel/VertexCentricIteration.java
b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/spargel/VertexCentricIteration.java
index 9c72485..6eaa9ae 100644
--- a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/spargel/VertexCentricIteration.java
+++ b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/spargel/VertexCentricIteration.java
@@ -289,7 +289,7 @@ public class VertexCentricIteration<VertexKey extends Comparable<VertexKey>
& Se
 		}
 
 		// let the operator know that we preserve the key field
-		updates.withConstantSetFirst("0").withConstantSetSecond("0");
+		updates.withForwardedFieldsFirst("0").withForwardedFieldsSecond("0");
 		
 		return iteration.closeWith(updates, updates);
 		


Mime
View raw message