Repository: zeppelin
Updated Branches:
refs/heads/master e28712c48 -> 0c64d9ca6
ZEPPELIN-2942. Remove non-remote interpreter approach
### What is this PR for?
This PR is just trying to remove non-remote interpreter approach.
### What type of PR is it?
[Refactoring]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2942
### How should this be tested?
Current test is passed
### 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 #2597 from zjffdu/ZEPPELIN-2942 and squashes the following commits:
42fe419 [Jeff Zhang] ZEPPELIN-2942. Remove non-remote interpreter approach
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/0c64d9ca
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/0c64d9ca
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/0c64d9ca
Branch: refs/heads/master
Commit: 0c64d9ca676e48a749db9879fa3cebc06eb78b54
Parents: e28712c
Author: Jeff Zhang
Authored: Fri Sep 22 11:28:42 2017 +0800
Committer: Jeff Zhang
Committed: Tue Oct 10 06:32:36 2017 +0800
--
.../zeppelin/interpreter/InterpreterOption.java | 19 +
.../interpreter/InterpreterInfoSaving.java | 5 --
.../interpreter/InterpreterSetting.java | 84 ++--
.../interpreter/InterpreterSettingManager.java | 2 +-
.../interpreter/InterpreterSettingTest.java | 9 ---
.../ManagedInterpreterGroupTest.java| 1 -
.../remote/RemoteAngularObjectTest.java | 1 -
.../RemoteInterpreterOutputTestStream.java | 1 -
.../remote/RemoteInterpreterTest.java | 1 -
.../zeppelin/scheduler/RemoteSchedulerTest.java | 1 -
10 files changed, 10 insertions(+), 114 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0c64d9ca/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
index 37a0d99..e8a9225 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
@@ -28,7 +28,8 @@ public class InterpreterOption {
public static final transient String SCOPED = "scoped";
public static final transient String ISOLATED = "isolated";
- boolean remote;
+ // always set it as true, keep this field just for backward compatibility
+ boolean remote = true;
String host = null;
int port = -1;
@@ -77,14 +78,9 @@ public class InterpreterOption {
}
public InterpreterOption() {
-this(false);
}
- public InterpreterOption(boolean remote) {
-this(remote, SHARED, SHARED);
- }
-
- public InterpreterOption(boolean remote, String perUser, String perNote) {
+ public InterpreterOption(String perUser, String perNote) {
if (perUser == null) {
throw new NullPointerException("perUser can not be null.");
}
@@ -92,7 +88,6 @@ public class InterpreterOption {
throw new NullPointerException("perNote can not be null.");
}
-this.remote = remote;
this.perUser = perUser;
this.perNote = perNote;
}
@@ -112,14 +107,6 @@ public class InterpreterOption {
return option;
}
- public boolean isRemote() {
-return remote;
- }
-
- public void setRemote(boolean remote) {
-this.remote = remote;
- }
-
public String getHost() {
return host;
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0c64d9ca/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
index d7593d5..3d9c2c3 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
@@ -63,11 +63,6 @@ public class InterpreterInfoSaving implements
JsonSerializable {
if (infoSaving != null && infoSaving.interpreterSettings != null) {
for (InterpreterSetting interpreterSetting :
infoSaving.interpreterSettings.values()) {
- // Always use separate interpreter process
- // While we decided to