Repository: hive Updated Branches: refs/heads/master 51769dca0 -> cb771bb19
HIVE-15564: set task's jobID with hadoop map reduce job ID for PartialScanTask, MergeFileTask and ColumnTruncateTask (Zhihai Xu via Jimmy Xiang) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1a716072 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1a716072 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1a716072 Branch: refs/heads/master Commit: 1a716072fd3c95415280c755a1309e929a6fa0e0 Parents: 51769dc Author: Zhihai Xu <zhihaixu2...@gmail.com> Authored: Wed Jan 11 08:04:19 2017 -0800 Committer: Jimmy Xiang <jxi...@apache.org> Committed: Wed Jan 11 08:04:19 2017 -0800 ---------------------------------------------------------------------- ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java | 3 +-- .../apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java | 3 +-- .../hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1a716072/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java b/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java index b3b6431..da99c23 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java @@ -154,7 +154,7 @@ public class MergeFileTask extends Task<MergeFileWork> implements Serializable, // Finally SUBMIT the JOB! rj = jc.submitJob(job); - + this.jobID = rj.getJobID(); returnVal = jobExecHelper.progress(rj, jc, ctx); success = (returnVal == 0); @@ -183,7 +183,6 @@ public class MergeFileTask extends Task<MergeFileWork> implements Serializable, if (returnVal != 0) { rj.killJob(); } - jobID = rj.getID().toString(); } // get the list of Dynamic partition paths if (rj != null) { http://git-wip-us.apache.org/repos/asf/hive/blob/1a716072/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java index dcd0e97..90b1dff 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java @@ -222,7 +222,7 @@ public class PartialScanTask extends Task<PartialScanWork> implements // Finally SUBMIT the JOB! rj = jc.submitJob(job); - + this.jobID = rj.getJobID(); returnVal = jobExecHelper.progress(rj, jc, ctx); success = (returnVal == 0); @@ -252,7 +252,6 @@ public class PartialScanTask extends Task<PartialScanWork> implements if (returnVal != 0) { rj.killJob(); } - jobID = rj.getID().toString(); } } catch (Exception e) { LOG.warn("Failed in cleaning up ", e); http://git-wip-us.apache.org/repos/asf/hive/blob/1a716072/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java index fcfcf2f..8e89b71 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java @@ -186,7 +186,7 @@ public class ColumnTruncateTask extends Task<ColumnTruncateWork> implements Seri // Finally SUBMIT the JOB! rj = jc.submitJob(job); - + this.jobID = rj.getJobID(); returnVal = jobExecHelper.progress(rj, jc, ctx); success = (returnVal == 0); @@ -216,7 +216,6 @@ public class ColumnTruncateTask extends Task<ColumnTruncateWork> implements Seri if (returnVal != 0) { rj.killJob(); } - jobID = rj.getID().toString(); } ColumnTruncateMapper.jobClose(outputPath, success, job, console, work.getDynPartCtx(), null);
