[2/2] zeppelin git commit: ZEPPELIN-2898. Support Yarn-Cluster for Spark Interpreter
ZEPPELIN-2898. Support Yarn-Cluster for Spark Interpreter ### What is this PR for? This is the first version for supporting yarn-cluster of `SparkInterpreter`. I just delegate all the function to `spark-submit` as yarn-cluster is natively supported by spark, we don't need to reinvent the wheel. But there's still improvement to be done in future, e.g. I put some spark specific logic in `InterpreterSetting` which is not a good practise. I plan to improve it when I refactor the `Interpreter` class (ZEPPELIN-2685). Besides that, I also add `MiniHadoopCluster` & `MiniZeppelin` which help for the integration test of yarn-client & yarn-cluster mode, otherwise I have to manually verify yarn-client & yarn-cluster mode which would easily cause regression issue in future. To be noticed: * SPARK_HOME must be specified for yarn-cluster mode * HADOOP_CONF_DIR must be specified for yarn-cluster mode ### What type of PR is it? [Feature] ### Todos * [ ] - Task ### What is the Jira issue? https://github.com/zjffdu/zeppelin/tree/ZEPPELIN-2898 ### How should this be tested? System test is added in `SparkInterpreterIT`. ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff ZhangCloses #2577 from zjffdu/ZEPPELIN-2898 and squashes the following commits: 9da7c4b [Jeff Zhang] ZEPPELIN-2898. Support Yarn-Cluster for Spark Interpreter Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5d715109 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5d715109 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5d715109 Branch: refs/heads/master Commit: 5d7151097e171c5ec9f22f150ac4ce92b5512013 Parents: d25639c Author: Jeff Zhang Authored: Mon Sep 4 21:54:56 2017 +0800 Committer: Jeff Zhang Committed: Tue Sep 19 06:40:51 2017 +0800 -- .travis.yml | 4 +- bin/common.sh | 6 +- bin/interpreter.sh | 12 +- conf/log4j_yarn_cluster.properties | 23 ++ docs/interpreter/spark.md | 2 +- .../zeppelin/python/IPythonInterpreter.java | 44 +-- .../zeppelin/spark/IPySparkInterpreter.java | 11 +- .../zeppelin/spark/PySparkInterpreter.java | 22 +- .../org/apache/zeppelin/spark/PythonUtils.java | 96 +++ .../apache/zeppelin/spark/SparkInterpreter.java | 99 +-- .../src/main/resources/interpreter-setting.json | 4 +- .../zeppelin/spark/IPySparkInterpreterTest.java | 1 + .../spark/PySparkInterpreterMatplotlibTest.java | 2 +- .../zeppelin/spark/PySparkInterpreterTest.java | 2 +- .../interpreter/InterpreterContext.java | 47 ++- zeppelin-server/pom.xml | 12 + .../zeppelin/integration/AuthenticationIT.java | 2 +- .../integration/InterpreterModeActionsIT.java | 2 +- .../integration/PersonalizeActionsIT.java | 2 +- .../zeppelin/rest/AbstractTestRestApi.java | 8 +- zeppelin-zengine/pom.xml| 286 ++- .../zeppelin/conf/ZeppelinConfiguration.java| 2 +- .../interpreter/InterpreterSetting.java | 131 - .../interpreter/InterpreterSettingManager.java | 15 +- .../remote/RemoteInterpreterEventPoller.java| 6 +- .../remote/RemoteInterpreterManagedProcess.java | 2 + .../remote/RemoteInterpreterProcess.java| 2 +- .../interpreter/AbstractInterpreterTest.java| 23 +- .../zeppelin/interpreter/MiniHadoopCluster.java | 114 .../zeppelin/interpreter/MiniZeppelin.java | 68 + .../interpreter/SparkInterpreterModeTest.java | 147 ++ .../notebook/repo/VFSNotebookRepoTest.java | 4 +- 32 files changed, 1007 insertions(+), 194 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5d715109/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 0d9e72a..4495aa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,8 @@ matrix: # Several tests were excluded from this configuration due to the following issues: # HeliumApplicationFactoryTest - https://issues.apache.org/jira/browse/ZEPPELIN-2470 # After issues are fixed these tests need to be included back by removing them from the "-Dtests.to.exclude" property -- jdk: "oraclejdk8" +- sudo: required + jdk: "oraclejdk8" dist: precise env: PYTHON="3" SCALA_VER="2.11" SPARK_VER="2.2.0" HADOOP_VER="2.6" PROFILE="-Pspark-2.2 -Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat"
[1/2] zeppelin git commit: ZEPPELIN-2898. Support Yarn-Cluster for Spark Interpreter
Repository: zeppelin Updated Branches: refs/heads/master d25639caa -> 5d7151097 http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5d715109/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java -- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java index 98a08d9..d62c308 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java @@ -73,9 +73,7 @@ public class VFSNotebookRepoTest extends AbstractInterpreterTest implements JobL @After public void tearDown() throws Exception { -if (!FileUtils.deleteQuietly(testRootDir)) { - LOG.error("Failed to delete {} ", testRootDir.getName()); -} +super.tearDown(); } @Test
svn commit: r21649 - /dev/zeppelin/zeppelin-0.7.3-rc5/
Author: minalee Date: Mon Sep 18 15:02:17 2017 New Revision: 21649 Log: Upload zeppelin-0.7.3-rc5 Added: dev/zeppelin/zeppelin-0.7.3-rc5/ dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz (with props) dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.asc dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.md5 dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.sha512 dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz (with props) dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.asc dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.md5 dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.sha512 dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3.tgz (with props) dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3.tgz.asc dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3.tgz.md5 dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3.tgz.sha512 Added: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz -- svn:mime-type = application/octet-stream Added: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.asc == --- dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.asc Mon Sep 18 15:02:17 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEEoiUpCBwcv0n4DKCJVRP5wdxy3V8FAlm/1PMACgkQVRP5wdxy +3V8cEggAslaEvtLxSHaXm8RHCXxrMaTGz/pRsCPv7i6xcr5QbbvEoz2qcZ6ZWwv0 +UIoTk5ZxMqEhviZ08a2wa3H4VJ6kGy6UOoMR9Rk5cOq+yQCvtpqorAhLbFdx3/Hq +R/qtdOGc6Yi/q4zLLMqKtLnMUeXannpeT2I9k36VSOW0r26ya+LBxNikptmtGUdt +9JBgbjh5tIFoNvnCDBvsfAl8Vm9tqw9dtOf8UcDSJjrlYv2/KeGwmxwXrCQLZn4C +cGG2qvfckWNGCdE/huA66pQMfkZRdtpZjLYN2mEMYFRmWjCVkmCyBY96CJZNdYuO +AtMQDw3x12jRKc1mhso2hz4FExw73A== +=Xrha +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.md5 == --- dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.md5 (added) +++ dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.md5 Mon Sep 18 15:02:17 2017 @@ -0,0 +1 @@ +zeppelin-0.7.3-bin-all.tgz: 6F 84 F5 58 1F 59 83 8B 63 2A 75 07 1A 21 57 CC Added: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.sha512 == --- dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.sha512 (added) +++ dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-all.tgz.sha512 Mon Sep 18 15:02:17 2017 @@ -0,0 +1 @@ +3b185c2676bc66a64a730b0e3819809b0bbdca97e20fa4396777bb7fcf922a2fd49b6537d90b3109439983c3bba12e3fcb8ccb18884c076f3753a6f31d70b6a8 zeppelin-0.7.3-bin-all.tgz Added: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz -- svn:mime-type = application/octet-stream Added: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.asc == --- dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.asc Mon Sep 18 15:02:17 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEEoiUpCBwcv0n4DKCJVRP5wdxy3V8FAlm/1h8ACgkQVRP5wdxy +3V8cHQgAiLmehncrehNs6kJip+9Ug7890t9FXWkQSF+d18zV3BkSEF4V6Jc3foFc +DUs5Y+ZSW5Y5f3RCA6hF5jr4uJv72rWjI1/1TqPoChJtf24IujUDEE2MEpYjCZ/+ +Vw5q5v941//czCVftdXgpmZeyYVg95r72C4893Ufva4un9BoFLqKF8Lpzm1Su8kO +h49Se7KYTfKu1C8gPAWqaH9cqAU8+rUqq8sPZ9JKw332pT3qsPKzsMZAA7nDCr/L +XgRniTZ9ApglGjEh6R3ch+nE80XtmcYogxBWNnjKBUZjByLYCcJ8hVaetRjVtiJP ++zaYoyUgs7/CusApGnXt6re1pJvQrQ== +=nqUv +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.md5 == --- dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.md5 (added) +++ dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.md5 Mon Sep 18 15:02:17 2017 @@ -0,0 +1 @@ +zeppelin-0.7.3-bin-netinst.tgz: 1F F9 7D CE 6E 02 41 30 5A 6D 03 C5 AA 6B 3F BD Added: dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.sha512 == --- dev/zeppelin/zeppelin-0.7.3-rc5/zeppelin-0.7.3-bin-netinst.tgz.sha512 (added) +++
[1/2] zeppelin git commit: Preparing Apache Zeppelin release 0.7.3
Repository: zeppelin Updated Branches: refs/heads/branch-0.7 abdf3352e -> 8a2b46a25 Preparing Apache Zeppelin release 0.7.3 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5d246c96 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5d246c96 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5d246c96 Branch: refs/heads/branch-0.7 Commit: 5d246c96b054dcb8854e2beb924fc2c89b767fc1 Parents: abdf335 Author: Mina LeeAuthored: Mon Sep 18 16:02:51 2017 +0200 Committer: Mina Lee Committed: Mon Sep 18 16:02:51 2017 +0200 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml| 4 ++-- elasticsearch/pom.xml| 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml| 4 ++-- geode/pom.xml| 4 ++-- hbase/pom.xml| 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml| 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- postgresql/pom.xml | 4 ++-- python/pom.xml | 4 ++-- r/pom.xml| 2 +- scalding/pom.xml | 4 ++-- scio/pom.xml | 4 ++-- scripts/docker/zeppelin/bin/Dockerfile | 2 +- shell/pom.xml| 4 ++-- spark-dependencies/pom.xml | 4 ++-- spark/pom.xml| 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml| 2 +- zeppelin-examples/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml | 4 ++-- .../zeppelin-example-clock/zeppelin-example-clock.json | 2 +- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml | 4 ++-- zeppelin-interpreter/pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml | 4 ++-- zeppelin-web/src/app/tabledata/package.json | 2 +- zeppelin-web/src/app/visualization/package.json | 2 +- zeppelin-zengine/pom.xml | 4 ++-- 40 files changed, 73 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5d246c96/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index 802ce40..b3206ed 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.7.4-SNAPSHOT +0.7.3 .. org.apache.zeppelin zeppelin-alluxio jar -0.7.4-SNAPSHOT +0.7.3 Zeppelin: Alluxio interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5d246c96/angular/pom.xml -- diff --git a/angular/pom.xml b/angular/pom.xml index 1c83fe4..5701eac 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.7.4-SNAPSHOT +0.7.3 .. org.apache.zeppelin zeppelin-angular jar - 0.7.4-SNAPSHOT + 0.7.3 Zeppelin: Angular interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5d246c96/beam/pom.xml
[2/2] zeppelin git commit: Preparing development version 0.7.4-SNAPSHOT
Preparing development version 0.7.4-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8a2b46a2 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8a2b46a2 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8a2b46a2 Branch: refs/heads/branch-0.7 Commit: 8a2b46a25bb3b50133e50d64248e2bc273446046 Parents: 5d246c9 Author: Mina LeeAuthored: Mon Sep 18 16:02:57 2017 +0200 Committer: Mina Lee Committed: Mon Sep 18 16:02:57 2017 +0200 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml| 4 ++-- elasticsearch/pom.xml| 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml| 4 ++-- geode/pom.xml| 4 ++-- hbase/pom.xml| 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml| 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- postgresql/pom.xml | 4 ++-- python/pom.xml | 4 ++-- r/pom.xml| 2 +- scalding/pom.xml | 4 ++-- scio/pom.xml | 4 ++-- scripts/docker/zeppelin/bin/Dockerfile | 2 +- shell/pom.xml| 4 ++-- spark-dependencies/pom.xml | 4 ++-- spark/pom.xml| 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml| 2 +- zeppelin-examples/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml | 4 ++-- .../zeppelin-example-clock/zeppelin-example-clock.json | 2 +- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml | 4 ++-- zeppelin-interpreter/pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml | 4 ++-- zeppelin-web/src/app/tabledata/package.json | 2 +- zeppelin-web/src/app/visualization/package.json | 2 +- zeppelin-zengine/pom.xml | 4 ++-- 40 files changed, 73 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8a2b46a2/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index b3206ed..802ce40 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.7.3 +0.7.4-SNAPSHOT .. org.apache.zeppelin zeppelin-alluxio jar -0.7.3 +0.7.4-SNAPSHOT Zeppelin: Alluxio interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8a2b46a2/angular/pom.xml -- diff --git a/angular/pom.xml b/angular/pom.xml index 5701eac..1c83fe4 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.7.3 +0.7.4-SNAPSHOT .. org.apache.zeppelin zeppelin-angular jar - 0.7.3 + 0.7.4-SNAPSHOT Zeppelin: Angular interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8a2b46a2/beam/pom.xml -- diff --git a/beam/pom.xml b/beam/pom.xml index 833da55..03748fe
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.7.3-rc5 [created] 5d246c96b
zeppelin git commit: [HOTFIX] Forward compatibility of Note class
Repository: zeppelin Updated Branches: refs/heads/branch-0.7 54eb18f41 -> abdf3352e [HOTFIX] Forward compatibility of Note class ### What is this PR for? Solving inconsistency issue of Note's dateformat between branch-0.7 and master. It's related to #2272 ### What type of PR is it? [Hot Fix] ### Todos * [x] - Support several dateformat for Note class ### What is the Jira issue? * N/A ### How should this be tested? * Sync with some remote repository ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jongyoul LeeCloses #2591 from jongyoul/hotfix/note-json-forward-compatibility and squashes the following commits: 046a245e [Jongyoul Lee] Fixed style 492e7d30 [Jongyoul Lee] Make test case more concrete 13b9aef5 [Jongyoul Lee] Added one more deserialize option 53add839 [Jongyoul Lee] Hotfix for forward compatibility of Note.class Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/abdf3352 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/abdf3352 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/abdf3352 Branch: refs/heads/branch-0.7 Commit: abdf3352e5817e2da0de29f51b72d761cabb4919 Parents: 54eb18f Author: Jongyoul Lee Authored: Mon Sep 18 13:53:44 2017 +0900 Committer: Jongyoul Lee Committed: Mon Sep 18 17:01:19 2017 +0900 -- .../java/org/apache/zeppelin/notebook/Note.java | 42 +++- .../org/apache/zeppelin/notebook/Notebook.java | 2 +- .../notebook/NotebookImportDeserializer.java| 12 ++--- .../notebook/repo/AzureNotebookRepo.java| 6 +-- .../zeppelin/notebook/repo/S3NotebookRepo.java | 2 +- .../zeppelin/notebook/repo/VFSNotebookRepo.java | 2 +- .../repo/zeppelinhub/ZeppelinHubRepo.java | 4 +- .../apache/zeppelin/notebook/ParagraphTest.java | 50 +++- 8 files changed, 69 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/abdf3352/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java -- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index 1964a08..ae0de5d 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -17,21 +17,37 @@ package org.apache.zeppelin.notebook; -import static java.lang.String.format; - +import com.google.common.base.Preconditions; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import java.io.IOException; import java.io.Serializable; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; - import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.display.AngularObject; import org.apache.zeppelin.display.AngularObjectRegistry; import org.apache.zeppelin.display.Input; -import org.apache.zeppelin.interpreter.*; +import org.apache.zeppelin.interpreter.Interpreter; +import org.apache.zeppelin.interpreter.InterpreterException; +import org.apache.zeppelin.interpreter.InterpreterFactory; +import org.apache.zeppelin.interpreter.InterpreterGroup; +import org.apache.zeppelin.interpreter.InterpreterResult; +import org.apache.zeppelin.interpreter.InterpreterResultMessage; +import org.apache.zeppelin.interpreter.InterpreterSetting; +import org.apache.zeppelin.interpreter.InterpreterSettingManager; import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry; import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; import org.apache.zeppelin.notebook.repo.NotebookRepo; @@ -42,11 +58,8 @@ import org.apache.zeppelin.scheduler.Job.Status; import org.apache.zeppelin.search.SearchService; import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.user.Credentials; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; -import com.google.gson.Gson; +import static java.lang.String.format; /** * Binded interpreters for a note @@ -59,6 +72,10 @@ public class Note implements Serializable, ParagraphJobListener { private static