Repository: hive Updated Branches: refs/heads/master fc3005236 -> 5efd20c7f
HIVE-15470: Catch Throwable instead of Exception in driver.execute (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/5efd20c7 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5efd20c7 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5efd20c7 Branch: refs/heads/master Commit: 5efd20c7f2837a1cc77e39cad6d164954ffb5033 Parents: fc30052 Author: Jimmy Xiang <jxi...@apache.org> Authored: Tue Dec 20 08:53:23 2016 -0800 Committer: Jimmy Xiang <jxi...@apache.org> Committed: Tue Dec 20 14:13:17 2016 -0800 ---------------------------------------------------------------------- ql/src/java/org/apache/hadoop/hive/ql/Driver.java | 2 +- ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/5efd20c7/ql/src/java/org/apache/hadoop/hive/ql/Driver.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java index 79e95cf..1bc0956 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java @@ -1950,7 +1950,7 @@ public class Driver implements CommandProcessor { } catch (CommandNeedRetryException e) { executionError = true; throw e; - } catch (Exception e) { + } catch (Throwable e) { executionError = true; if (isInterrupted()) { return handleInterruption("during query execution: \n" + e.getMessage()); http://git-wip-us.apache.org/repos/asf/hive/blob/5efd20c7/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java ---------------------------------------------------------------------- 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 0f9384a..0161c20 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 @@ -1712,7 +1712,7 @@ public final class Utilities { return -1; } - public static String getNameMessage(Exception e) { + public static String getNameMessage(Throwable e) { return e.getClass().getName() + "(" + e.getMessage() + ")"; }