You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/05/06 09:41:26 UTC
[24/50] [abbrv] tez git commit: Revert part of change of TEZ-2221
(zjffdu)
Revert part of change of TEZ-2221 (zjffdu)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/406bba9a
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/406bba9a
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/406bba9a
Branch: refs/heads/TEZ-2003
Commit: 406bba9ac86b8c0e265c2b1850928de477ce0250
Parents: 077b352
Author: Jeff Zhang <zj...@apache.org>
Authored: Wed May 6 09:00:33 2015 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Wed May 6 09:00:33 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/tez/dag/api/DAG.java | 15 ---------------
.../test/java/org/apache/tez/dag/api/TestDAG.java | 18 ++++--------------
2 files changed, 4 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/406bba9a/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 92f865d..8ee1682 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
@@ -85,8 +85,6 @@ public class DAG {
final Collection<URI> urisForCredentials = new HashSet<URI>();
Credentials credentials = new Credentials();
Set<VertexGroup> vertexGroups = Sets.newHashSet();
- // to verify the vertex Group memberSet should be unique
- private Set<Set<String>> vertexGroupMemberSets = Sets.newHashSet();
Set<GroupInputEdge> groupInputEdges = Sets.newHashSet();
@@ -181,19 +179,6 @@ public class DAG {
* @return {@link DAG}
*/
public synchronized VertexGroup createVertexGroup(String name, Vertex... members) {
- // vertex group member set should be unique
- Collection<String> memberNames =
- Collections2.transform(Lists.newArrayList(members), new Function<Vertex, String>() {
- @Override
- public String apply(Vertex v) {
- return v.getName();
- }
- });
- if (!vertexGroupMemberSets.add(Sets.newHashSet(memberNames))){
- throw new IllegalStateException(
- "VertexGroup " + memberNames + " already defined as another group!");
- }
-
// vertex group name should be unique.
VertexGroup uv = new VertexGroup(name, members);
if (!vertexGroups.add(uv)) {
http://git-wip-us.apache.org/repos/asf/tez/blob/406bba9a/tez-api/src/test/java/org/apache/tez/dag/api/TestDAG.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/dag/api/TestDAG.java b/tez-api/src/test/java/org/apache/tez/dag/api/TestDAG.java
index 245d9c0..0a66405 100644
--- a/tez-api/src/test/java/org/apache/tez/dag/api/TestDAG.java
+++ b/tez-api/src/test/java/org/apache/tez/dag/api/TestDAG.java
@@ -87,13 +87,7 @@ public class TestDAG {
DAG dag = DAG.create("testDAG");
dag.createVertexGroup("group_1", v1,v2);
- try {
- dag.createVertexGroup("group_1", v1,v2);
- Assert.fail("should fail it due to duplicated VertexGroups");
- } catch (Exception e) {
- e.printStackTrace();
- Assert.assertEquals("VertexGroup [v1, v2] already defined as another group!", e.getMessage());
- }
+
try {
dag.createVertexGroup("group_1", v2, v3);
Assert.fail("should fail it due to duplicated VertexGroups");
@@ -101,13 +95,9 @@ public class TestDAG {
e.printStackTrace();
Assert.assertEquals("VertexGroup group_1 already defined!", e.getMessage());
}
- try {
- dag.createVertexGroup("group_2", v1, v2);
- Assert.fail("should fail it due to duplicated VertexGroups");
- } catch (Exception e) {
- e.printStackTrace();
- Assert.assertEquals("VertexGroup [v1, v2] already defined as another group!", e.getMessage());
- }
+ // it is possible to create vertex group with same member but different group name
+ dag.createVertexGroup("group_2", v1, v2);
+
}
@Test(timeout = 5000)