From bae46a1f025855939e559bef8196157eb8317b25 Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Thu, 22 Sep 2016 17:53:51 +0800 Subject: [PATCH] ZEPPELIN-1473. It is not necessary to create SQLContext in LivyInterpreter --- livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java | 6 ------ .../java/org/apache/zeppelin/livy/LivySparkInterpreter.java | 1 - .../org/apache/zeppelin/livy/LivySparkSQLInterpreter.java | 1 - 3 files changed, 8 deletions(-) diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java b/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java index 9a92c313696..0b09e282e2e 100644 --- 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 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 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 index 6aac56d5ec6..95ee22e89e8 100644 --- 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 index 22773dfb1d2..3d4a0f4e428 100644 --- 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());