You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/06/08 18:13:06 UTC
incubator-zeppelin git commit: Adding pyspark support for spark 1.4
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master e383c6a9b -> 28a643385
Adding pyspark support for spark 1.4
support for pyspark was missing from previous spark 1.4 support commit
Author: bobbych <bo...@amino.com>
Closes #92 from bobbych/dev-pyspark4 and squashes the following commits:
d3b737e [bobbych] adding pyspark support for spark 1.4
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/28a64338
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/28a64338
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/28a64338
Branch: refs/heads/master
Commit: 28a6433853e0872176d65fa32e524eb7c66534a1
Parents: e383c6a
Author: bobbych <bo...@amino.com>
Authored: Thu Jun 4 12:17:55 2015 -0700
Committer: Lee moon soo <mo...@apache.org>
Committed: Mon Jun 8 09:12:53 2015 -0700
----------------------------------------------------------------------
spark/src/main/resources/python/zeppelin_pyspark.py | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/28a64338/spark/src/main/resources/python/zeppelin_pyspark.py
----------------------------------------------------------------------
diff --git a/spark/src/main/resources/python/zeppelin_pyspark.py b/spark/src/main/resources/python/zeppelin_pyspark.py
index d5b8daa..e29544e 100644
--- a/spark/src/main/resources/python/zeppelin_pyspark.py
+++ b/spark/src/main/resources/python/zeppelin_pyspark.py
@@ -53,6 +53,9 @@ if jsc.version().startswith("1.2"):
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")