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

bug fix about copying library

Browse source
This commit is contained in:
astroshim 2017-03-09 02:44:16 +09:00
parent 574bd2166b
commit 60e982045f
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java
View file

@ -102,43 +102,36 @@ public class PythonInterpreter extends Interpreter implements ExecuteResultHandl
py4jLibPath = System.getProperty("user.dir") +
File.separator + "interpreter" + File.separator + ZEPPELIN_PY4JPATH;
File py4jLib = new File(py4jLibPath);
if (!py4jLib.exists()) {
if (py4jLib.exists()) {
return;
}
ClassLoader classLoader = getClass().getClassLoader();
try {
FileOutputStream outStream = new FileOutputStream(py4jLib);
IOUtils.copy(
classLoader.getResourceAsStream(ZEPPELIN_PY4JPATH),
outStream);
outStream.close();
} catch (IOException e) {
throw new InterpreterException(e);
}
copyFile(py4jLib, ZEPPELIN_PY4JPATH);
logger.info("py4j library path : {}", py4jLibPath);
}
private void createPythonScript() {
ClassLoader classLoader = getClass().getClassLoader();
File out = new File(scriptPath);
if (out.exists() && out.isDirectory()) {
throw new InterpreterException("Can't create python script " + out.getAbsolutePath());
}
copyFile(out, ZEPPELIN_PYTHON);
logger.info("File {} created", scriptPath);
}
private void copyFile(File out, String sourceFile) {
ClassLoader classLoader = getClass().getClassLoader();
try {
FileOutputStream outStream = new FileOutputStream(out);
IOUtils.copy(
classLoader.getResourceAsStream(ZEPPELIN_PYTHON),
outStream);
classLoader.getResourceAsStream(sourceFile),
outStream);
outStream.close();
} catch (IOException e) {
throw new InterpreterException(e);
}
logger.info("File {} created", scriptPath);
}
private void createGatewayServerAndStartScript() {
@ -294,7 +287,6 @@ public class PythonInterpreter extends Interpreter implements ExecuteResultHandl
@Override
public InterpreterResult interpret(String cmd, InterpreterContext contextInterpreter) {
logger.info("origial python interpreter---->" + this);
if (cmd == null || cmd.isEmpty()) {
return new InterpreterResult(Code.SUCCESS, "");
}