[zeppelin] branch branch-0.9 updated: [ZEPPELIN-5046]. Make FlinkSqlInterpreter extends AbstractInterpreter

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new 80b253c  [ZEPPELIN-5046]. Make FlinkSqlInterpreter extends AbstractInterpreter
80b253c is described below

commit 80b253cb483da1f75d954335ff27e669510be417
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Wed Sep 16 10:25:02 2020 +0800

    [ZEPPELIN-5046]. Make FlinkSqlInterpreter extends AbstractInterpreter
    
    ### What is this PR for?
    
    Simple PR which just make FlinkSqlInterpreter extends AbstractInterpreter so that we can leverage features of AbstractInterpreter, such as variables interpolate
    
    ### What type of PR is it?
    [Improvement]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-5046
    
    ### How should this be tested?
    * Ci pass
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Jeff Zhang <zj...@apache.org>
    
    Closes #3912 from zjffdu/ZEPPELIN-5046 and squashes the following commits:
    
    a57579334 [Jeff Zhang] [ZEPPELIN-5046]. Make FlinkSqlInterpreter extends AbstractInterpreter
    
    (cherry picked from commit e11ecf81ac462e98edaab55390b59075210e0b10)
    Signed-off-by: Jeff Zhang <zj...@apache.org>
---
 .../apache/zeppelin/flink/FlinkSqlInterrpeter.java   | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/flink/interpreter/src/main/java/org/apache/zeppelin/flink/FlinkSqlInterrpeter.java b/flink/interpreter/src/main/java/org/apache/zeppelin/flink/FlinkSqlInterrpeter.java
index 2e1fe71..02e3597 100644
--- a/flink/interpreter/src/main/java/org/apache/zeppelin/flink/FlinkSqlInterrpeter.java
+++ b/flink/interpreter/src/main/java/org/apache/zeppelin/flink/FlinkSqlInterrpeter.java
@@ -32,10 +32,12 @@ import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.api.config.ExecutionConfigOptions;
 import org.apache.zeppelin.flink.sql.SqlCommandParser;
 import org.apache.zeppelin.flink.sql.SqlCommandParser.SqlCommand;
+import org.apache.zeppelin.interpreter.AbstractInterpreter;
 import org.apache.zeppelin.interpreter.Interpreter;
 import org.apache.zeppelin.interpreter.InterpreterContext;
 import org.apache.zeppelin.interpreter.InterpreterException;
 import org.apache.zeppelin.interpreter.InterpreterResult;
+import org.apache.zeppelin.interpreter.ZeppelinContext;
 import org.apache.zeppelin.interpreter.util.SqlSplitter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,7 +52,7 @@ import java.util.Properties;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
 
-public abstract class FlinkSqlInterrpeter extends Interpreter {
+public abstract class FlinkSqlInterrpeter extends AbstractInterpreter {
 
   protected static final Logger LOGGER = LoggerFactory.getLogger(FlinkSqlInterrpeter.class);
 
@@ -96,13 +98,8 @@ public abstract class FlinkSqlInterrpeter extends Interpreter {
   }
 
   @Override
-  public InterpreterResult interpret(String st,
-                                     InterpreterContext context) throws InterpreterException {
+  protected InterpreterResult internalInterpret(String st, InterpreterContext context) throws InterpreterException {
     LOGGER.debug("Interpret code: " + st);
-    flinkInterpreter.getZeppelinContext().setInterpreterContext(context);
-    flinkInterpreter.getZeppelinContext().setNoteGui(context.getNoteGui());
-    flinkInterpreter.getZeppelinContext().setGui(context.getGui());
-
     // set ClassLoader of current Thread to be the ClassLoader of Flink scala-shell,
     // otherwise codegen will fail to find classes defined in scala-shell
     ClassLoader originClassLoader = Thread.currentThread().getContextClassLoader();
@@ -117,6 +114,15 @@ public abstract class FlinkSqlInterrpeter extends Interpreter {
     }
   }
 
+  @Override
+  public ZeppelinContext getZeppelinContext() {
+    if (flinkInterpreter != null) {
+      return flinkInterpreter.getZeppelinContext();
+    } else {
+      return null;
+    }
+  }
+
   private InterpreterResult runSqlList(String st, InterpreterContext context) {
 
     try {