You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2014/05/23 22:20:47 UTC
git commit: TEZ-1150. Replace String EdgeId with Edge in the Vertex
(bikas)
Repository: incubator-tez
Updated Branches:
refs/heads/master bc6579614 -> 763cb439b
TEZ-1150. Replace String EdgeId with Edge in the Vertex (bikas)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/763cb439
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/763cb439
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/763cb439
Branch: refs/heads/master
Commit: 763cb439b99faf7d7cd2bc2b27979824c502a238
Parents: bc65796
Author: Bikas Saha <bi...@apache.org>
Authored: Fri May 23 13:20:41 2014 -0700
Committer: Bikas Saha <bi...@apache.org>
Committed: Fri May 23 13:20:41 2014 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/tez/dag/api/DAG.java | 8 ++++----
.../main/java/org/apache/tez/dag/api/Vertex.java | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/763cb439/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
index 5e9c375..4483e20 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
@@ -568,12 +568,12 @@ public class DAG { // FIXME rename to Topology
.convertToDAGPlan(vertex.getVertexManagerPlugin()));
}
- for (String inEdgeId : vertex.getInputEdgeIds()) {
- vertexBuilder.addInEdgeId(inEdgeId);
+ for (Edge inEdge : vertex.getInputEdges()) {
+ vertexBuilder.addInEdgeId(inEdge.getId());
}
- for (String outEdgeId : vertex.getOutputEdgeIds()) {
- vertexBuilder.addOutEdgeId(outEdgeId);
+ for (Edge outEdge : vertex.getOutputEdges()) {
+ vertexBuilder.addOutEdgeId(outEdge.getId());
}
vertexBuilder.setTaskConfig(taskConfigBuilder);
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/763cb439/tez-api/src/main/java/org/apache/tez/dag/api/Vertex.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/Vertex.java b/tez-api/src/main/java/org/apache/tez/dag/api/Vertex.java
index 325ed91..b05a63c 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/Vertex.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/Vertex.java
@@ -54,8 +54,8 @@ public class Vertex {
private final List<Vertex> inputVertices = new ArrayList<Vertex>();
private final List<Vertex> outputVertices = new ArrayList<Vertex>();
- private final List<String> inputEdgeIds = new ArrayList<String>();
- private final List<String> outputEdgeIds = new ArrayList<String>();
+ private final List<Edge> inputEdges = new ArrayList<Edge>();
+ private final List<Edge> outputEdges = new ArrayList<Edge>();
private final Map<String, GroupInfo> groupInputs = Maps.newHashMap();
private String javaOpts = "";
@@ -255,12 +255,12 @@ public class Vertex {
void addInputVertex(Vertex inputVertex, Edge edge) {
inputVertices.add(inputVertex);
- inputEdgeIds.add(edge.getId());
+ inputEdges.add(edge);
}
void addOutputVertex(Vertex outputVertex, Edge edge) {
outputVertices.add(outputVertex);
- outputEdgeIds.add(edge.getId());
+ outputEdges.add(edge);
}
public List<Vertex> getInputVertices() {
@@ -271,12 +271,12 @@ public class Vertex {
return Collections.unmodifiableList(outputVertices);
}
- List<String> getInputEdgeIds() {
- return inputEdgeIds;
+ List<Edge> getInputEdges() {
+ return inputEdges;
}
- List<String> getOutputEdgeIds() {
- return outputEdgeIds;
+ List<Edge> getOutputEdges() {
+ return outputEdges;
}
List<RootInputLeafOutput<InputDescriptor>> getInputs() {