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 E7657108C9 for ; Sun, 16 Feb 2014 03:39:46 +0000 (UTC) Received: (qmail 223 invoked by uid 500); 16 Feb 2014 03:39:44 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 185 invoked by uid 500); 16 Feb 2014 03:39:39 -0000 Mailing-List: contact commits-help@tez.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.incubator.apache.org Delivered-To: mailing list commits@tez.incubator.apache.org Received: (qmail 176 invoked by uid 99); 16 Feb 2014 03:39:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Feb 2014 03:39:35 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 16 Feb 2014 03:39:32 +0000 Received: (qmail 139 invoked by uid 99); 16 Feb 2014 03:39:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Feb 2014 03:39:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 39A5D8272F6; Sun, 16 Feb 2014 03:39:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bikas@apache.org To: commits@tez.incubator.apache.org Message-Id: <616b1b13af3c49c991563fc67f4145ce@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: TEZ-825. Fix incorrect inheritance method calls in ThreeLevels and SixLevels failing dags. (Tassapol Athiapinya via bikas) Date: Sun, 16 Feb 2014 03:39:09 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-tez Updated Branches: refs/heads/master 2480c4e2b -> 59b9bbaba TEZ-825. Fix incorrect inheritance method calls in ThreeLevels and SixLevels failing dags. (Tassapol Athiapinya via 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/59b9bbab Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/59b9bbab Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/59b9bbab Branch: refs/heads/master Commit: 59b9bbaba4fd81ce2e10b8ba53c791f690819db6 Parents: 2480c4e Author: Bikas Saha Authored: Sat Feb 15 19:38:55 2014 -0800 Committer: Bikas Saha Committed: Sat Feb 15 19:38:55 2014 -0800 ---------------------------------------------------------------------- .../org/apache/tez/test/dag/SixLevelsFailingDAG.java | 11 +++++++++++ .../org/apache/tez/test/dag/ThreeLevelsFailingDAG.java | 13 ++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/59b9bbab/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java b/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java index f74d819..f6a9d88 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java +++ b/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java @@ -18,6 +18,7 @@ package org.apache.tez.test.dag; import org.apache.hadoop.conf.Configuration; +import org.apache.tez.common.TezUtils; import org.apache.tez.dag.api.DAG; import org.apache.tez.dag.api.Vertex; import org.apache.tez.dag.api.EdgeProperty.DataMovementType; @@ -78,6 +79,16 @@ public class SixLevelsFailingDAG extends ThreeLevelsFailingDAG { addEdge(l5v3, l6v1, DataMovementType.SCATTER_GATHER); } + public static DAG createDAG(String name, + Configuration conf) throws Exception { + if (conf != null) { + payload = TezUtils.createUserPayloadFromConf(conf); + } + dag = new DAG(name); + addDAGVerticesAndEdges(); + return dag; + } + public static DAG createDAG(Configuration conf) throws Exception { return createDAG("SixLevelsFailingDAG", conf); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/59b9bbab/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java b/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java index 8062285..c740ec3 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java +++ b/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java @@ -18,6 +18,7 @@ package org.apache.tez.test.dag; import org.apache.hadoop.conf.Configuration; +import org.apache.tez.common.TezUtils; import org.apache.tez.dag.api.DAG; import org.apache.tez.dag.api.Vertex; import org.apache.tez.dag.api.EdgeProperty.DataMovementType; @@ -58,7 +59,17 @@ public class ThreeLevelsFailingDAG extends TwoLevelsFailingDAG { addEdge(l2v3, l3v2, DataMovementType.SCATTER_GATHER); addEdge(l2v4, l3v2, DataMovementType.SCATTER_GATHER); } - + + public static DAG createDAG(String name, + Configuration conf) throws Exception { + if (conf != null) { + payload = TezUtils.createUserPayloadFromConf(conf); + } + dag = new DAG(name); + addDAGVerticesAndEdges(); + return dag; + } + public static DAG createDAG(Configuration conf) throws Exception { return createDAG("ThreeLevelsFailingDAG", conf); }