You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/07/26 09:54:09 UTC
git commit: [SPARK-1458] [PySpark] Expose sc.version in Java and
PySpark
Repository: spark
Updated Branches:
refs/heads/master 890479123 -> cf3e9fd84
[SPARK-1458] [PySpark] Expose sc.version in Java and PySpark
Author: Josh Rosen <jo...@apache.org>
Closes #1596 from JoshRosen/spark-1458 and squashes the following commits:
fdbb0bf [Josh Rosen] Add SparkContext.version to Python & Java [SPARK-1458]
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cf3e9fd8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cf3e9fd8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cf3e9fd8
Branch: refs/heads/master
Commit: cf3e9fd84dc64f8a57ecbcfdd6b22f5492d41bd7
Parents: 8904791
Author: Josh Rosen <jo...@apache.org>
Authored: Sat Jul 26 00:54:05 2014 -0700
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Sat Jul 26 00:54:05 2014 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/api/java/JavaSparkContext.scala | 3 +++
python/pyspark/context.py | 7 +++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/cf3e9fd8/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala b/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala
index 1e0493c..a678355 100644
--- a/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala
@@ -112,6 +112,9 @@ class JavaSparkContext(val sc: SparkContext) extends JavaSparkContextVarargsWork
def startTime: java.lang.Long = sc.startTime
+ /** The version of Spark on which this application is running. */
+ def version: String = sc.version
+
/** Default level of parallelism to use when not given by user (e.g. parallelize and makeRDD). */
def defaultParallelism: java.lang.Integer = sc.defaultParallelism
http://git-wip-us.apache.org/repos/asf/spark/blob/cf3e9fd8/python/pyspark/context.py
----------------------------------------------------------------------
diff --git a/python/pyspark/context.py b/python/pyspark/context.py
index 024fb88..bdf14ea 100644
--- a/python/pyspark/context.py
+++ b/python/pyspark/context.py
@@ -217,6 +217,13 @@ class SparkContext(object):
SparkContext._jvm.java.lang.System.setProperty(key, value)
@property
+ def version(self):
+ """
+ The version of Spark on which this application is running.
+ """
+ return self._jsc.version()
+
+ @property
def defaultParallelism(self):
"""
Default level of parallelism to use when not given by user (e.g. for