From 2e8dc0c8253ceca1472bf431372204a2ed6bd8ee Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Mon, 20 Jun 2016 16:55:27 +0530 Subject: [PATCH 1/2] increase more logs, and return appropriate error to front-end --- .../java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java index e9cf9f83c21..01b0b23703d 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java @@ -31,6 +31,7 @@ import java.util.Properties; import java.util.Set; +import org.apache.commons.lang3.StringUtils; import org.apache.zeppelin.interpreter.Interpreter; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterResult; @@ -361,11 +362,11 @@ private InterpreterResult executeSql(String propertyKey, String sql, return new InterpreterResult(Code.SUCCESS, msg.toString()); - } catch (SQLException ex) { - logger.error("Cannot run " + sql, ex); - return new InterpreterResult(Code.ERROR, ex.getMessage()); - } catch (ClassNotFoundException e) { + } catch (Exception e) { logger.error("Cannot run " + sql, e); + if (e.getMessage() == null) { + return new InterpreterResult(Code.ERROR, StringUtils.join(e.getStackTrace(), "\n")); + } return new InterpreterResult(Code.ERROR, e.getMessage()); } } From 595ebc6a64b40f8083b216bdb199f2abed1436a1 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Mon, 20 Jun 2016 23:05:10 +0530 Subject: [PATCH 2/2] have e.getStackTrace() in all cases. --- .../java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java index 01b0b23703d..6312e28fa8b 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java @@ -364,10 +364,9 @@ private InterpreterResult executeSql(String propertyKey, String sql, } catch (Exception e) { logger.error("Cannot run " + sql, e); - if (e.getMessage() == null) { - return new InterpreterResult(Code.ERROR, StringUtils.join(e.getStackTrace(), "\n")); - } - return new InterpreterResult(Code.ERROR, e.getMessage()); + StringBuilder stringBuilder = new StringBuilder(e.getClass().toString()).append("\n"); + stringBuilder.append(StringUtils.join(e.getStackTrace(), "\n")); + return new InterpreterResult(Code.ERROR, stringBuilder.toString()); } }