Skip to content

[ZEPPELIN-1075] Merge NoteInterpreterLoader into InterpreterFactory #1102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jongyoul wants to merge 5 commits into from
Closed

[ZEPPELIN-1075] Merge NoteInterpreterLoader into InterpreterFactory #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
536059b
Duplicated all method in NoteInterpreterLoader to InterpreterFactory
jongyoul Jun 28, 2016
600de98
Removed NoteInterpreterLoader
jongyoul Jun 28, 2016
28bf520
Fixed style
jongyoul Jun 29, 2016
a2d8104
Fixed some style and removed unused codes
jongyoul Jun 30, 2016
d9816f1
Fixed related codes
jongyoul Jun 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ private void broadcastToNoteBindedInterpreter(String interpreterGroupId,
Notebook notebook = notebook();
List<Note> notes = notebook.getAllNotes();
for (Note note : notes) {
List<String> ids = note.getNoteReplLoader().getInterpreters();
List<String> ids = notebook.getInterpreterFactory().getInterpreters(note.getId());
for (String id : ids) {
if (id.equals(interpreterGroupId)) {
broadcast(note.id(), m);
Expand Down Expand Up @@ -750,8 +750,8 @@ private void angularObjectUpdated(NotebookSocket conn, HashSet<String> userAndRo
// propagate change to (Remote) AngularObjectRegistry
Note note = notebook.getNote(noteId);
if (note != null) {
List<InterpreterSetting> settings = note.getNoteReplLoader()
.getInterpreterSettings();
List<InterpreterSetting> settings = notebook.getInterpreterFactory()
.getInterpreterSettings(note.getId());
for (InterpreterSetting setting : settings) {
if (setting.getInterpreterGroup(note.id()) == null) {
continue;
Expand Down Expand Up @@ -791,8 +791,8 @@ private void angularObjectUpdated(NotebookSocket conn, HashSet<String> userAndRo
if (global) { // broadcast change to all web session that uses related
// interpreter.
for (Note n : notebook.getAllNotes()) {
List<InterpreterSetting> settings = note.getNoteReplLoader()
.getInterpreterSettings();
List<InterpreterSetting> settings = notebook.getInterpreterFactory()
.getInterpreterSettings(note.getId());
for (InterpreterSetting setting : settings) {
if (setting.getInterpreterGroup(n.id()) == null) {
continue;
Expand Down Expand Up @@ -1239,8 +1239,8 @@ public ParagraphJobListener getParagraphJobListener(Note note) {
}

private void sendAllAngularObjects(Note note, NotebookSocket conn) throws IOException {
List<InterpreterSetting> settings = note.getNoteReplLoader()
.getInterpreterSettings();
List<InterpreterSetting> settings =
notebook().getInterpreterFactory().getInterpreterSettings(note.getId());
if (settings == null || settings.size() == 0) {
return;
}
Expand Down Expand Up @@ -1279,8 +1279,8 @@ public void onUpdate(String interpreterGroupId, AngularObject object) {
continue;
}

List<InterpreterSetting> intpSettings = note.getNoteReplLoader()
.getInterpreterSettings();
List<InterpreterSetting> intpSettings = notebook.getInterpreterFactory()
.getInterpreterSettings(note.getId());
if (intpSettings.isEmpty())
continue;
for (InterpreterSetting setting : intpSettings) {
Expand All @@ -1306,7 +1306,7 @@ public void onRemove(String interpreterGroupId, String name, String noteId, Stri
continue;
}

List<String> ids = note.getNoteReplLoader().getInterpreters();
List<String> ids = notebook.getInterpreterFactory().getInterpreters(note.getId());
for (String id : ids) {
if (id.equals(interpreterGroupId)) {
broadcast(
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public void testInterpreterRestart() throws IOException, InterruptedException {


// restart interpreter
for (InterpreterSetting setting : note.getNoteReplLoader().getInterpreterSettings()) {
for (InterpreterSetting setting : ZeppelinServer.notebook.getInterpreterFactory().getInterpreterSettings(note.getId())) {
if (setting.getName().equals("md")) {
// Call Restart Interpreter REST API
PutMethod put = httpPut("/interpreter/setting/restart/" + setting.id(), "");
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent() thr

// get reference to interpreterGroup
InterpreterGroup interpreterGroup = null;
List<InterpreterSetting> settings = note1.getNoteReplLoader().getInterpreterSettings();
List<InterpreterSetting> settings = notebook.getInterpreterFactory().getInterpreterSettings(note1.getId());
for (InterpreterSetting setting : settings) {
if (setting.getName().equals("md")) {
interpreterGroup = setting.getInterpreterGroup("sharedProcess");
Expand Down
Loading