From d3b737e3eafac6da3ade5a0006dc7dc82b5c1c8f Mon Sep 17 00:00:00 2001 From: bobbych Date: Thu, 4 Jun 2015 12:17:55 -0700 Subject: [PATCH] adding pyspark support for spark 1.4 --- spark/src/main/resources/python/zeppelin_pyspark.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spark/src/main/resources/python/zeppelin_pyspark.py b/spark/src/main/resources/python/zeppelin_pyspark.py index d5b8daa63e8..e29544e54f2 100644 --- a/spark/src/main/resources/python/zeppelin_pyspark.py +++ b/spark/src/main/resources/python/zeppelin_pyspark.py @@ -53,6 +53,9 @@ elif jsc.version().startswith("1.3"): java_import(gateway.jvm, "org.apache.spark.sql.*") java_import(gateway.jvm, "org.apache.spark.sql.hive.*") +elif jsc.version().startswith("1.4"): + java_import(gateway.jvm, "org.apache.spark.sql.*") + java_import(gateway.jvm, "org.apache.spark.sql.hive.*") java_import(gateway.jvm, "scala.Tuple2")