Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-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 2B03C1726C for ; Wed, 6 May 2015 01:04:58 +0000 (UTC) Received: (qmail 81686 invoked by uid 500); 6 May 2015 01:04:58 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 81651 invoked by uid 500); 6 May 2015 01:04:58 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 81642 invoked by uid 99); 6 May 2015 01:04:58 -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 May 2015 01:04:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CA559E1086; Wed, 6 May 2015 01:04:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjffdu@apache.org To: commits@tez.apache.org Message-Id: <214ba9064bd0493183854438826c21a2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tez git commit: Revert part of change of TEZ-2221 (zjffdu) Date: Wed, 6 May 2015 01:04:57 +0000 (UTC) Repository: tez Updated Branches: refs/heads/branch-0.6 4b6537699 -> 6702d928b Revert part of change of TEZ-2221 (zjffdu) (cherry picked from commit 406bba9ac86b8c0e265c2b1850928de477ce0250) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/6702d928 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6702d928 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6702d928 Branch: refs/heads/branch-0.6 Commit: 6702d928b7651049b8cec39f558e7891fafe769b Parents: 4b65376 Author: Jeff Zhang Authored: Wed May 6 09:00:33 2015 +0800 Committer: Jeff Zhang Committed: Wed May 6 09:04:40 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/6702d928/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 e79ef43..db2cb39 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 urisForCredentials = new HashSet(); Credentials credentials = new Credentials(); Set vertexGroups = Sets.newHashSet(); - // to verify the vertex Group memberSet should be unique - private Set> vertexGroupMemberSets = Sets.newHashSet(); Set groupInputEdges = Sets.newHashSet(); private Map dagConf = new HashMap(); @@ -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 memberNames = - Collections2.transform(Lists.newArrayList(members), new Function() { - @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/6702d928/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 ccd0d62..31ced71 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 @@ -38,13 +38,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"); @@ -52,13 +46,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); + }