You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2020/05/12 13:43:52 UTC
[hive] branch master updated: HIVE-23445 : Remove
mapreduce.workflow.* configs (Ashutosh Chauhan via Gopal V)
This is an automated email from the ASF dual-hosted git repository.
hashutosh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 57c1593 HIVE-23445 : Remove mapreduce.workflow.* configs (Ashutosh Chauhan via Gopal V)
57c1593 is described below
commit 57c15936d7a69e215c986d62aa959e70cb352da4
Author: Ashutosh Chauhan <ha...@apache.org>
AuthorDate: Mon May 11 21:33:48 2020 -0700
HIVE-23445 : Remove mapreduce.workflow.* configs (Ashutosh Chauhan via Gopal V)
---
.../java/org/apache/hadoop/hive/ql/Compiler.java | 3 ---
.../java/org/apache/hadoop/hive/ql/Executor.java | 2 --
.../org/apache/hadoop/hive/ql/exec/DagUtils.java | 4 +---
.../org/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 aa42fd5..b5e093d 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 @@ public class Compiler {
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 e9909a9..7af3cfb 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 @@ public class Executor {
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 480d679..48d8dba 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 @@ import com.google.common.base.Strings;
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 ace24be..0e4ce78 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 @@ public final class Utilities {
}
}
- public static void setWorkflowAdjacencies(Configuration conf, QueryPlan plan) {
- try {
- Graph stageGraph = plan.getQueryPlan().getStageGraph();
- if (stageGraph == null) {
- return;
- }
- List<Adjacency> adjList = stageGraph.getAdjacencyList();
- if (adjList == null) {
- return;
- }
- for (Adjacency adj : adjList) {
- List<String> 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<String> getFieldSchemaString(List<FieldSchema> fl) {
if (fl == null) {
return null;