Repository: zeppelin Updated Branches: refs/heads/master 93531b515 -> adf83a3f5
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java index e870442..23ffed1 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java @@ -373,35 +373,6 @@ public class InterpreterRestApiTest extends AbstractTestRestApi { delete.releaseConnection(); } - @Test - public void testGetMetadataInfo() throws IOException { - String jsonRequest = "{\"name\":\"spark_new\",\"group\":\"spark\"," + - "\"properties\":{\"propname\": {\"value\": \"propvalue\", \"name\": \"propname\", " + - "\"type\": \"textarea\"}}," + - "\"interpreterGroup\":[{\"class\":\"org.apache.zeppelin.markdown.Markdown\"," + - "\"name\":\"md\"}],\"dependencies\":[]," + - "\"option\": { \"remote\": true, \"session\": false }}"; - PostMethod post = httpPost("/interpreter/setting/", jsonRequest); - InterpreterSetting created = convertResponseToInterpreterSetting( - post.getResponseBodyAsString()); - String settingId = created.getId(); - Map<String, String> infos = new java.util.HashMap<>(); - infos.put("key1", "value1"); - infos.put("key2", "value2"); - ZeppelinServer.notebook.getInterpreterSettingManager().get(settingId).setInfos(infos); - GetMethod get = httpGet("/interpreter/metadata/" + settingId); - assertThat(get, isAllowed()); - JsonObject body = getBodyFieldFromResponse(get.getResponseBodyAsString()); - assertEquals(body.entrySet().size(), infos.size()); - java.util.Map.Entry<String, JsonElement> item = body.entrySet().iterator().next(); - if (item.getKey().equals("key1")) { - assertEquals(item.getValue().getAsString(), "value1"); - } else { - assertEquals(item.getValue().getAsString(), "value2"); - } - get.releaseConnection(); - } - private JsonObject getBodyFieldFromResponse(String rawResponse) { JsonObject response = gson.fromJson(rawResponse, JsonElement.class).getAsJsonObject(); return response.getAsJsonObject("body"); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-web/src/app/interpreter/interpreter.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/interpreter/interpreter.controller.js b/zeppelin-web/src/app/interpreter/interpreter.controller.js index ef6b8a5..3465871 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.controller.js +++ b/zeppelin-web/src/app/interpreter/interpreter.controller.js @@ -762,27 +762,6 @@ function InterpreterCtrl($rootScope, $scope, $http, baseUrlSrv, ngToast, $timeou getRepositories(); }; - $scope.showSparkUI = function(settingId) { - $http.get(baseUrlSrv.getRestApiBase() + '/interpreter/metadata/' + settingId) - .then(function(res) { - if (res.data.body === undefined) { - BootstrapDialog.alert({ - message: 'No spark application running', - }); - return; - } - if (res.data.body.url) { - window.open(res.data.body.url, '_blank'); - } else { - BootstrapDialog.alert({ - message: _.escape(res.data.body.message), - }); - } - }).catch(function(res) { - console.log('Error %o %o', res.status, res.data ? res.data.message : ''); - }); - }; - $scope.getInterpreterBindingModeDocsLink = function() { const currentVersion = $rootScope.zeppelinVersion; return `https://zeppelin.apache.org/docs/${currentVersion}/usage/interpreter/interpreter_binding_mode.html`; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-web/src/app/interpreter/interpreter.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html index c1d90cc..bd63aa6 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.html +++ b/zeppelin-web/src/app/interpreter/interpreter.html @@ -125,10 +125,6 @@ limitations under the License. </h3> <span style="float:right" ng-show="!valueform.$visible" > <button class="btn btn-default btn-xs" - ng-click="showSparkUI(setting.id)" - ng-show="setting.group == 'spark'"> - <span class="fa fa-external-link"></span> spark ui</button> - <button class="btn btn-default btn-xs" ng-click="valueform.$show(); copyOriginInterpreterSettingProperties(setting.id)"> <span class="fa fa-pencil"></span> edit</button> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java index 5bfd69c..b5596e2 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java @@ -121,8 +121,6 @@ public class InterpreterSetting { private transient ApplicationEventListener appEventListener; private transient DependencyResolver dependencyResolver; - private transient Map<String, String> infos; - // Map of the note and paragraphs which has runtime infos generated by this interpreter setting. // This map is used to clear the infos in paragraph when the interpretersetting is restarted private transient Map<String, Set<String>> runtimeInfosToBeCleared; @@ -493,7 +491,6 @@ public class InterpreterSetting { } interpreterGroups.clear(); this.runtimeInfosToBeCleared = null; - this.infos = null; } public void setProperties(Object object) { @@ -640,14 +637,6 @@ public class InterpreterSetting { this.interpreterInfos = interpreterInfos; } - public void setInfos(Map<String, String> infos) { - this.infos = infos; - } - - public Map<String, String> getInfos() { - return infos; - } - public InterpreterRunner getInterpreterRunner() { return interpreterRunner; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java index d81e490..ff65c3a 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java @@ -840,8 +840,6 @@ public class InterpreterSettingManager implements InterpreterSettingManagerMBean // Check if dependency in specified path is changed // If it did, overwrite old dependency jar with new one if (intpSetting != null) { - // clean up metaInfos - intpSetting.setInfos(null); copyDependenciesFromLocalPath(intpSetting); intpSetting.closeInterpreters(user, noteId); } else { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java index 24df1c6..573319b 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java @@ -296,22 +296,6 @@ public class RemoteInterpreterEventServer implements RemoteInterpreterEventServi } @Override - public void sendMetaInfo(String intpGroupId, String json) throws TException { - InterpreterGroup interpreterGroup = - interpreterSettingManager.getInterpreterGroupById(intpGroupId); - if (interpreterGroup == null) { - throw new TException("Invalid InterpreterGroupId: " + intpGroupId); - } - - Map<String, String> metaInfos = gson.fromJson(json, - new TypeToken<Map<String, String>>() { - }.getType()); - String settingId = RemoteInterpreterUtils. - getInterpreterSettingId(interpreterGroup.getId()); - listener.onMetaInfosReceived(settingId, metaInfos); - } - - @Override public void sendParagraphInfo(String intpGroupId, String json) throws TException { InterpreterGroup interpreterGroup = interpreterSettingManager.getInterpreterGroupById(intpGroupId); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java index ec6b1ec..ac7fa1e 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java @@ -30,7 +30,6 @@ public interface RemoteInterpreterProcessListener { public void onOutputUpdated( String noteId, String paragraphId, int index, InterpreterResult.Type type, String output); public void onOutputClear(String noteId, String paragraphId); - public void onMetaInfosReceived(String settingId, Map<String, String> metaInfos); void runParagraphs(String noteId, List<Integer> paragraphIndices, List<String> paragraphIds, String curParagraphId) throws IOException; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java index aa6ccf0..5e1cb7d 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java @@ -132,11 +132,6 @@ public class RemoteInterpreterOutputTestStream extends AbstractInterpreterTest } @Override - public void onMetaInfosReceived(String settingId, Map<String, String> metaInfos) { - - } - - @Override public void runParagraphs(String noteId, List<Integer> paragraphIndices, List<String> paragraphIds, String curParagraphId) throws IOException { } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/adf83a3f/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java index 4542b0e..c3b540b 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java @@ -282,11 +282,6 @@ public class RemoteSchedulerTest extends AbstractInterpreterTest } @Override - public void onMetaInfosReceived(String settingId, Map<String, String> metaInfos) { - - } - - @Override public void runParagraphs(String noteId, List<Integer> paragraphIndices, List<String> paragraphIds, String curParagraphId) throws IOException { }
