You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2016/06/02 05:48:31 UTC
incubator-zeppelin git commit: [HOTFIX] ZEPPELIN-931: fix interpreter
listing bug
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 999abe54b -> 7c50cacc8
[HOTFIX] ZEPPELIN-931: fix interpreter listing bug
### What is this PR for?
Currently available interpreter list is not shown in `Creating New Interpreter` section. It seems this bug was generated after #835 was merged. So I temporally deactivated [3 SerializedName code lines](https://github.com/apache/incubator-zeppelin/pull/945/commits/6d7f1bc43437e8a876eef1a3e36a17fbd5805cb1).
### What type of PR is it?
Bug Fix
### Todos
* [x] - Fix interpreter listing bug when creating new interpreter
### What is the Jira issue?
[ZEPPELIN-931](https://issues.apache.org/jira/browse/ZEPPELIN-931)
### How should this be tested?
1. Build latest master branch and browse Zeppelin home
2. Create new interpreter -> You can not see the available interpreter list in this step like below attached screenshot
3. Apply this patch
4. Build again and browse -> You can see the available interpreter list as normal
### Screenshots (if appropriate)
- **Before**
<img width="1273" alt="screen shot 2016-06-01 at 12 36 42 pm" src="https://cloud.githubusercontent.com/assets/10060731/15723066/9082435e-27f5-11e6-9783-df44638dbbec.png">
- **After**
<img width="1273" alt="screen shot 2016-06-01 at 12 33 06 pm" src="https://cloud.githubusercontent.com/assets/10060731/15723067/92bcc8ce-27f5-11e6-82f5-6c0db7b4342c.png">
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: AhyoungRyu <fb...@hanmail.net>
Author: Jongyoul Lee <jo...@gmail.com>
Author: Ah young <fb...@nflabs.com>
Closes #945 from AhyoungRyu/ZEPPELIN-931 and squashes the following commits:
711eb54 [Ah young] Merge pull request #2 from jongyoul/ZEPPELIN-931
6121f9b [Jongyoul Lee] - Fixed documentation
6e7dac9 [Ah young] Merge pull request #1 from jongyoul/ZEPPELIN-931
fed1b40 [Jongyoul Lee] - Fixed fieldName in interpreter-setting.json
6d7f1bc [AhyoungRyu] ZEPPELIN-931: fix interpreter listing bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/7c50cacc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/7c50cacc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/7c50cacc
Branch: refs/heads/master
Commit: 7c50cacc840bcf330475caa390d6a9d6ab3c324e
Parents: 999abe5
Author: AhyoungRyu <fb...@hanmail.net>
Authored: Wed Jun 1 21:52:16 2016 -0700
Committer: Jongyoul Lee <jo...@apache.org>
Committed: Thu Jun 2 14:48:13 2016 +0900
----------------------------------------------------------------------
docs/development/writingzeppelininterpreter.md | 6 ++--
.../src/main/resources/interpreter-setting.json | 30 ++++++++++----------
.../zeppelin/interpreter/Interpreter.java | 6 ++--
3 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/7c50cacc/docs/development/writingzeppelininterpreter.md
----------------------------------------------------------------------
diff --git a/docs/development/writingzeppelininterpreter.md b/docs/development/writingzeppelininterpreter.md
index e7bf635..04b2bb9 100644
--- a/docs/development/writingzeppelininterpreter.md
+++ b/docs/development/writingzeppelininterpreter.md
@@ -47,9 +47,9 @@ Here is an example of `interpareter-setting.json` on your own interpreter.
```json
[
{
- "interpreterGroup": "your-group",
- "interpreterName": "your-name",
- "interpreterClassName": "your.own.interpreter.class",
+ "group": "your-group",
+ "name": "your-name",
+ "className": "your.own.interpreter.class",
"properties": {
"propertiies1": {
"envName": null,
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/7c50cacc/spark/src/main/resources/interpreter-setting.json
----------------------------------------------------------------------
diff --git a/spark/src/main/resources/interpreter-setting.json b/spark/src/main/resources/interpreter-setting.json
index ee7a192..1d36a29 100644
--- a/spark/src/main/resources/interpreter-setting.json
+++ b/spark/src/main/resources/interpreter-setting.json
@@ -1,8 +1,8 @@
[
{
- "interpreterGroup": "spark",
- "interpreterName": "spark",
- "interpreterClassName": "org.apache.zeppelin.spark.SparkInterpreter",
+ "group": "spark",
+ "name": "spark",
+ "className": "org.apache.zeppelin.spark.SparkInterpreter",
"properties": {
"spark.executor.memory": {
"envName": null,
@@ -56,9 +56,9 @@
}
},
{
- "interpreterGroup": "spark",
- "interpreterName": "sql",
- "interpreterClassName": "org.apache.zeppelin.spark.SparkSqlInterpreter",
+ "group": "spark",
+ "name": "sql",
+ "className": "org.apache.zeppelin.spark.SparkSqlInterpreter",
"properties": {
"zeppelin.spark.concurrentSQL": {
"envName": "ZEPPELIN_SPARK_CONCURRENTSQL",
@@ -81,9 +81,9 @@
}
},
{
- "interpreterGroup": "spark",
- "interpreterName": "dep",
- "interpreterClassName": "org.apache.zeppelin.spark.DepInterpreter",
+ "group": "spark",
+ "name": "dep",
+ "className": "org.apache.zeppelin.spark.DepInterpreter",
"properties": {
"zeppelin.dep.localrepo": {
"envName": "ZEPPELIN_DEP_LOCALREPO",
@@ -100,9 +100,9 @@
}
},
{
- "interpreterGroup": "spark",
- "interpreterName": "pyspark",
- "interpreterClassName": "org.apache.zeppelin.spark.PySparkInterpreter",
+ "group": "spark",
+ "name": "pyspark",
+ "className": "org.apache.zeppelin.spark.PySparkInterpreter",
"properties": {
"zeppelin.pyspark.python": {
"envName": "PYSPARK_PYTHON",
@@ -113,9 +113,9 @@
}
},
{
- "interpreterGroup": "spark",
- "interpreterName": "r",
- "interpreterClassName": "org.apache.zeppelin.spark.SparkRInterpreter",
+ "group": "spark",
+ "name": "r",
+ "className": "org.apache.zeppelin.spark.SparkRInterpreter",
"properties": {
"zeppelin.R.knitr": {
"envName": "ZEPPELIN_R_KNITR",
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/7c50cacc/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
index 5ad0980..62155ee 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
@@ -225,11 +225,11 @@ public abstract class Interpreter {
* Represent registered interpreter class
*/
public static class RegisteredInterpreter {
- @SerializedName("interpreterGroup")
+ //@SerializedName("interpreterGroup")
private String group;
- @SerializedName("interpreterName")
+ //@SerializedName("interpreterName")
private String name;
- @SerializedName("interpreterClassName")
+ //@SerializedName("interpreterClassName")
private String className;
private Map<String, InterpreterProperty> properties;
private String path;