Repository: hive Updated Branches: refs/heads/llap 390cb8cd0 -> 9f999f252
HIVE-13588: NPE is thrown from MapredLocalTask.executeInChildVM (Chaoyu Tang, reviewed by Yongzhi Chen) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ba864a24 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ba864a24 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ba864a24 Branch: refs/heads/llap Commit: ba864a241b08c7916be1eefe08f7972451aeda15 Parents: 0ebcd93 Author: ctang <ct...@cloudera.com> Authored: Thu Apr 28 22:06:47 2016 -0400 Committer: ctang <ct...@cloudera.com> Committed: Thu Apr 28 22:06:47 2016 -0400 ---------------------------------------------------------------------- .../hadoop/hive/ql/exec/mr/MapredLocalTask.java | 16 ++++++++++++---- .../clientpositive/auto_sortmerge_join_8.q.out | 2 -- .../results/clientpositive/llap/tez_join_hash.q.out | 4 ---- .../results/clientpositive/tez/tez_join_hash.q.out | 4 ---- 4 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ba864a24/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java index 3c1f0de..24bf506 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java @@ -319,10 +319,18 @@ public class MapredLocalTask extends Task<MapredLocalWork> implements Serializab CachingPrintStream errPrintStream = new CachingPrintStream(System.err); - StreamPrinter outPrinter = new StreamPrinter(executor.getInputStream(), null, System.out, - OperationLog.getCurrentOperationLog().getPrintStream()); - StreamPrinter errPrinter = new StreamPrinter(executor.getErrorStream(), null, errPrintStream, - OperationLog.getCurrentOperationLog().getPrintStream()); + StreamPrinter outPrinter; + StreamPrinter errPrinter; + OperationLog operationLog = OperationLog.getCurrentOperationLog(); + if (operationLog != null) { + outPrinter = new StreamPrinter(executor.getInputStream(), null, System.out, + operationLog.getPrintStream()); + errPrinter = new StreamPrinter(executor.getErrorStream(), null, errPrintStream, + operationLog.getPrintStream()); + } else { + outPrinter = new StreamPrinter(executor.getInputStream(), null, System.out); + errPrinter = new StreamPrinter(executor.getErrorStream(), null, errPrintStream); + } outPrinter.start(); errPrinter.start(); http://git-wip-us.apache.org/repos/asf/hive/blob/ba864a24/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out index ce0590c..23a3685 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out @@ -1411,8 +1411,6 @@ PREHOOK: Input: default@bucket_small PREHOOK: Input: default@bucket_small@ds=2008-04-08 PREHOOK: Input: default@bucket_small@ds=2008-04-09 #### A masked pattern was here #### -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask -ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask POSTHOOK: query: select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket_big http://git-wip-us.apache.org/repos/asf/hive/blob/ba864a24/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out b/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out index 1fd45aa..54ca9d2 100644 --- a/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out @@ -652,10 +652,6 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask -ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask -ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask POSTHOOK: query: select key, count(*) from (select x.key as key, y.value as value from srcpart x join srcpart y on (x.key = y.key) union all http://git-wip-us.apache.org/repos/asf/hive/blob/ba864a24/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out b/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out index 2f51094..8d0aba1 100644 --- a/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out +++ b/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out @@ -638,10 +638,6 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask -ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask -ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask POSTHOOK: query: select key, count(*) from (select x.key as key, y.value as value from srcpart x join srcpart y on (x.key = y.key) union all
