Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

This works in all cases

Browse source
This commit is contained in:
Prabhjyot Singh 2016-02-20 12:13:00 +05:30
parent d0519d5a02
commit 10311d3baf
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java
View file

@ -66,14 +66,18 @@ public class LivyHelper {
}
}
public InterpreterResult interpretInput(String lines,
public InterpreterResult interpretInput(String stringLines,
final InterpreterContext context,
final Map<String, Integer> userSessionMap) {
try {
// LOGGER.error("line i got::" + lines);
lines = lines.replaceAll("\\n", "\\\\n").replaceAll("\"", "\\\\\"");
// LOGGER.error("line i made::" + lines);
Map jsonMap = executeCommand(lines, context, userSessionMap);
stringLines = stringLines
.replaceAll("\\\\n", "\\\\\\\\n")
.replaceAll("\\n", "\\\\n")
.replaceAll("\\\\\"", "\\\\\\\\\"")
.replaceAll("\"", "\\\\\"");
Map jsonMap = executeCommand(stringLines, context, userSessionMap);
Integer id = ((Double) jsonMap.get("id")).intValue();
InterpreterResult res = getResultFromMap(jsonMap);
@ -99,8 +103,17 @@ public class LivyHelper {
private InterpreterResult getResultFromMap(Map jsonMap) {
if (jsonMap.get("state").equals("available")) {
if (((Map) jsonMap.get("output")).get("status").equals("error")) {
return new InterpreterResult(Code.ERROR,
gson.toJson(((Map) jsonMap.get("output")).get("traceback")));
StringBuilder errorMessage = new StringBuilder((String) ((Map) jsonMap
.get("output")).get("evalue"));
String traceback = gson.toJson(((Map) jsonMap.get("output")).get("traceback"));
if (!traceback.equals("[]")) {
errorMessage
.append("\n")
.append("traceback: \n")
.append(traceback);
}
return new InterpreterResult(Code.ERROR, errorMessage.toString());
}
if (((Map) jsonMap.get("output")).get("status").equals("ok")) {
return new InterpreterResult(Code.SUCCESS,