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

Handle output update in angular mode

Browse source
This commit is contained in:
Lee moon soo 2016-04-14 03:48:10 +01:00
parent 0e4d81c841
commit fade3c1f0f
5 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
View file

@ -837,8 +837,6 @@ public class SparkInterpreter extends Interpreter {
Object lastObj = getValue(varName);
if (lastObj != null) {
logger.info("Put LastValue {} {} {} into ResourcePool",
varName, lastObj, lastObj.getClass().getName());
ResourcePool resourcePool = context.getResourcePool();
resourcePool.put(context.getNoteId(), context.getParagraphId(),
WellKnownResourceName.ZeppelinReplResult.toString(), lastObj);

9
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutput.java
View file

@ -21,6 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collections;
import java.util.LinkedList;
@ -153,11 +154,7 @@ public class InterpreterOutput extends OutputStream {
* @throws IOException
*/
public void write(URL url) throws IOException {
if ("file".equals(url.getProtocol())) {
write(new File(url.getPath()));
} else {
outList.add(url);
}
outList.add(url);
}
public void addResourceSearchPath(String path) {
@ -168,8 +165,6 @@ public class InterpreterOutput extends OutputStream {
// search file under provided paths first, for dev mode
for (String path : resourceSearchPaths) {
File res = new File(path + "/" + resourceName);
logger.info("path = " + path + ", res = " + resourceName);
logger.info("Search resource " + res.getAbsolutePath());
if (res.isFile()) {
write(res);
return;

4
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/dev/DevInterpreter.java
View file

@ -114,4 +114,8 @@ public class DevInterpreter extends Interpreter {
public void setInterpreterEvent(InterpreterEvent event) {
this.interpreterEvent = event;
}
public InterpreterEvent getInterpreterEvent() {
return interpreterEvent;
}
}

1
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/dev/ZeppelinApplicationDevServer.java
View file

@ -92,6 +92,7 @@ public class ZeppelinApplicationDevServer extends ZeppelinDevServer {
try {
logger.info("Run " + className);
app.context().out.clear();
app.context().out.setType(InterpreterResult.Type.ANGULAR);
app.run();
} catch (ApplicationException e) {

10
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
View file

@ -812,9 +812,17 @@ public class RemoteInterpreterServer
} else {
try {
app.context().out.clear();
app.context().out.setType(InterpreterResult.Type.ANGULAR);
app.run();
String output = new String(app.context().out.toByteArray());
logger.info("Update app output " + output);
eventClient.onAppOutputUpdate(
app.context().getNoteId(),
app.context().getParagraphId(),
applicationInstanceId,
output);
return new RemoteApplicationResult(true, "");
} catch (ApplicationException e) {
} catch (ApplicationException | IOException e) {
return new RemoteApplicationResult(false, e.getMessage());
}
}