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

[ZEPPELIN-4616]. Rename BaseZeppelinContext to ZeppelinContext

Browse source
This commit is contained in:
Jeff Zhang 2020-02-14 16:55:30 +08:00
parent 2e6422c5df
commit f4eb0f5bab
33 changed files with 77 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flink/src/main/java/org/apache/zeppelin/flink/IPyFlinkInterpreter.java
View file

@ -17,7 +17,7 @@
package org.apache.zeppelin.flink;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.python.IPythonInterpreter;
@ -53,7 +53,7 @@ public class IPyFlinkInterpreter extends IPythonInterpreter {
}
@Override
public BaseZeppelinContext buildZeppelinContext() {
public ZeppelinContext buildZeppelinContext() {
return flinkInterpreter.getZeppelinContext();
}

4
flink/src/main/java/org/apache/zeppelin/flink/PyFlinkInterpreter.java
View file

@ -17,7 +17,7 @@
package org.apache.zeppelin.flink;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.python.IPythonInterpreter;
@ -136,7 +136,7 @@ public class PyFlinkInterpreter extends PythonInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return flinkInterpreter.getZeppelinContext();
}

4
flink/src/main/scala/org/apache/zeppelin/flink/FlinkZeppelinContext.scala
View file

@ -28,7 +28,7 @@ import org.apache.zeppelin.annotation.ZeppelinApi
import org.apache.zeppelin.display.AngularObjectWatcher
import org.apache.zeppelin.display.ui.OptionInput.ParamOption
import org.apache.zeppelin.flink.util.TableUtil
import org.apache.zeppelin.interpreter.{BaseZeppelinContext, InterpreterContext, InterpreterHookRegistry, ResultMessages}
import org.apache.zeppelin.interpreter.{ZeppelinContext, InterpreterContext, InterpreterHookRegistry, ResultMessages}
import scala.collection.{JavaConversions, Seq}
@ -38,7 +38,7 @@ import scala.collection.{JavaConversions, Seq}
*/
class FlinkZeppelinContext(val btenv: TableEnvironment,
val hooks2: InterpreterHookRegistry,
val maxResult2: Int) extends BaseZeppelinContext(hooks2, maxResult2) {
val maxResult2: Int) extends ZeppelinContext(hooks2, maxResult2) {
private var currentSql: String = _

4
groovy/src/main/java/org/apache/zeppelin/groovy/GroovyZeppelinContext.java
View file

@ -17,7 +17,7 @@
package org.apache.zeppelin.groovy;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterHookRegistry;
import java.util.List;
@ -26,7 +26,7 @@ import java.util.Map;
/**
* ZeppelinContext for Groovy
*/
public class GroovyZeppelinContext extends BaseZeppelinContext {
public class GroovyZeppelinContext extends ZeppelinContext {
public GroovyZeppelinContext(InterpreterHookRegistry hooks, int maxResult) {
super(hooks, maxResult);

4
jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
View file

@ -32,7 +32,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.alias.CredentialProvider;
import org.apache.hadoop.security.alias.CredentialProviderFactory;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.util.SqlSplitter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -158,7 +158,7 @@ public class JDBCInterpreter extends KerberosInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return null;
}

4
python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
View file

@ -20,7 +20,7 @@ package org.apache.zeppelin.python;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.jupyter.proto.ExecuteRequest;
import org.apache.zeppelin.interpreter.jupyter.proto.ExecuteResponse;
@ -98,7 +98,7 @@ public class IPythonInterpreter extends JupyterKernelInterpreter {
}
@Override
public BaseZeppelinContext buildZeppelinContext() {
public ZeppelinContext buildZeppelinContext() {
return new PythonZeppelinContext(
getInterpreterGroup().getInterpreterHookRegistry(),
Integer.parseInt(getProperty("zeppelin.python.maxResult", "1000")));

10
python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java
View file

@ -25,7 +25,7 @@ import org.apache.commons.exec.ExecuteException;
import org.apache.commons.exec.environment.EnvironmentUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
@ -68,7 +68,7 @@ public class PythonInterpreter extends Interpreter {
private InterpreterOutputStream outputStream;
private long pythonPid = -1;
private IPythonInterpreter iPythonInterpreter;
private BaseZeppelinContext zeppelinContext;
private ZeppelinContext zeppelinContext;
// set by PythonCondaInterpreter
private String condaPythonExec;
private boolean usePy4jAuth = false;
@ -375,7 +375,7 @@ public class PythonInterpreter extends Interpreter {
}
outputStream.setInterpreterOutput(context.out);
BaseZeppelinContext z = getZeppelinContext();
ZeppelinContext z = getZeppelinContext();
z.setInterpreterContext(context);
z.setGui(context.getGui());
z.setNoteGui(context.getNoteGui());
@ -536,13 +536,13 @@ public class PythonInterpreter extends Interpreter {
return getInterpreterInTheSameSessionByClassName(IPythonInterpreter.class, false);
}
protected BaseZeppelinContext createZeppelinContext() {
protected ZeppelinContext createZeppelinContext() {
return new PythonZeppelinContext(
getInterpreterGroup().getInterpreterHookRegistry(),
Integer.parseInt(getProperty("zeppelin.python.maxResult", "1000")));
}
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
if (zeppelinContext == null) {
zeppelinContext = createZeppelinContext();
}

4
python/src/main/java/org/apache/zeppelin/python/PythonZeppelinContext.java
View file

@ -17,7 +17,7 @@
package org.apache.zeppelin.python;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterHookRegistry;
import java.util.List;
@ -26,7 +26,7 @@ import java.util.Map;
/**
* ZeppelinContext for Python
*/
public class PythonZeppelinContext extends BaseZeppelinContext {
public class PythonZeppelinContext extends ZeppelinContext {
public PythonZeppelinContext(InterpreterHookRegistry hooks, int maxResult) {
super(hooks, maxResult);

4
rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java
View file

@ -19,7 +19,7 @@ package org.apache.zeppelin.r;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -147,7 +147,7 @@ public class IRInterpreter extends JupyterKernelInterpreter {
}
@Override
public BaseZeppelinContext buildZeppelinContext() {
public ZeppelinContext buildZeppelinContext() {
return new RZeppelinContext(getInterpreterGroup().getInterpreterHookRegistry(),
Integer.parseInt(getProperty("zeppelin.r.maxResult", "1000")));
}

4
rlang/src/main/java/org/apache/zeppelin/r/RInterpreter.java
View file

@ -18,7 +18,7 @@
package org.apache.zeppelin.r;
import org.apache.zeppelin.interpreter.AbstractInterpreter;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -185,7 +185,7 @@ public class RInterpreter extends AbstractInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return this.z;
}

4
rlang/src/main/java/org/apache/zeppelin/r/RZeppelinContext.java
View file

@ -17,7 +17,7 @@
package org.apache.zeppelin.r;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterHookRegistry;
import java.util.List;
@ -26,7 +26,7 @@ import java.util.Map;
/**
* ZeppelinContext for R, only contains the basic function of ZeppelinContext.
*/
public class RZeppelinContext extends BaseZeppelinContext {
public class RZeppelinContext extends ZeppelinContext {
public RZeppelinContext(InterpreterHookRegistry hooks, int maxResult) {
super(hooks, maxResult);

4
rlang/src/main/java/org/apache/zeppelin/r/ShinyInterpreter.java
View file

@ -19,7 +19,7 @@ package org.apache.zeppelin.r;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.interpreter.AbstractInterpreter;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -94,7 +94,7 @@ public class ShinyInterpreter extends AbstractInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return this.z;
}

5
sap/src/main/java/org/apache/zeppelin/sap/UniverseInterpreter.java
View file

@ -19,8 +19,7 @@ package org.apache.zeppelin.sap;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.interpreter.AbstractInterpreter;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -87,7 +86,7 @@ public class UniverseInterpreter extends AbstractInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return null;
}

4
shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
View file

@ -23,7 +23,7 @@ import org.apache.commons.exec.ExecuteException;
import org.apache.commons.exec.ExecuteWatchdog;
import org.apache.commons.exec.PumpStreamHandler;
import org.apache.commons.lang3.StringUtils;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -90,7 +90,7 @@ public class ShellInterpreter extends KerberosInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return null;
}

4
shell/src/main/java/org/apache/zeppelin/shell/TerminalInterpreter.java
View file

@ -22,7 +22,7 @@ import com.google.common.io.Resources;
import com.hubspot.jinjava.Jinjava;
import org.apache.commons.io.Charsets;
import org.apache.commons.lang3.StringUtils;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
@ -90,7 +90,7 @@ public class TerminalInterpreter extends KerberosInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return null;
}

4
spark/interpreter/src/main/java/org/apache/zeppelin/spark/AbstractSparkScalaInterpreter.java
View file

@ -19,7 +19,7 @@ package org.apache.zeppelin.spark;
import org.apache.spark.SparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
@ -42,7 +42,7 @@ public abstract class AbstractSparkScalaInterpreter {
public abstract String getSparkUrl();
public abstract BaseZeppelinContext getZeppelinContext();
public abstract ZeppelinContext getZeppelinContext();
public int getProgress(InterpreterContext context) throws InterpreterException {
return getProgress(Utils.buildJobGroupId(context), context);

4
spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
View file

@ -19,7 +19,7 @@ package org.apache.zeppelin.spark;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -78,7 +78,7 @@ public class IPySparkInterpreter extends IPythonInterpreter {
}
@Override
public BaseZeppelinContext buildZeppelinContext() {
public ZeppelinContext buildZeppelinContext() {
return sparkInterpreter.getZeppelinContext();
}

4
spark/interpreter/src/main/java/org/apache/zeppelin/spark/KotlinSparkInterpreter.java
View file

@ -35,7 +35,7 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import scala.Console;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
@ -53,7 +53,7 @@ public class KotlinSparkInterpreter extends Interpreter {
private InterpreterResult unsupportedMessage;
private KotlinInterpreter interpreter;
private SparkInterpreter sparkInterpreter;
private BaseZeppelinContext z;
private ZeppelinContext z;
private JavaSparkContext jsc;
public KotlinSparkInterpreter(Properties properties) {

6
spark/interpreter/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java
View file

@ -21,7 +21,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -118,7 +118,7 @@ public class PySparkInterpreter extends PythonInterpreter {
}
@Override
protected BaseZeppelinContext createZeppelinContext() {
protected ZeppelinContext createZeppelinContext() {
return sparkInterpreter.getZeppelinContext();
}
@ -165,7 +165,7 @@ public class PySparkInterpreter extends PythonInterpreter {
return "python";
}
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
if (sparkInterpreter != null) {
return sparkInterpreter.getZeppelinContext();
} else {

4
spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
View file

@ -23,7 +23,7 @@ import org.apache.spark.SparkContext;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.zeppelin.interpreter.AbstractInterpreter;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterGroup;
@ -197,7 +197,7 @@ public class SparkInterpreter extends AbstractInterpreter {
return innerInterpreter.getProgress(Utils.buildJobGroupId(context), context);
}
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return this.innerInterpreter.getZeppelinContext();
}

4
spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java
View file

@ -19,7 +19,7 @@ package org.apache.zeppelin.spark;
import org.apache.spark.SparkContext;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -150,7 +150,7 @@ public class SparkRInterpreter extends RInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return sparkInterpreter.getZeppelinContext();
}

5
spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
View file

@ -21,7 +21,7 @@ import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.spark.SparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.zeppelin.interpreter.AbstractInterpreter;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -33,7 +33,6 @@ import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Properties;
@ -69,7 +68,7 @@ public class SparkSqlInterpreter extends AbstractInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return null;
}

8
spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java
View file

@ -20,7 +20,7 @@ package org.apache.zeppelin.spark;
import org.apache.spark.SparkContext;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
/**
* Contains the Spark and Zeppelin Contexts made available to SparkR.
@ -28,7 +28,7 @@ import org.apache.zeppelin.interpreter.BaseZeppelinContext;
public class ZeppelinRContext {
private static SparkContext sparkContext;
private static SQLContext sqlContext;
private static BaseZeppelinContext zeppelinContext;
private static ZeppelinContext zeppelinContext;
private static Object sparkSession;
private static JavaSparkContext javaSparkContext;
@ -36,7 +36,7 @@ public class ZeppelinRContext {
ZeppelinRContext.sparkContext = sparkContext;
}
public static void setZeppelinContext(BaseZeppelinContext zeppelinContext) {
public static void setZeppelinContext(ZeppelinContext zeppelinContext) {
ZeppelinRContext.zeppelinContext = zeppelinContext;
}
@ -56,7 +56,7 @@ public class ZeppelinRContext {
return sqlContext;
}
public static BaseZeppelinContext getZeppelinContext() {
public static ZeppelinContext getZeppelinContext() {
return zeppelinContext;
}

6
spark/interpreter/src/main/java/org/apache/zeppelin/spark/kotlin/SparkKotlinReceiver.java
View file

@ -19,7 +19,7 @@ package org.apache.zeppelin.spark.kotlin;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.kotlin.context.KotlinReceiver;
/**
@ -29,12 +29,12 @@ public class SparkKotlinReceiver extends KotlinReceiver {
public final Object _sparkObject;
public final JavaSparkContext sc;
public final SQLContext sqlContext;
public final BaseZeppelinContext z;
public final ZeppelinContext z;
public SparkKotlinReceiver(Object spark,
JavaSparkContext sc,
SQLContext sqlContext,
BaseZeppelinContext z) {
ZeppelinContext z) {
this._sparkObject = spark;
this.sc = sc;
this.sqlContext = sqlContext;

5
spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkShimsTest.java
View file

@ -29,7 +29,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Properties;
import org.apache.hadoop.util.VersionInfo;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterEventClient;
import org.junit.Before;
@ -41,7 +41,6 @@ import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@ -110,7 +109,7 @@ public class SparkShimsTest {
}
@RunWith(PowerMockRunner.class)
@PrepareForTest({BaseZeppelinContext.class, VersionInfo.class})
@PrepareForTest({ZeppelinContext.class, VersionInfo.class})
@PowerMockIgnore({"javax.net.*", "javax.security.*"})
public static class SingleTests {
@Captor ArgumentCaptor<Map<String, String>> argumentCaptor;

4
spark/spark-scala-parent/src/main/scala/org/apache/zeppelin/spark/BaseSparkScalaInterpreter.scala
View file

@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils
import org.apache.spark.sql.SQLContext
import org.apache.spark.{SparkConf, SparkContext}
import org.apache.zeppelin.interpreter.util.InterpreterOutputStream
import org.apache.zeppelin.interpreter.{BaseZeppelinContext, InterpreterContext, InterpreterGroup, InterpreterResult}
import org.apache.zeppelin.interpreter.{ZeppelinContext, InterpreterContext, InterpreterGroup, InterpreterResult}
import org.slf4j.{Logger, LoggerFactory}
import scala.collection.JavaConverters._
@ -159,7 +159,7 @@ abstract class BaseSparkScalaInterpreter(val conf: SparkConf,
override def getSparkUrl: String = sparkUrl
override def getZeppelinContext: BaseZeppelinContext = z
override def getZeppelinContext: ZeppelinContext = z
protected def bind(name: String, tpe: String, value: Object, modifier: List[String]): Unit

4
spark/spark-scala-parent/src/main/scala/org/apache/zeppelin/spark/SparkZeppelinContext.scala
View file

@ -24,7 +24,7 @@ import org.apache.spark.sql.DataFrame
import org.apache.zeppelin.annotation.ZeppelinApi
import org.apache.zeppelin.display.AngularObjectWatcher
import org.apache.zeppelin.display.ui.OptionInput.ParamOption
import org.apache.zeppelin.interpreter.{BaseZeppelinContext, InterpreterContext, InterpreterHookRegistry}
import org.apache.zeppelin.interpreter.{ZeppelinContext, InterpreterContext, InterpreterHookRegistry}
import scala.collection.Seq
import scala.collection.JavaConverters._
@ -36,7 +36,7 @@ import scala.collection.JavaConverters._
class SparkZeppelinContext(val sc: SparkContext,
val sparkShims: SparkShims,
val hooks2: InterpreterHookRegistry,
val maxResult2: Int) extends BaseZeppelinContext(hooks2, maxResult2) {
val maxResult2: Int) extends ZeppelinContext(hooks2, maxResult2) {
private val interpreterClassMap = Map(
"spark" -> "org.apache.zeppelin.spark.SparkInterpreter",

4
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/AbstractInterpreter.java
View file

@ -33,7 +33,7 @@ public abstract class AbstractInterpreter extends Interpreter {
public InterpreterResult interpret(String st,
InterpreterContext context) throws InterpreterException {
InterpreterContext.set(context);
BaseZeppelinContext z = getZeppelinContext();
ZeppelinContext z = getZeppelinContext();
if (z != null) {
z.setGui(context.getGui());
z.setNoteGui(context.getNoteGui());
@ -47,7 +47,7 @@ public abstract class AbstractInterpreter extends Interpreter {
return internalInterpret(st, context);
}
public abstract BaseZeppelinContext getZeppelinContext();
public abstract ZeppelinContext getZeppelinContext();
protected boolean isInterpolate() {
return false;

9
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/BaseZeppelinContext.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/ZeppelinContext.java
View file

@ -33,16 +33,15 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
/**
* Base class for ZeppelinContext
* Abstract class for ZeppelinContext
*/
public abstract class BaseZeppelinContext {
public abstract class ZeppelinContext {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseZeppelinContext.class);
private static final Logger LOGGER = LoggerFactory.getLogger(ZeppelinContext.class);
protected InterpreterContext interpreterContext;
protected int maxResult;
@ -50,7 +49,7 @@ public abstract class BaseZeppelinContext {
protected GUI gui;
protected GUI noteGui;
public BaseZeppelinContext(InterpreterHookRegistry hooks, int maxResult) {
public ZeppelinContext(InterpreterHookRegistry hooks, int maxResult) {
this.hooks = hooks;
this.maxResult = maxResult;
}

4
zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/BaseZeppelinContextTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/ZeppelinContextTest.java
View file

@ -26,7 +26,7 @@ import java.util.Map;
import static org.junit.Assert.assertEquals;
public class BaseZeppelinContextTest {
public class ZeppelinContextTest {
@Test
public void testHooks() throws InvalidHookException {
@ -113,7 +113,7 @@ public class BaseZeppelinContextTest {
}
public static class TestZeppelinContext extends BaseZeppelinContext {
public static class TestZeppelinContext extends ZeppelinContext {
public TestZeppelinContext(InterpreterHookRegistry hooks, int maxResult) {
super(hooks, maxResult);

4
zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterInterpreter.java
View file

@ -19,7 +19,7 @@
package org.apache.zeppelin.jupyter;
import org.apache.zeppelin.interpreter.AbstractInterpreter;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -45,7 +45,7 @@ public class JupyterInterpreter extends AbstractInterpreter {
}
@Override
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return new JupyterZeppelinContext(getInterpreterGroup().getInterpreterHookRegistry(), 1000);
}

8
zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java
View file

@ -26,7 +26,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.interpreter.AbstractInterpreter;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -67,7 +67,7 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
private JupyterKernelProcessLauncher jupyterKernelProcessLauncher;
protected JupyterKernelClient jupyterKernelClient;
protected BaseZeppelinContext z;
protected ZeppelinContext z;
private String kernel;
// working directory of jupyter kernel
@ -99,7 +99,7 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
return requiredPackages;
}
protected BaseZeppelinContext buildZeppelinContext() {
protected ZeppelinContext buildZeppelinContext() {
return new JupyterZeppelinContext(null, 1000);
}
@ -309,7 +309,7 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
return completions;
}
public BaseZeppelinContext getZeppelinContext() {
public ZeppelinContext getZeppelinContext() {
return z;
}

4
zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterZeppelinContext.java
View file

@ -18,13 +18,13 @@
package org.apache.zeppelin.jupyter;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
import org.apache.zeppelin.interpreter.InterpreterHookRegistry;
import java.util.List;
import java.util.Map;
public class JupyterZeppelinContext extends BaseZeppelinContext {
public class JupyterZeppelinContext extends ZeppelinContext {
public JupyterZeppelinContext(InterpreterHookRegistry hooks, int maxResult) {
super(hooks, maxResult);
}