Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C6635F855 for ; Sun, 28 Apr 2013 20:37:15 +0000 (UTC) Received: (qmail 17946 invoked by uid 500); 28 Apr 2013 20:37:15 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 17912 invoked by uid 500); 28 Apr 2013 20:37:15 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 17903 invoked by uid 99); 28 Apr 2013 20:37:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Apr 2013 20:37:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Apr 2013 20:37:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F016E23888CD; Sun, 28 Apr 2013 20:36:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1476830 - in /hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql: Driver.java exec/Utilities.java Date: Sun, 28 Apr 2013 20:36:46 -0000 To: commits@hive.apache.org From: hashutosh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130428203646.F016E23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hashutosh Date: Sun Apr 28 20:36:46 2013 New Revision: 1476830 URL: http://svn.apache.org/r1476830 Log: HIVE-3708 : Add mapreduce workflow information to job configuration (Billie Rinaldi via Ashutosh Chauhan) Modified: hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/Driver.java hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Modified: hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/Driver.java URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/Driver.java?rev=1476830&r1=1476829&r2=1476830&view=diff ============================================================================== --- hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/Driver.java (original) +++ hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/Driver.java Sun Apr 28 20:36:46 2013 @@ -1056,6 +1056,10 @@ public class Driver implements CommandPr conf.setVar(HiveConf.ConfVars.HIVEQUERYID, queryId); conf.setVar(HiveConf.ConfVars.HIVEQUERYSTRING, queryStr); + + conf.set("mapreduce.workflow.id", "hive_"+queryId); + conf.set("mapreduce.workflow.name", queryStr); + maxthreads = HiveConf.getIntVar(conf, HiveConf.ConfVars.EXECPARALLETHREADNUMBER); try { @@ -1334,6 +1338,8 @@ public class Driver implements CommandPr if (noName) { conf.setVar(HiveConf.ConfVars.HADOOPJOBNAME, jobname + "(" + tsk.getId() + ")"); } + conf.set("mapreduce.workflow.node.name", tsk.getId()); + Utilities.setWorkflowAdjacencies(conf, plan); cxt.incCurJobNo(1); console.printInfo("Launching Job " + cxt.getCurJobNo() + " out of " + jobs); } Modified: hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1476830&r1=1476829&r2=1476830&view=diff ============================================================================== --- hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java (original) +++ hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Sun Apr 28 20:36:46 2013 @@ -121,6 +121,8 @@ import org.apache.hadoop.hive.ql.plan.Ma import org.apache.hadoop.hive.ql.plan.PartitionDesc; import org.apache.hadoop.hive.ql.plan.PlanUtils; import org.apache.hadoop.hive.ql.plan.PlanUtils.ExpressionTypes; +import org.apache.hadoop.hive.ql.plan.api.Adjacency; +import org.apache.hadoop.hive.ql.plan.api.Graph; import org.apache.hadoop.hive.ql.plan.TableDesc; import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.ql.stats.StatsFactory; @@ -229,6 +231,25 @@ public final class Utilities { } } + public static void setWorkflowAdjacencies(Configuration conf, QueryPlan plan) { + try { + Graph stageGraph = plan.getQueryPlan().getStageGraph(); + if (stageGraph == null) + return; + List adjList = stageGraph.getAdjacencyList(); + if (adjList == null) + return; + for (Adjacency adj : adjList) { + List children = adj.getChildren(); + if (children == null || children.isEmpty()) + return; + conf.setStrings("mapreduce.workflow.adjacency."+adj.getNode(), + children.toArray(new String[children.size()])); + } + } catch (IOException e) { + } + } + public static List getFieldSchemaString(List fl) { if (fl == null) { return null;