ZEPPELIN-1473. It is not necessary to create SQLContext in LivyInterpreter

zjffdu · zjffdu · commit bae46a1f0258 · 2016-09-22T17:53:51.000+08:00
diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java b/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java
@@ -130,12 +130,6 @@ public Integer createSession(InterpreterContext context, String kind) throws Exc
     }
   }
 
-  protected void initializeSpark(final InterpreterContext context,
-                                 final Map<String, Integer> userSessionMap) throws Exception {
-    interpret("val sqlContext = new org.apache.spark.sql.SQLContext(sc)\n" +
-        "import sqlContext.implicits._", context, userSessionMap);
-  }
-
   public InterpreterResult interpretInput(String stringLines,
                                           final InterpreterContext context,
                                           final Map<String, Integer> userSessionMap,
diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkInterpreter.java
@@ -75,7 +75,6 @@ public InterpreterResult interpret(String line, InterpreterContext interpreterCo
                   interpreterContext,
                   "spark")
           );
-          livyHelper.initializeSpark(interpreterContext, userSessionMap);
         } catch (Exception e) {
           LOGGER.error("Exception in LivySparkInterpreter while interpret ", e);
           return new InterpreterResult(InterpreterResult.Code.ERROR, e.getMessage());
diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java
@@ -65,7 +65,6 @@ public InterpreterResult interpret(String line, InterpreterContext interpreterCo
                   interpreterContext,
                   "spark")
           );
-          livyHelper.initializeSpark(interpreterContext, userSessionMap);
         } catch (Exception e) {
           LOGGER.error("Exception in LivySparkSQLInterpreter while interpret ", e);
           return new InterpreterResult(InterpreterResult.Code.ERROR, e.getMessage());

Original file line number	Diff line number	Diff line change
`@@ -130,12 +130,6 @@ public Integer createSession(InterpreterContext context, String kind) throws Exc`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`- protected void initializeSpark(final InterpreterContext context,`
`134`		`- final Map<String, Integer> userSessionMap) throws Exception {`
`135`		`- interpret("val sqlContext = new org.apache.spark.sql.SQLContext(sc)\n" +`
`136`		`- "import sqlContext.implicits._", context, userSessionMap);`
`137`		`- }`
`138`		`-`
`139`	`133`	`public InterpreterResult interpretInput(String stringLines,`
`140`	`134`	`final InterpreterContext context,`
`141`	`135`	`final Map<String, Integer> userSessionMap,`