diff --git ql/src/java/org/apache/hadoop/hive/ql/Driver.java ql/src/java/org/apache/hadoop/hive/ql/Driver.java index 2a6b944..eda87e3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/Driver.java +++ ql/src/java/org/apache/hadoop/hive/ql/Driver.java @@ -1162,7 +1162,8 @@ public int execute() throws CommandNeedRetryException { } - int jobs = Utilities.getMRTasks(plan.getRootTasks()).size(); + int jobs = Utilities.getMRTasks(plan.getRootTasks()).size() + + Utilities.getTezTasks(plan.getRootTasks()).size(); if (jobs > 0) { console.printInfo("Total MapReduce jobs = " + jobs); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index edb55fa..f3c34d1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -103,6 +103,7 @@ import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter; import org.apache.hadoop.hive.ql.exec.mr.ExecDriver; import org.apache.hadoop.hive.ql.exec.mr.MapRedTask; +import org.apache.hadoop.hive.ql.exec.tez.TezTask; import org.apache.hadoop.hive.ql.io.ContentSummaryInputFormat; import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils; import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat; @@ -1969,6 +1970,26 @@ public static boolean isEmptyPath(JobConf job, Path dirPath) throws Exception { return true; } + public static List getTezTasks(List> tasks) { + List tezTasks = new ArrayList(); + if (tasks != null) { + getTezTasks(tasks, tezTasks); + } + return tezTasks; + } + + private static void getTezTasks(List> tasks, List tezTasks) { + for (Task task : tasks) { + if (task instanceof TezTask && !tezTasks.contains((TezTask) task)) { + tezTasks.add((TezTask) task); + } + + if (task.getDependentTasks() != null) { + getTezTasks(task.getDependentTasks(), tezTasks); + } + } + } + public static List getMRTasks(List> tasks) { List mrTasks = new ArrayList(); if (tasks != null) {