svn commit: r1761515 - /zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html
Author: ahyoungryu Date: Tue Sep 20 02:21:35 2016 New Revision: 1761515 URL: http://svn.apache.org/viewvc?rev=1761515=rev Log: (empty) Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html?rev=1761515=1761514=1761515=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html Tue Sep 20 02:21:35 2016 @@ -4,7 +4,7 @@ Apache Zeppelin 0.7.0-SNAPSHOT Documentation: Apache Spark Interpreter for Apache Zeppelin - + @@ -206,9 +206,8 @@ limitations under the License. Overview http://spark.apache.org;>Apache Spark is a fast and general-purpose cluster computing system. -It provides high-level APIs in Java, Scala, Python and R, and an optimized engine that supports general execution graphs -Apache Spark is supported in Zeppelin with -Spark Interpreter group, which consists of five interpreters. +It provides high-level APIs in Java, Scala, Python and R, and an optimized engine that supports general execution graphs. +Apache Spark is supported in Zeppelin with Spark interpreter group which consists of below five interpreters. @@ -219,25 +218,25 @@ Spark Interpreter group, which consists %spark SparkInterpreter -Creates a SparkContext and provides a scala environment +Creates a SparkContext and provides a Scala environment -%pyspark +%spark.pyspark PySparkInterpreter -Provides a python environment +Provides a Python environment -%r +%spark.r SparkRInterpreter Provides an R environment with SparkR support -%sql +%spark.sql SparkSQLInterpreter Provides a SQL environment -%dep +%spark.dep DepInterpreter Dependency loader @@ -322,22 +321,22 @@ You can also set other Spark properties 1. Export SPARK_HOME -In conf/zeppelin-env.sh, export SPARK_HOME environment variable with your Spark installation path. +In conf/zeppelin-env.sh, export SPARK_HOME environment variable with your Spark installation path. -for example +For example, export SPARK_HOME=/usr/lib/spark -You can optionally export HADOOP_CONF_DIR and SPARK_SUBMIT_OPTIONS +You can optionally export HADOOP_CONF_DIR and SPARK_SUBMIT_OPTIONS export HADOOP_CONF_DIR=/usr/lib/hadoop export SPARK_SUBMIT_OPTIONS=--packages com.databricks:spark-csv_2.10:1.2.0 -For Windows, ensure you have winutils.exe in %HADOOP_HOME%\bin. For more details please see https://wiki.apache.org/hadoop/WindowsProblems;>Problems running Hadoop on Windows +For Windows, ensure you have winutils.exe in %HADOOP_HOME%\bin. Please see https://wiki.apache.org/hadoop/WindowsProblems;>Problems running Hadoop on Windows for the details. 2. Set master in Interpreter menu After start Zeppelin, go to Interpreter menu and edit master property in your Spark interpreter setting. The value may vary depending on your Spark cluster deployment type. -for example, +For example, local[*] in local mode @@ -346,25 +345,27 @@ You can also set other Spark properties mesos://host:5050 in Mesos cluster -Thats it. Zeppelin will work with any version of Spark and any deployment type without rebuilding Zeppelin in this way. (Zeppelin 0.5.6-incubating release works up to Spark 1.6.1 ) +Thats it. Zeppelin will work with any version of Spark and any deployment type without rebuilding Zeppelin in this way. +For the further information about Spark Zeppelin version compatibility, please refer to Available Interpreters section in https://zeppelin.apache.org/download.html;>Zeppelin download page. Note that without exporting SPARK_HOME, its running in local mode with included version of Spark. The included version may vary depending on the build profile. -SparkContext, SQLContext, ZeppelinContext +SparkContext, SQLContext, SparkSession, ZeppelinContext -SparkContext, SQLContext, ZeppelinContext are automatically created and exposed as variable names sc, sqlContext and z, respectively, both in scala and python environments. +SparkContext, SQLContext and ZeppelinContext are automatically created and exposed as variable names sc, sqlContext and z, respectively, in Scala, Python and R environments. +Staring from 0.6.1 SparkSession is available as variable spark when you are using Spark 2.x. -Note that scala / python environment shares the same SparkContext, SQLContext, ZeppelinContext instance. +Note that Scala/Python/R environment shares the same SparkContext, SQLContext and ZeppelinContext instance. Dependency Management -There are two ways to load external library in spark interpreter. First is using Interpreter setting menu and second is
zeppelin git commit: [MINOR] Doc fix for spark interpreter
Repository: zeppelin Updated Branches: refs/heads/master b8755ebb2 -> ba12ea3ed [MINOR] Doc fix for spark interpreter ### What is this PR for? Several changes on doc of spark interpreter. * %spark, %sql, %pyspark only works when spark is the default interpreter group of note. So I update the doc to use the full interpreter name. * Add SparkSession for 2.0 * Also add comments inline with other changes to explain the reason. ### What type of PR is it? [Documentation] ### Todos * [ ] - Task ### What is the Jira issue? * No jira created. ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: AhyoungRyuAuthor: Jeff Zhang Author: Jeff Zhang Closes #1398 from zjffdu/spark_doc_fix and squashes the following commits: ac01f2b [Jeff Zhang] Merge pull request #1 from AhyoungRyu/spark_doc_fix/ahyoung 5fa523f [AhyoungRyu] Fix typos 3c0f678 [AhyoungRyu] Add 'R' and refine a sentence 2336900 [AhyoungRyu] Improve spark.md 40d4b11 [Jeff Zhang] [MINOR] Doc fix 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/ba12ea3e Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ba12ea3e Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ba12ea3e Branch: refs/heads/master Commit: ba12ea3ed9930d46cdd4a4b7606e8d0cb383a879 Parents: b8755eb Author: AhyoungRyu Authored: Tue Sep 13 17:55:57 2016 +0800 Committer: AhyoungRyu Committed: Tue Sep 20 10:27:47 2016 +0900 -- docs/interpreter/spark.md | 105 + 1 file changed, 53 insertions(+), 52 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ba12ea3e/docs/interpreter/spark.md -- diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md index 90ac9b0..035a01e 100644 --- a/docs/interpreter/spark.md +++ b/docs/interpreter/spark.md @@ -1,7 +1,7 @@ --- layout: page title: "Apache Spark Interpreter for Apache Zeppelin" -description: "Apache Spark is a fast and general-purpose cluster computing system. It provides high-level APIs in Java, Scala, Python and R, and an optimized engine that supports general execution graphs." +description: "Apache Spark is a fast and general-purpose cluster computing system. It provides high-level APIs in Java, Scala, Python and R, and an optimized engine that supports general execution engine." group: interpreter ---
zeppelin git commit: ZEPPELIN-1420. java.util.ConcurrentModificationException caused by calling remove inside foreach loop
Repository: zeppelin Updated Branches: refs/heads/master 8f344db93 -> b8755ebb2 ZEPPELIN-1420. java.util.ConcurrentModificationException caused by calling remove inside foreach loop ### What is this PR for? We should use Iterator to iterate the list when we want to remove items in the middle of iteration, Otherwise will get the ConcurrentModificationException ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-1420 ### How should this be tested? No test added ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff ZhangCloses #1419 from zjffdu/ZEPPELIN-1420 and squashes the following commits: ddd0710 [Jeff Zhang] ZEPPELIN-1420. java.util.ConcurrentModificationException caused by calling remove inside foreach loop Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b8755ebb Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b8755ebb Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b8755ebb Branch: refs/heads/master Commit: b8755ebb25ad793daa6873acc2e00b8d69588188 Parents: 8f344db Author: Jeff Zhang Authored: Fri Sep 9 14:41:26 2016 +0800 Committer: Alexander Bezzubov Committed: Mon Sep 19 16:07:37 2016 +0900 -- .../zeppelin/interpreter/InterpreterFactory.java | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b8755ebb/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java -- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java index 362f76c..7732a45 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java @@ -1017,15 +1017,16 @@ public class InterpreterFactory implements InterpreterGroupFactory { public List getInterpreterSettings(String noteId) { List interpreterSettingIds = getNoteInterpreterSettingBinding(noteId); LinkedList settings = new LinkedList<>(); -synchronized (interpreterSettingIds) { - for (String id : interpreterSettingIds) { -InterpreterSetting setting = get(id); -if (setting == null) { - // interpreter setting is removed from factory. remove id from here, too - interpreterSettingIds.remove(id); -} else { - settings.add(setting); -} + +Iterator iter = interpreterSettingIds.iterator(); +while (iter.hasNext()) { + String id = iter.next(); + InterpreterSetting setting = get(id); + if (setting == null) { +// interpreter setting is removed from factory. remove id from here, too +iter.remove(); + } else { +settings.add(setting); } } return settings;
svn commit: r1761390 - in /zeppelin/site/docs/0.7.0-SNAPSHOT: interpreter/elasticsearch.html interpreter/hive.html interpreter/livy.html interpreter/markdown.html interpreter/python.html interpreter/s
Author: corneadoug Date: Mon Sep 19 06:51:41 2016 New Revision: 1761390 URL: http://svn.apache.org/viewvc?rev=1761390=rev Log: Fix dead link in docs Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/shell.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/dependencymanagement.html Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html Mon Sep 19 06:51:41 2016 @@ -437,7 +437,7 @@ delete /index/type/id Apply Zeppelin Dynamic Forms -You can leverage Zeppelin Dynamic Form inside your queries. You can use both the text input and select form parameterization features. +You can leverage Zeppelin Dynamic Form inside your queries. You can use both the text input and select form parameterization features. %elasticsearch size ${limit=10} search /index/type { query: { match_all: { } } } Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html Mon Sep 19 06:51:41 2016 @@ -330,7 +330,7 @@ limitations under the License. Apply Zeppelin Dynamic Forms -You can leverage Zeppelin Dynamic Form inside your queries. You can use both the text input and select form parameterization features. +You can leverage Zeppelin Dynamic Form inside your queries. You can use both the text input and select form parameterization features. %hive SELECT ${group_by}, count(*) as count FROM retail_demo.order_lineitems_pxf Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html Mon Sep 19 06:51:41 2016 @@ -355,7 +355,7 @@ hello(livy) Apply Zeppelin Dynamic Forms -You can leverage Zeppelin Dynamic Form. You can use both the text input and select form parameterization features. +You can leverage Zeppelin Dynamic Form. You can use both the text input and select form parameterization features. %livy.pyspark print ${group_by=product_id,product_id|product_name|customer_id|store_id} Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html Mon Sep 19 06:51:41 2016 @@ -211,13 +211,13 @@ In Zeppelin notebook, you can use In Zeppelin, Markdown interpreter is enabled by default. - + Example The following example demonstrates the basic usage of Markdown in a Zeppelin notebook. - + Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html Mon Sep 19 06:51:41 2016 @@ -286,7 +286,7 @@ limitations under the License. Pandas integration -Apache Zeppelin Table Display System provides built-in data visualization capabilities. Python interpreter leverages it to visualize Pandas DataFrames though similar z.show() API, same as with Matplotlib integration. +Apache Zeppelin Table Display System provides built-in data visualization capabilities. Python interpreter leverages it to visualize Pandas DataFrames though similar z.show() API, same as with Matplotlib integration. Example: import pandas as pd @@ -295,7 +295,7 @@ limitations under the License. SQL over Pandas DataFrames -There is a convenience %python.sql
zeppelin git commit: [ZEPPELIN-1421] Fix dead link in docs/README.md
Repository: zeppelin Updated Branches: refs/heads/master c69d21f09 -> 8f344db93 [ZEPPELIN-1421] Fix dead link in docs/README.md ### What is this PR for? There is a dead link in [docs/README.md](https://github.com/apache/zeppelin/blob/master/docs/README.md). It should be `https://zeppelin.apache.org/docs/latest/` not `https://zeppelin.apache.org/docs/latest` ### What type of PR is it? Bug Fix ### What is the Jira issue? [ZEPPELIN-1421](https://issues.apache.org/jira/browse/ZEPPELIN-1421) ### How should this be tested? - Before [https://zeppelin.apache.org/docs/latest](https://zeppelin.apache.org/docs/latest) - After [https://zeppelin.apache.org/docs/latest/](https://zeppelin.apache.org/docs/latest/) ### 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: AhyoungRyuCloses #1420 from AhyoungRyu/ZEPPELIN-1421 and squashes the following commits: 57336f8 [AhyoungRyu] Remove BASE_PATH in some docs pages 311e2ef [AhyoungRyu] Fix dead link in docs/README.md Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8f344db9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8f344db9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8f344db9 Branch: refs/heads/master Commit: 8f344db93e6cbc8a6f24b7e19c7ed26533577138 Parents: c69d21f Author: AhyoungRyu Authored: Sat Sep 10 15:40:29 2016 +0900 Committer: Damien CORNEAU Committed: Mon Sep 19 15:50:43 2016 +0900 -- docs/README.md | 2 +- docs/interpreter/elasticsearch.md | 2 +- docs/interpreter/hive.md| 2 +- docs/interpreter/livy.md| 2 +- docs/interpreter/markdown.md| 4 ++-- docs/interpreter/python.md | 4 ++-- docs/interpreter/shell.md | 2 +- docs/manual/dependencymanagement.md | 12 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8f344db9/docs/README.md -- diff --git a/docs/README.md b/docs/README.md index a0c4e96..4dc810e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ # Apache Zeppelin documentation -This README will walk you through building the documentation of Apache Zeppelin. The documentation is included here with Apache Zeppelin source code. The online documentation at [https://zeppelin.apache.org/docs/](https://zeppelin.apache.org/docs/latest) is also generated from the files found in here. +This README will walk you through building the documentation of Apache Zeppelin. The documentation is included here with Apache Zeppelin source code. The online documentation at [https://zeppelin.apache.org/docs/](https://zeppelin.apache.org/docs/latest/) is also generated from the files found in here. ## Build documentation Zeppelin is using [Jekyll](https://jekyllrb.com/) which is a static site generator and [Github Pages](https://pages.github.com/) as a site publisher. For the more details, see [help.github.com/articles/about-github-pages-and-jekyll/](https://help.github.com/articles/about-github-pages-and-jekyll/). http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8f344db9/docs/interpreter/elasticsearch.md -- diff --git a/docs/interpreter/elasticsearch.md b/docs/interpreter/elasticsearch.md index 0e59cae..7f3fb27 100644 --- a/docs/interpreter/elasticsearch.md +++ b/docs/interpreter/elasticsearch.md @@ -243,7 +243,7 @@ delete /index/type/id ``` ### Apply Zeppelin Dynamic Forms -You can leverage [Zeppelin Dynamic Form]({{BASE_PATH}}/manual/dynamicform.html) inside your queries. You can use both the `text input` and `select form` parameterization features. +You can leverage [Zeppelin Dynamic Form](../manual/dynamicform.html) inside your queries. You can use both the `text input` and `select form` parameterization features. ```bash %elasticsearch http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8f344db9/docs/interpreter/hive.md -- diff --git a/docs/interpreter/hive.md b/docs/interpreter/hive.md index feeb7a3..ba6614b 100644 --- a/docs/interpreter/hive.md +++ b/docs/interpreter/hive.md @@ -151,7 +151,7 @@ select * from my_table; You can also run multiple queries up to 10 by default. Changing these settings is not implemented yet. ### Apply Zeppelin Dynamic Forms -You can leverage [Zeppelin Dynamic Form]({{BASE_PATH}}/manual/dynamicform.html) inside your queries. You can use both the `text input` and `select form`