Skip to content

[ZEPPELIN-1069]Ignore implicit interpreter when user enter wrong interpreter name #1113

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
mwkang wants to merge 1 commit into from
Closed

[ZEPPELIN-1069]Ignore implicit interpreter when user enter wrong interpreter name #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ public Paragraph insertParagraph(int index) {
*/
private void addLastReplNameIfEmptyText(Paragraph p) {
String replName = lastReplName.get();
if (StringUtils.isEmpty(p.getText()) && StringUtils.isNotEmpty(replName)) {
if (StringUtils.isEmpty(p.getText()) && StringUtils.isNotEmpty(replName)
&& replLoader.isBinding(replName)) {
p.setText(getInterpreterName(replName) + " ");
}
}
Expand Down
14 changes: 14 additions & 0 deletions zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteInterpreterLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.LinkedList;
import java.util.List;

import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.interpreter.Constants;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.Interpreter.RegisteredInterpreter;
Expand Down Expand Up @@ -204,4 +205,17 @@ public Interpreter get(String replName) {
Optional<InterpreterSetting> getDefaultInterpreterSetting() {
return getDefaultInterpreterSetting(getInterpreterSettings());
}

boolean isBinding(String replName) {
if (StringUtils.isBlank(replName) || StringUtils.isEmpty(noteId)) {
return false;
}
List<InterpreterSetting> interpreterSettings = getInterpreterSettings();
for (InterpreterSetting interpreterSetting : interpreterSettings) {
if (interpreterSetting.getGroup().equals(replName)) {
return true;
}
}
return false;
}
}
17 changes: 17 additions & 0 deletions zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,23 @@ public void testNotePerInterpreterProcess() throws IOException {
assertNull(loaderB.getInterpreterSettings().get(0).getInterpreterGroup("noteB").get("noteB"));
}

@Test
public void testIsBinding() throws Exception {
// noteId: null
NoteInterpreterLoader loaderA = new NoteInterpreterLoader(factory);
assertFalse(loaderA.isBinding("hello"));

// noteId: not null
// interpreter group: group1, group2
loaderA.setNoteId("noteHello");
loaderA.setInterpreters(factory.getDefaultInterpreterSettingList());
assertFalse(loaderA.isBinding(""));
assertFalse(loaderA.isBinding(" "));

assertTrue(loaderA.isBinding("group1"));
assertTrue(loaderA.isBinding("group2"));
}


private void delete(File file){
if(file.isFile()) file.delete();
Expand Down