zeppelin git commit: [ZEPPELIN-1379] Flink interpreter is missing scala libraries
Repository: zeppelin
Updated Branches:
refs/heads/master 7e2a1b5d4 -> df2e77de9
[ZEPPELIN-1379] Flink interpreter is missing scala libraries
### What is this PR for?
On Flink interpreter, remove provided scope from scala libraries to enable
copying them to interpreter location.
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
[ZEPPELIN-1379](https://issues.apache.org/jira/browse/ZEPPELIN-1379)
Author: Luciano Resende
Closes #1370 from lresende/flink-dependencies and squashes the following
commits:
8e2ea20 [Luciano Resende] [ZEPPELIN-1379] Flink interpreter is missing scala
libraries
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/df2e77de
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/df2e77de
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/df2e77de
Branch: refs/heads/master
Commit: df2e77de9631cbed14f91993f7fa4a840e871c92
Parents: 7e2a1b5
Author: Luciano Resende
Authored: Fri Aug 26 12:49:19 2016 -0700
Committer: Felix Cheung
Committed: Thu Sep 1 00:21:01 2016 -0700
--
flink/pom.xml | 7 ++-
ignite/pom.xml | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/df2e77de/flink/pom.xml
--
diff --git a/flink/pom.xml b/flink/pom.xml
index f4c12d5..98713e6 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -120,21 +120,18 @@
org.scala-lang
scala-library
${scala.version}
- provided
org.scala-lang
scala-compiler
${scala.version}
- provided
org.scala-lang
scala-reflect
${scala.version}
- provided
@@ -319,7 +316,6 @@
org.apache.maven.plugins
maven-dependency-plugin
-2.4
copy-dependencies
@@ -339,10 +335,11 @@
+org.apache.maven.plugins
maven-dependency-plugin
-2.8
+copy-artifact
package
copy
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/df2e77de/ignite/pom.xml
--
diff --git a/ignite/pom.xml b/ignite/pom.xml
index 465dbc6..d70c488 100644
--- a/ignite/pom.xml
+++ b/ignite/pom.xml
@@ -116,8 +116,8 @@
+org.apache.maven.plugins
maven-dependency-plugin
-2.8
copy-dependencies
zeppelin git commit: ZEPPELIN-1384. Spark interpreter binary compatibility to scala 2.10 / 2.11 broken
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.6 7b7216338 -> 9a28d31f7
ZEPPELIN-1384. Spark interpreter binary compatibility to scala 2.10 / 2.11
broken
### What is this PR for?
As described in ZEPPELIN-1384, we may hit the following error when running
zeppelin on spark 1.6 if we build zeppelin this way
```
dev/change_scala_version.sh 2.11
mvn -DskipTests -Drat.skip=true -Pscala-2.11 -Pspark-2.0 -Dspark.version=2.0.0
-Phadoop-2.6 -Pyarn -Ppyspark -Psparkr clean package
```
```
java.lang.NoSuchMethodError:
scala.runtime.VolatileByteRef.create(B)Lscala/runtime/VolatileByteRef;
at scala.xml.MetaData$.iterate$1(MetaData.scala:39)
at scala.xml.MetaData$.normalize(MetaData.scala:45)
at scala.xml.Elem.(Elem.scala:99)
at
org.apache.spark.ui.jobs.StagePage$$anonfun$26.apply(StagePage.scala:57)
at
org.apache.spark.ui.jobs.StagePage$$anonfun$26.apply(StagePage.scala:55)
at
scala.collection.TraversableLike$$anonfun$map$1.apply(TraversableLike.scala:244)
at
scala.collection.TraversableLike$$anonfun$map$1.apply(TraversableLike.scala:244)
at scala.collection.immutable.List.foreach(List.scala:318)
at scala.collection.TraversableLike$class.map(TraversableLike.scala:244)
at scala.collection.AbstractTraversable.map(Traversable.scala:105)
at org.apache.spark.ui.jobs.StagePage.(StagePage.scala:55)
at org.apache.spark.ui.jobs.StagesTab.(StagesTab.scala:34)
at org.apache.spark.ui.SparkUI.(SparkUI.scala:57)
at org.apache.spark.ui.SparkUI$.create(SparkUI.scala:195)
at org.apache.spark.ui.SparkUI$.createLiveUI(SparkUI.scala:146)
at org.apache.spark.SparkContext.(SparkContext.scala:473)
at
org.apache.zeppelin.spark.SparkInterpreter.createSparkContext_1(SparkInterpreter.java:440)
at
org.apache.zeppelin.spark.SparkInterpreter.createSparkContext(SparkInterpreter.java:354)
at
org.apache.zeppelin.spark.SparkInterpreter.getSparkContext(SparkInterpreter.java:137)
at
org.apache.zeppelin.spark.SparkInterpreter.open(SparkInterpreter.java:743)
at
org.apache.zeppelin.interpreter.LazyOpenInterpreter.open(LazyOpenInterpreter.java:69)
at
org.apache.zeppelin.interpreter.LazyOpenInterpreter.interpret(LazyOpenInterpreter.java:93)
```
The root cause is that scala-xml is removed from scala 2.11 to a separate
library, so here we have class conflict of scala-xml api. In this PR, I make
the scope of scala-xml to be provided and also make the scope of scala-library
to be provided although it will be override in `ZEPPELIN_HOME/spark/pom.xml`
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-1384
### How should this be tested?
Tested manually.
Use the following command to build zeppelin and then run it on spark-1.6.2
```
dev/change_scala_version.sh 2.11
mvn -DskipTests -Drat.skip=true -Pscala-2.11 -Pspark-2.0 -Dspark.version=2.0.0
-Phadoop-2.6 -Pyarn -Ppyspark -Psparkr clean package
```
### 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: Jeff Zhang
Closes #1377 from zjffdu/ZEPPELIN-1384 and squashes the following commits:
eb07535 [Jeff Zhang] ZEPPELIN-1384. Spark interpreter binary compatibility to
scala 2.10 / 2.11 broken
(cherry picked from commit d93fb7361d73d1cdbf6a551b3892d4dd8c69656d)
Signed-off-by: Damien CORNEAU
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9a28d31f
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9a28d31f
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9a28d31f
Branch: refs/heads/branch-0.6
Commit: 9a28d31f78de45ecef639e813fb101326cf38107
Parents: 7b72163
Author: Jeff Zhang
Authored: Mon Aug 29 09:58:29 2016 +0800
Committer: Damien CORNEAU
Committed: Thu Sep 1 16:22:04 2016 +0900
--
zeppelin-display/pom.xml | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9a28d31f/zeppelin-display/pom.xml
--
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index 879570e..e9f3c7c 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -81,6 +81,7 @@
org.scala-lang
scala-library
${scala.version}
+ provided
@@ -99,6 +100,7 @@
org.scala-lang.modules
scala-xml_${scala.binary.version}
1.0.2
+ provided
zeppelin git commit: ZEPPELIN-1384. Spark interpreter binary compatibility to scala 2.10 / 2.11 broken
Repository: zeppelin
Updated Branches:
refs/heads/master df2e77de9 -> d93fb7361
ZEPPELIN-1384. Spark interpreter binary compatibility to scala 2.10 / 2.11
broken
### What is this PR for?
As described in ZEPPELIN-1384, we may hit the following error when running
zeppelin on spark 1.6 if we build zeppelin this way
```
dev/change_scala_version.sh 2.11
mvn -DskipTests -Drat.skip=true -Pscala-2.11 -Pspark-2.0 -Dspark.version=2.0.0
-Phadoop-2.6 -Pyarn -Ppyspark -Psparkr clean package
```
```
java.lang.NoSuchMethodError:
scala.runtime.VolatileByteRef.create(B)Lscala/runtime/VolatileByteRef;
at scala.xml.MetaData$.iterate$1(MetaData.scala:39)
at scala.xml.MetaData$.normalize(MetaData.scala:45)
at scala.xml.Elem.(Elem.scala:99)
at
org.apache.spark.ui.jobs.StagePage$$anonfun$26.apply(StagePage.scala:57)
at
org.apache.spark.ui.jobs.StagePage$$anonfun$26.apply(StagePage.scala:55)
at
scala.collection.TraversableLike$$anonfun$map$1.apply(TraversableLike.scala:244)
at
scala.collection.TraversableLike$$anonfun$map$1.apply(TraversableLike.scala:244)
at scala.collection.immutable.List.foreach(List.scala:318)
at scala.collection.TraversableLike$class.map(TraversableLike.scala:244)
at scala.collection.AbstractTraversable.map(Traversable.scala:105)
at org.apache.spark.ui.jobs.StagePage.(StagePage.scala:55)
at org.apache.spark.ui.jobs.StagesTab.(StagesTab.scala:34)
at org.apache.spark.ui.SparkUI.(SparkUI.scala:57)
at org.apache.spark.ui.SparkUI$.create(SparkUI.scala:195)
at org.apache.spark.ui.SparkUI$.createLiveUI(SparkUI.scala:146)
at org.apache.spark.SparkContext.(SparkContext.scala:473)
at
org.apache.zeppelin.spark.SparkInterpreter.createSparkContext_1(SparkInterpreter.java:440)
at
org.apache.zeppelin.spark.SparkInterpreter.createSparkContext(SparkInterpreter.java:354)
at
org.apache.zeppelin.spark.SparkInterpreter.getSparkContext(SparkInterpreter.java:137)
at
org.apache.zeppelin.spark.SparkInterpreter.open(SparkInterpreter.java:743)
at
org.apache.zeppelin.interpreter.LazyOpenInterpreter.open(LazyOpenInterpreter.java:69)
at
org.apache.zeppelin.interpreter.LazyOpenInterpreter.interpret(LazyOpenInterpreter.java:93)
```
The root cause is that scala-xml is removed from scala 2.11 to a separate
library, so here we have class conflict of scala-xml api. In this PR, I make
the scope of scala-xml to be provided and also make the scope of scala-library
to be provided although it will be override in `ZEPPELIN_HOME/spark/pom.xml`
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-1384
### How should this be tested?
Tested manually.
Use the following command to build zeppelin and then run it on spark-1.6.2
```
dev/change_scala_version.sh 2.11
mvn -DskipTests -Drat.skip=true -Pscala-2.11 -Pspark-2.0 -Dspark.version=2.0.0
-Phadoop-2.6 -Pyarn -Ppyspark -Psparkr clean package
```
### 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: Jeff Zhang
Closes #1377 from zjffdu/ZEPPELIN-1384 and squashes the following commits:
eb07535 [Jeff Zhang] ZEPPELIN-1384. Spark interpreter binary compatibility to
scala 2.10 / 2.11 broken
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d93fb736
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d93fb736
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d93fb736
Branch: refs/heads/master
Commit: d93fb7361d73d1cdbf6a551b3892d4dd8c69656d
Parents: df2e77d
Author: Jeff Zhang
Authored: Mon Aug 29 09:58:29 2016 +0800
Committer: Damien CORNEAU
Committed: Thu Sep 1 16:21:45 2016 +0900
--
zeppelin-display/pom.xml | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d93fb736/zeppelin-display/pom.xml
--
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index c30b061..7631d4f 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -81,6 +81,7 @@
org.scala-lang
scala-library
${scala.version}
+ provided
@@ -99,6 +100,7 @@
org.scala-lang.modules
scala-xml_${scala.binary.version}
1.0.2
+ provided
zeppelin git commit: [ZEPPELIN-1365] Error of Zeppelin Application in development mode.
Repository: zeppelin
Updated Branches:
refs/heads/master d93fb7361 -> c580a82ad
[ZEPPELIN-1365] Error of Zeppelin Application in development mode.
### What is this PR for?
This PR fixes the bug of running application in development mode.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1365
### How should this be tested?
1. run zeppelin
2. run org.apache.zeppelin.interpreter.dev.ZeppelinApplicationDevServer in
development mode.
(http://zeppelin.apache.org/docs/0.7.0-SNAPSHOT/development/writingzeppelinapplication.html)
3. and run paragraph like screenshot.
### 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: astroshim
Closes #1358 from astroshim/ZEPPELIN-1365 and squashes the following commits:
9f640e5 [astroshim] add argument check.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c580a82a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c580a82a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c580a82a
Branch: refs/heads/master
Commit: c580a82ad54a5f165dffa2c590c1991375fffb75
Parents: d93fb73
Author: astroshim
Authored: Wed Aug 24 23:52:45 2016 +0900
Committer: Damien CORNEAU
Committed: Thu Sep 1 16:27:41 2016 +0900
--
.../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c580a82a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
index 1730265..57dd768 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -34,6 +34,7 @@ import org.apache.zeppelin.display.*;
import org.apache.zeppelin.helium.*;
import org.apache.zeppelin.interpreter.*;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
+import org.apache.zeppelin.interpreter.dev.ZeppelinDevServer;
import org.apache.zeppelin.interpreter.thrift.*;
import org.apache.zeppelin.resource.*;
import org.apache.zeppelin.scheduler.Job;
@@ -133,7 +134,11 @@ public class RemoteInterpreterServer
public static void main(String[] args)
throws TTransportException, InterruptedException {
-int port = Integer.parseInt(args[0]);
+
+int port = ZeppelinDevServer.DEFAULT_TEST_INTERPRETER_PORT;
+if (args.length > 0) {
+ port = Integer.parseInt(args[0]);
+}
RemoteInterpreterServer remoteInterpreterServer = new
RemoteInterpreterServer(port);
remoteInterpreterServer.start();
remoteInterpreterServer.join();
zeppelin git commit: [ZEPPELIN-1365] Error of Zeppelin Application in development mode.
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.6 9a28d31f7 -> db7c11d3b
[ZEPPELIN-1365] Error of Zeppelin Application in development mode.
### What is this PR for?
This PR fixes the bug of running application in development mode.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1365
### How should this be tested?
1. run zeppelin
2. run org.apache.zeppelin.interpreter.dev.ZeppelinApplicationDevServer in
development mode.
(http://zeppelin.apache.org/docs/0.7.0-SNAPSHOT/development/writingzeppelinapplication.html)
3. and run paragraph like screenshot.
### 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: astroshim
Closes #1358 from astroshim/ZEPPELIN-1365 and squashes the following commits:
9f640e5 [astroshim] add argument check.
(cherry picked from commit c580a82ad54a5f165dffa2c590c1991375fffb75)
Signed-off-by: Damien CORNEAU
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/db7c11d3
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/db7c11d3
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/db7c11d3
Branch: refs/heads/branch-0.6
Commit: db7c11d3b62a8066b0138fd9700731c953cec1a5
Parents: 9a28d31
Author: astroshim
Authored: Wed Aug 24 23:52:45 2016 +0900
Committer: Damien CORNEAU
Committed: Thu Sep 1 16:30:11 2016 +0900
--
.../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/db7c11d3/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
index 6b4edc4..8f49777 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -32,6 +32,7 @@ import org.apache.thrift.transport.TTransportException;
import org.apache.zeppelin.display.*;
import org.apache.zeppelin.interpreter.*;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
+import org.apache.zeppelin.interpreter.dev.ZeppelinDevServer;
import org.apache.zeppelin.interpreter.thrift.*;
import org.apache.zeppelin.resource.*;
import org.apache.zeppelin.scheduler.Job;
@@ -124,7 +125,11 @@ public class RemoteInterpreterServer
public static void main(String[] args)
throws TTransportException, InterruptedException {
-int port = Integer.parseInt(args[0]);
+
+int port = ZeppelinDevServer.DEFAULT_TEST_INTERPRETER_PORT;
+if (args.length > 0) {
+ port = Integer.parseInt(args[0]);
+}
RemoteInterpreterServer remoteInterpreterServer = new
RemoteInterpreterServer(port);
remoteInterpreterServer.start();
remoteInterpreterServer.join();
zeppelin git commit: [ZEPPELIN-1391][Interpreters] print error while existing registedInterpreter with the same key but different settings
Repository: zeppelin
Updated Branches:
refs/heads/master c580a82ad -> 323aa1883
[ZEPPELIN-1391][Interpreters] print error while existing registedInterpreter
with the same key but different settings
### What is this PR for?
print error while existing registedInterpreter with the same key but different
settings.
In order to compare the property Map in the Interpreter easily,
I override the `equals` method in `InterpreterProperty` class. (and `hashCode`
at the same time)
and I fix a small error in `InterpreterProperty.toString()`, its result forgot
`}` in the end.
### What type of PR is it?
Improvement
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1391
### How should this be tested?
Existing tests.
### 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: WeichenXu
Closes #1382 from WeichenXu123/interpreter_key_error_check and squashes the
following commits:
4ef032e [WeichenXu] print error while existing registedInterpreter with the
same key but different settings
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/323aa188
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/323aa188
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/323aa188
Branch: refs/heads/master
Commit: 323aa18830ce20ddd8bae25b630661548c89a97c
Parents: c580a82
Author: WeichenXu
Authored: Sun Aug 28 00:10:50 2016 -0700
Committer: Damien CORNEAU
Committed: Thu Sep 1 17:01:30 2016 +0900
--
.../org/apache/zeppelin/interpreter/Interpreter.java| 6 +-
.../zeppelin/interpreter/InterpreterProperty.java | 12 ++--
2 files changed, 15 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/323aa188/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 07f9cba..42caafd 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
@@ -345,10 +345,14 @@ public abstract class Interpreter {
}
public static void register(RegisteredInterpreter registeredInterpreter) {
-// TODO(jongyoul): Error should occur when two same interpreter key with
different settings
String interpreterKey = registeredInterpreter.getInterpreterKey();
if (!registeredInterpreters.containsKey(interpreterKey)) {
registeredInterpreters.put(interpreterKey, registeredInterpreter);
+} else {
+ RegisteredInterpreter existInterpreter =
registeredInterpreters.get(interpreterKey);
+ if
(!existInterpreter.getProperties().equals(registeredInterpreter.getProperties()))
{
+logger.error("exist registeredInterpreter with the same key but has
different settings.");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/323aa188/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java
index 5067586..c69de5d 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java
@@ -70,6 +70,14 @@ public class InterpreterProperty {
this.description = description;
}
+ public int hashCode() {
+return this.toString().hashCode();
+ }
+
+ public boolean equals(Object o) {
+return this.toString().equals(o.toString());
+ }
+
public String getValue() {
if (envName != null && !envName.isEmpty()) {
String envValue = System.getenv().get(envName);
@@ -89,7 +97,7 @@ public class InterpreterProperty {
@Override
public String toString() {
-return String.format("{envName=%s, propertyName=%s, defaultValue=%s,
description=%20s", envName,
-propertyName, defaultValue, description);
+return String.format("{envName=%s, propertyName=%s, defaultValue=%s,
description=%20s}",
+envName, propertyName, defaultValue, description);
}
}
zeppelin git commit: [MINOR] Add new line before logging paragraph content
Repository: zeppelin
Updated Branches:
refs/heads/master 323aa1883 -> da8857fea
[MINOR] Add new line before logging paragraph content
### What is this PR for?
Add new line before logging paragraph content
### What type of PR is it?
[Improvement]
Author: Luciano Resende
Closes #1374 from lresende/debug and squashes the following commits:
0f6e80c [Luciano Resende] [MINOR] Add new line before logging paragraph content
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/da8857fe
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/da8857fe
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/da8857fe
Branch: refs/heads/master
Commit: da8857fea8edd995a8c958c77c33f411add9a660
Parents: 323aa18
Author: Luciano Resende
Authored: Sun Aug 28 16:49:02 2016 -0700
Committer: Lee moon soo
Committed: Fri Sep 2 06:14:35 2016 +1000
--
.../apache/zeppelin/interpreter/remote/RemoteInterpreter.java| 4 +++-
.../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/da8857fe/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
index db740f4..3e6fa39 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
@@ -295,7 +295,9 @@ public class RemoteInterpreter extends Interpreter {
@Override
public InterpreterResult interpret(String st, InterpreterContext context) {
-logger.debug("st: {}", st);
+if (logger.isDebugEnabled()) {
+ logger.debug("st:\n{}", st);
+}
FormType form = getFormType();
RemoteInterpreterProcess interpreterProcess = getInterpreterProcess();
Client client = null;
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/da8857fe/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
index 57dd768..7ddb928 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -285,7 +285,9 @@ public class RemoteInterpreterServer
@Override
public RemoteInterpreterResult interpret(String noteId, String className,
String st,
RemoteInterpreterContext interpreterContext) throws TException {
-logger.debug("st: {}", st);
+if (logger.isDebugEnabled()) {
+ logger.debug("st:\n{}", st);
+}
Interpreter intp = getInterpreter(noteId, className);
InterpreterContext context = convert(interpreterContext);
zeppelin git commit: Cache zeppelin-web/node_modules on travis ci and see if it reduces CI failure on npm install
Repository: zeppelin
Updated Branches:
refs/heads/master da8857fea -> 51b87927b
Cache zeppelin-web/node_modules on travis ci and see if it reduces CI failure
on npm install
### What is this PR for?
Recently CI build fails a lot on npm install on building zeppelin-web module
with network issues.
This PR tries to cache zeppelin-web/node_modules on travis and see it it helps
reducing network issues.
### What type of PR is it?
Improvement
### Todos
* [x] - Cache zeppelin-web/node_modules
Author: Lee moon soo
Closes #1285 from Leemoonsoo/cache_node_modules and squashes the following
commits:
3995f44 [Lee moon soo] trigger ci
1e2116d [Lee moon soo] trigger ci
48c175f [Lee moon soo] update cache before after_success or after_failure
5d32766 [Lee moon soo] trigger ci
aa45ed6 [Lee moon soo] echo
c027207 [Lee moon soo] cache zeppelin-web/node_modules on travis ci
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/51b87927
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/51b87927
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/51b87927
Branch: refs/heads/master
Commit: 51b87927bc876250f8e1ecd47f76ed0245bb7e9f
Parents: da8857f
Author: Lee moon soo
Authored: Thu Aug 4 22:26:27 2016 -0700
Committer: Lee moon soo
Committed: Fri Sep 2 06:45:08 2016 +1000
--
.travis.yml | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/51b87927/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 168193c..89c90a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ cache:
directories:
- .spark-dist
- ${HOME}/.m2/repository/.cache/maven-download-plugin
+- .node_modules
addons:
apt:
@@ -71,6 +72,7 @@ matrix:
before_install:
- "ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin"
+ - ls .node_modules && cp -r .node_modules zeppelin-web/node_modules || echo
"node_modules are not cached"
- mkdir -p ~/R
- echo 'R_LIBS=~/R' > ~/.Renviron
- R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org',
lib='~/R')"
@@ -89,6 +91,7 @@ before_script:
script:
- mvn $TEST_FLAG $PROFILE -B $TEST_PROJECTS
+ - rm -rf .node_modules; cp -r zeppelin-web/node_modules .node_modules
after_success:
- echo "Travis exited with ${TRAVIS_TEST_RESULT}"
@@ -104,3 +107,4 @@ after_failure:
after_script:
- ./testing/stopSparkCluster.sh $SPARK_VER $HADOOP_VER
+
zeppelin git commit: [ZEPPELIN-1366] Removed legacy JDBC alias
Repository: zeppelin
Updated Branches:
refs/heads/master 51b87927b -> fe3dbdb1c
[ZEPPELIN-1366] Removed legacy JDBC alias
### What is this PR for?
Removing old JDBC sugar
### What type of PR is it?
[Feature]
### Todos
* [x] - Removed codes to check jdbc alias enabled
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-1366
### How should this be tested?
* No longer available
* `%jdbc(mysql)` -> `%mysql`
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? Yes
* Does this needs documentation? Yes, but I don't know where the proper
location is.
Author: Jongyoul Lee
Closes #1360 from jongyoul/ZEPPELIN-1366 and squashes the following commits:
f9df86e [Jongyoul Lee] Changed description
302825c [Jongyoul Lee] Removed effectiveText and related test
929bad2 [Jongyoul Lee] Updated docs for breaking changes
e52521f [Jongyoul Lee] Removed test for jdbc sugar
9f46bbd [Jongyoul Lee] Resolved codes conflicted
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/fe3dbdb1
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/fe3dbdb1
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/fe3dbdb1
Branch: refs/heads/master
Commit: fe3dbdb1cb4c86877697736a05d685e1c27a5856
Parents: 51b8792
Author: Jongyoul Lee
Authored: Wed Aug 31 16:29:04 2016 +0900
Committer: Jongyoul Lee
Committed: Fri Sep 2 11:02:53 2016 +0900
--
docs/install/upgrade.md | 3 +-
.../zeppelin/conf/ZeppelinConfiguration.java| 8 +
.../java/org/apache/zeppelin/notebook/Note.java | 34 +++-
.../org/apache/zeppelin/notebook/Paragraph.java | 14 ++--
.../org/apache/zeppelin/notebook/NoteTest.java | 21
.../apache/zeppelin/notebook/ParagraphTest.java | 26 ---
6 files changed, 16 insertions(+), 90 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fe3dbdb1/docs/install/upgrade.md
--
diff --git a/docs/install/upgrade.md b/docs/install/upgrade.md
index 16e96e8..60a8f88 100644
--- a/docs/install/upgrade.md
+++ b/docs/install/upgrade.md
@@ -49,4 +49,5 @@ So, copying `notebook` and `conf` directory should be enough.
### Upgrading from Zeppelin 0.6 to 0.7
- - From 0.7, we don't use `ZEPPELIN_JAVA_OPTS` as default value of
`ZEPPELIN_INTP_JAVA_OPTS` and also the same for
`ZEPPELIN_MEM`/`ZEPPELIN_INTP_MEM`. If user want to configure the jvm opts of
interpreter process, please set `ZEPPELIN_INTP_JAVA_OPTS` and
`ZEPPELIN_INTP_MEM` explicitly.
\ No newline at end of file
+ - From 0.7, we don't use `ZEPPELIN_JAVA_OPTS` as default value of
`ZEPPELIN_INTP_JAVA_OPTS` and also the same for
`ZEPPELIN_MEM`/`ZEPPELIN_INTP_MEM`. If user want to configure the jvm opts of
interpreter process, please set `ZEPPELIN_INTP_JAVA_OPTS` and
`ZEPPELIN_INTP_MEM` explicitly.
+ - Mapping from `%jdbc(prefix)` to `%prefix` is no longer available. Instead,
you can use %[interpreter alias] with multiple interpreter setttings on GUI.
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fe3dbdb1/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index d146a25..d4f3186 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -427,10 +427,6 @@ public class ZeppelinConfiguration extends
XMLConfiguration {
return getString(ConfVars.ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE);
}
- public boolean getUseJdbcAlias() {
-return getBoolean(ConfVars.ZEPPELIN_USE_JDBC_ALIAS);
- }
-
public Map dumpConfigurations(ZeppelinConfiguration conf,
ConfigurationKeyPredicate
predicate) {
Map configurations = new HashMap<>();
@@ -557,9 +553,7 @@ public class ZeppelinConfiguration extends XMLConfiguration
{
ZEPPELIN_ALLOWED_ORIGINS("zeppelin.server.allowed.origins", "*"),
ZEPPELIN_ANONYMOUS_ALLOWED("zeppelin.anonymous.allowed", true),
ZEPPELIN_CREDENTIALS_PERSIST("zeppelin.credentials.persist", true),
-
ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE("zeppelin.websocket.max.text.message.size",
"1024000"),
-ZEPPELIN_USE_JDBC_ALIAS("zeppelin.use.jdbc.alias", true);
-
+
ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE("zeppelin.websocket.max.text.message.size",
"1024000");
private String varName;
zeppelin git commit: ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when available
Repository: zeppelin
Updated Branches:
refs/heads/master fe3dbdb1c -> 922364f36
ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when available
### What is this PR for?
Use absolute path for ssl truststore and keystore when available
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1319
### How should this be tested?
Config `zeppelin.ssl.truststore.path`, `zeppelin.ssl.keystore.path` and verify
whether the absolute path or the path relative to conf is used.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? n/a
* Is there breaking changes for older versions? n/a
* Does this needs documentation? n/a
Author: Renjith Kamath
Closes #1319 from r-kamath/ZEPPELIN-1319 and squashes the following commits:
5587d5a [Renjith Kamath] ZEPPELIN-1319 add check for Windows path
fc2ac9f [Renjith Kamath] ZEPPELIN-1319 Use absolute path for ssl truststore and
keystore when available
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/922364f3
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/922364f3
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/922364f3
Branch: refs/heads/master
Commit: 922364f36e50fff8d52d3158281dd9e303bf7c3b
Parents: fe3dbdb
Author: Renjith Kamath
Authored: Thu Aug 25 17:06:53 2016 +0530
Committer: Prabhjyot Singh
Committed: Fri Sep 2 09:50:37 2016 +0530
--
.../zeppelin/conf/ZeppelinConfiguration.java| 22 +---
1 file changed, 15 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/922364f3/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index d4f3186..864b149 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -272,10 +272,15 @@ public class ZeppelinConfiguration extends
XMLConfiguration {
}
public String getKeyStorePath() {
-return getRelativeDir(
-String.format("%s/%s",
-getConfDir(),
-getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH)));
+String path = getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH);
+if (path != null && path.startsWith("/") || isWindowsPath(path)) {
+ return path;
+} else {
+ return getRelativeDir(
+ String.format("%s/%s",
+ getConfDir(),
+ getString(path)));
+}
}
public String getKeyStoreType() {
@@ -297,10 +302,13 @@ public class ZeppelinConfiguration extends
XMLConfiguration {
public String getTrustStorePath() {
String path = getString(ConfVars.ZEPPELIN_SSL_TRUSTSTORE_PATH);
-if (path == null) {
- return getKeyStorePath();
+if (path != null && path.startsWith("/") || isWindowsPath(path)) {
+ return path;
} else {
- return getRelativeDir(path);
+ return getRelativeDir(
+ String.format("%s/%s",
+ getConfDir(),
+ getString(path)));
}
}
zeppelin git commit: ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when available
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.6 db7c11d3b -> 7d3ee991e
ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when available
### What is this PR for?
Use absolute path for ssl truststore and keystore when available
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1319
### How should this be tested?
Config `zeppelin.ssl.truststore.path`, `zeppelin.ssl.keystore.path` and verify
whether the absolute path or the path relative to conf is used.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? n/a
* Is there breaking changes for older versions? n/a
* Does this needs documentation? n/a
Author: Renjith Kamath
Closes #1319 from r-kamath/ZEPPELIN-1319 and squashes the following commits:
5587d5a [Renjith Kamath] ZEPPELIN-1319 add check for Windows path
fc2ac9f [Renjith Kamath] ZEPPELIN-1319 Use absolute path for ssl truststore and
keystore when available
(cherry picked from commit 922364f36e50fff8d52d3158281dd9e303bf7c3b)
Signed-off-by: Prabhjyot Singh
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7d3ee991
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7d3ee991
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7d3ee991
Branch: refs/heads/branch-0.6
Commit: 7d3ee991e99a339fc00de5c53ea6070b0ea94158
Parents: db7c11d
Author: Renjith Kamath
Authored: Thu Aug 25 17:06:53 2016 +0530
Committer: Prabhjyot Singh
Committed: Fri Sep 2 09:50:58 2016 +0530
--
.../zeppelin/conf/ZeppelinConfiguration.java| 22 +---
1 file changed, 15 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7d3ee991/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index 23ba68d..04bdfc8 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -272,10 +272,15 @@ public class ZeppelinConfiguration extends
XMLConfiguration {
}
public String getKeyStorePath() {
-return getRelativeDir(
-String.format("%s/%s",
-getConfDir(),
-getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH)));
+String path = getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH);
+if (path != null && path.startsWith("/") || isWindowsPath(path)) {
+ return path;
+} else {
+ return getRelativeDir(
+ String.format("%s/%s",
+ getConfDir(),
+ getString(path)));
+}
}
public String getKeyStoreType() {
@@ -297,10 +302,13 @@ public class ZeppelinConfiguration extends
XMLConfiguration {
public String getTrustStorePath() {
String path = getString(ConfVars.ZEPPELIN_SSL_TRUSTSTORE_PATH);
-if (path == null) {
- return getKeyStorePath();
+if (path != null && path.startsWith("/") || isWindowsPath(path)) {
+ return path;
} else {
- return getRelativeDir(path);
+ return getRelativeDir(
+ String.format("%s/%s",
+ getConfDir(),
+ getString(path)));
}
}
