Merge branch 'new/separate_process_interpreter' into pyspark
Conflicts:
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/391c0081
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/391c0081
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/391c0081
Branch: refs/heads/master
Commit: 391c0081de2b3a694e8e6a0d609d98a566edefd9
Parents: 275ad76 7d3f55d
Author: Lee moon soo <[email protected]>
Authored: Wed Mar 11 15:59:32 2015 +0900
Committer: Lee moon soo <[email protected]>
Committed: Wed Mar 11 15:59:32 2015 +0900
----------------------------------------------------------------------
README.md | 22 +
bin/common.sh | 4 +
bin/interpreter.sh | 9 +-
bin/zeppelin-daemon.sh | 29 +-
conf/zeppelin-env.sh.template | 6 +-
spark/pom.xml | 13 +
.../nflabs/zeppelin/spark/SparkInterpreter.java | 5 +
.../zeppelin/spark/SparkSqlInterpreter.java | 37 +-
.../zeppelin/spark/SparkSqlInterpreterTest.java | 2 +-
testing/startSparkCluster.sh | 2 +-
.../interpreter/LazyOpenInterpreter.java | 10 +-
.../interpreter/remote/RemoteInterpreter.java | 81 +-
.../remote/RemoteInterpreterProcess.java | 114 +-
.../remote/RemoteInterpreterServer.java | 104 +-
.../remote/RemoteInterpreterUtils.java | 32 +
.../thrift/RemoteInterpreterService.java | 1353 ++++++++++++++++++
.../zeppelin/scheduler/FIFOScheduler.java | 30 +-
.../java/com/nflabs/zeppelin/scheduler/Job.java | 42 +-
.../zeppelin/scheduler/ParallelScheduler.java | 35 +-
.../zeppelin/scheduler/RemoteScheduler.java | 286 ++++
.../zeppelin/scheduler/SchedulerFactory.java | 26 +-
.../main/thrift/RemoteInterpreterService.thrift | 3 +
.../remote/RemoteInterpreterProcessTest.java | 46 +
.../remote/RemoteInterpreterServerTest.java | 57 +
.../remote/RemoteInterpreterTest.java | 156 ++
.../remote/RemoteInterpreterUtilsTest.java | 16 +
.../remote/mock/MockInterpreterA.java | 72 +
.../remote/mock/MockInterpreterB.java | 80 ++
.../zeppelin/scheduler/FIFOSchedulerTest.java | 74 +
.../scheduler/ParallelSchedulerTest.java | 49 +
.../zeppelin/scheduler/RemoteSchedulerTest.java | 90 ++
.../nflabs/zeppelin/scheduler/SleepingJob.java | 51 +
.../src/test/resources/log4j.properties | 12 +
.../nflabs/zeppelin/server/ZeppelinServer.java | 10 +-
.../nflabs/zeppelin/socket/NotebookServer.java | 2 +-
.../app/scripts/controllers/interpreter.js | 3 +-
zeppelin-web/app/views/interpreter.html | 6 +-
.../interpreter/InterpreterFactory.java | 12 +-
.../interpreter/InterpreterFactoryTest.java | 10 +-
.../nflabs/zeppelin/notebook/NotebookTest.java | 46 +-
.../zeppelin/scheduler/FIFOSchedulerTest.java | 72 -
.../scheduler/ParallelSchedulerTest.java | 49 -
.../nflabs/zeppelin/scheduler/SleepingJob.java | 51 -
43 files changed, 2852 insertions(+), 357 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/391c0081/spark/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/391c0081/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/391c0081/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java
----------------------------------------------------------------------
