Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Support for dynamic modification of interpreter types

Browse source
This commit is contained in:
liuxunorg 2018-12-25 13:19:52 +08:00
parent 5dbb559ad0
commit 0963a89ab5
3 changed files with 70 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
View file

@ -495,20 +495,22 @@ public class InterpreterSettingManager implements InterpreterSettingManagerMBean
return editor;
}
// Get configuration parameters from `interpreter-setting.json`
// based on the interpreter group ID
public Map<String, Object> getConfigSetting(String interpreterGroupId) {
InterpreterSetting interpreterSetting = get(interpreterGroupId);
if (null != interpreterSetting) {
List<InterpreterInfo> interpreterInfos = interpreterSetting.getInterpreterInfos();
int infoSize = interpreterInfos.size();
for (InterpreterInfo intpInfo : interpreterInfos) {
if (intpInfo.isDefaultInterpreter() || (interpreterInfos.size() == 1)) {
if (intpInfo.getConfig() != null) {
return intpInfo.getConfig();
}
if ((intpInfo.isDefaultInterpreter() || (infoSize == 1))
&& (intpInfo.getConfig() != null)) {
return intpInfo.getConfig();
}
}
}
return new HashMap<String, Object>();
return new HashMap<>();
}
public List<ManagedInterpreterGroup> getAllInterpreterGroup() {

6
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
View file

@ -248,6 +248,10 @@ public class Note implements JsonSerializable {
this.interpreterSettingManager = interpreterSettingManager;
}
InterpreterSettingManager getInterpreterSettingManager() {
return this.interpreterSettingManager;
}
void setParagraphJobListener(ParagraphJobListener paragraphJobListener) {
this.paragraphJobListener = paragraphJobListener;
}
@ -366,6 +370,8 @@ public class Note implements JsonSerializable {
public Paragraph insertNewParagraph(int index, AuthenticationInfo authenticationInfo) {
Paragraph paragraph = new Paragraph(this, paragraphJobListener);
if (null != interpreterSettingManager) {
// Set the default parameter configuration for the paragraph
// based on `interpreter-setting.json` config
Map<String, Object> config =
interpreterSettingManager.getConfigSetting(defaultInterpreterGroup);
paragraph.setConfig(config);

57
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
View file

@ -20,6 +20,7 @@ package org.apache.zeppelin.notebook;
import java.io.IOException;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@ -43,6 +44,7 @@ import org.apache.zeppelin.interpreter.Interpreter.FormType;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterFactory;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterNotFoundException;
import org.apache.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.InterpreterOutput;
@ -52,6 +54,7 @@ import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.interpreter.InterpreterResultMessage;
import org.apache.zeppelin.interpreter.InterpreterResultMessageOutput;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.interpreter.InterpreterSettingManager;
import org.apache.zeppelin.interpreter.ManagedInterpreterGroup;
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.apache.zeppelin.resource.ResourcePool;
@ -344,6 +347,7 @@ public class Paragraph extends JobWithProgressPoller<InterpreterResult> implemen
try {
this.interpreter = getBindedInterpreter();
setStatus(Status.READY);
if (getConfig().get("enabled") == null || (Boolean) getConfig().get("enabled")) {
setAuthenticationInfo(getAuthenticationInfo());
interpreter.getScheduler().submit(this);
@ -450,6 +454,21 @@ public class Paragraph extends JobWithProgressPoller<InterpreterResult> implemen
p.settings.setParams(settings.getParams());
}
// After the paragraph is executed,
// need to apply the paragraph to the configuration in the
// `interpreter-setting.json` config
InterpreterSettingManager intpSettingManager
= this.note.getInterpreterSettingManager();
if (null != intpSettingManager) {
InterpreterGroup intpGroup = interpreter.getInterpreterGroup();
if (intpGroup instanceof ManagedInterpreterGroup) {
String name = ((ManagedInterpreterGroup) intpGroup).getInterpreterSetting().getName();
Map<String, Object> config
= intpSettingManager.getConfigSetting(name);
applyConfigSetting(config);
}
}
return res;
} finally {
InterpreterContext.remove();
@ -569,6 +588,44 @@ public class Paragraph extends JobWithProgressPoller<InterpreterResult> implemen
this.config = config;
}
// apply the `interpreter-setting.json` config
// When creating a paragraph, it will update some of the configuration
// parameters of the paragraph from the web side.
// Need to deal with 2 situations
// 1. The interpreter does not have a config configuration set,
// so newConfig is equal to null, Need to be processed using the
// default parameters of the interpreter
// 2. The user manually modified the interpreter types of this paragraph.
// Need to delete the existing configuration of this paragraph,
// update with the specified interpreter configuration
public void applyConfigSetting(Map<String, Object> newConfig) {
if (null == newConfig || 0 == newConfig.size()) {
newConfig = getDefaultConfigSetting();
}
List<String> keysToRemove = Arrays.asList("fontSize", "colWidth",
"runOnSelectionChange", "title");
for (String removeKey : keysToRemove) {
if ((false == newConfig.containsKey(removeKey))
&& (true == config.containsKey(removeKey))) {
this.config.remove(removeKey);
}
}
this.config.putAll(newConfig);
}
// default parameters of the interpreter
private Map<String, Object> getDefaultConfigSetting() {
Map<String, Object> config = new HashMap<>();
config.put("fontSize", 9);
config.put("colWidth", 12);
config.put("runOnSelectionChange", true);
config.put("title", false);
return config;
}
public void setReturn(InterpreterResult value, Throwable t) {
setResult(value);
setException(t);