zjffdu commented on a change in pull request #3375: ZEPPELIN-4176. Remove old spark interpreter URL: https://github.com/apache/zeppelin/pull/3375#discussion_r290221072
########## File path: spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java ########## @@ -98,68 +176,70 @@ public FormType getFormType() { } @Override - public int getProgress(InterpreterContext context) throws InterpreterException { - return delegation.getProgress(context); + public int getProgress(InterpreterContext context) { + return innerInterpreter.getProgress(Utils.buildJobGroupId(context), context); } - public AbstractSparkInterpreter getDelegation() { - return delegation; + public SparkZeppelinContext getZeppelinContext() { + return this.z; } - - @Override public SparkContext getSparkContext() { - return delegation.getSparkContext(); + return this.sc; } - @Override public SQLContext getSQLContext() { - return delegation.getSQLContext(); + return sqlContext; } - @Override - public Object getSparkSession() { - return delegation.getSparkSession(); + public JavaSparkContext getJavaSparkContext() { + return this.jsc; } - @Override - public boolean isSparkContextInitialized() { - return delegation.isSparkContextInitialized(); + public Object getSparkSession() { + return sparkSession; } - @Override public SparkVersion getSparkVersion() { - return delegation.getSparkVersion(); + return sparkVersion; } - @Override - public JavaSparkContext getJavaSparkContext() { - return delegation.getJavaSparkContext(); + private String extractScalaVersion() throws IOException, InterruptedException { + String scalaVersionString = scala.util.Properties.versionString(); + if (scalaVersionString.contains("version 2.10")) { + return "2.10"; + } else { + return "2.11"; Review comment: Right, I will fix it in https://github.com/apache/zeppelin/pull/3034 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services