From da1d4b639e3b36547abf35c82478de2f2909e268 Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Mon, 11 May 2020 21:33:48 -0700 Subject: [PATCH] HIVE-23445 : Remove mapreduce.workflow.* configs --- .../org/apache/hadoop/hive/ql/Compiler.java | 3 --- .../org/apache/hadoop/hive/ql/Executor.java | 2 -- .../apache/hadoop/hive/ql/exec/DagUtils.java | 4 +--- .../apache/hadoop/hive/ql/exec/Utilities.java | 22 ------------------- 4 files changed, 1 insertion(+), 30 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/Compiler.java b/ql/src/java/org/apache/hadoop/hive/ql/Compiler.java index aa42fd53ff..b5e093d0fc 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/Compiler.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/Compiler.java @@ -339,9 +339,6 @@ private QueryPlan createPlan(BaseSemanticAnalyzer sem) { plan.setOptimizedCBOPlan(context.getCalcitePlan()); plan.setOptimizedQueryString(context.getOptimizedSql()); - driverContext.getConf().set("mapreduce.workflow.id", "hive_" + driverContext.getQueryId()); - driverContext.getConf().set("mapreduce.workflow.name", driverContext.getQueryString()); - // initialize FetchTask right here if (plan.getFetchTask() != null) { plan.getFetchTask().initialize(driverContext.getQueryState(), plan, null, context); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/Executor.java b/ql/src/java/org/apache/hadoop/hive/ql/Executor.java index e9909a9943..7af3cfb538 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/Executor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/Executor.java @@ -346,8 +346,6 @@ private TaskRunner launchTask(Task task, boolean noName, String jobName, int if (noName) { driverContext.getConf().set(MRJobConfig.JOB_NAME, jobName + " (" + task.getId() + ")"); } - driverContext.getConf().set(DagUtils.MAPREDUCE_WORKFLOW_NODE_NAME, task.getId()); - Utilities.setWorkflowAdjacencies(driverContext.getConf(), driverContext.getPlan()); taskQueue.incCurJobNo(1); CONSOLE.printInfo("Launching Job " + taskQueue.getCurJobNo() + " out of " + jobCount); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DagUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DagUtils.java index 480d6798c4..48d8dbac5e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DagUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/DagUtils.java @@ -26,14 +26,12 @@ public class DagUtils { - public static final String MAPREDUCE_WORKFLOW_NODE_NAME = "mapreduce.workflow.node.name"; - public static String getQueryName(Configuration conf) { String name = HiveConf.getVar(conf, HiveConf.ConfVars.HIVEQUERYNAME); if (Strings.isNullOrEmpty(name)) { return conf.get(MRJobConfig.JOB_NAME); } else { - return name + " (" + conf.get(DagUtils.MAPREDUCE_WORKFLOW_NODE_NAME) + ")"; + return name; } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index ace24be3c5..0e4ce78827 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -543,28 +543,6 @@ private static void setHasWork(Configuration conf, String name) { } } - 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 (CollectionUtils.isEmpty(children)) { - return; - } - conf.setStrings("mapreduce.workflow.adjacency." + adj.getNode(), - children.toArray(new String[0])); - } - } catch (IOException e) { - } - } - public static List getFieldSchemaString(List fl) { if (fl == null) { return null; -- 2.17.2 (Apple Git-113)