diff options
| author | Josh Rosen <joshrosen@apache.org> | 2014-07-26 00:54:05 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-07-26 00:54:05 -0700 |
| commit | cf3e9fd84dc64f8a57ecbcfdd6b22f5492d41bd7 (patch) | |
| tree | 7ebad9c0997a0a28d2f5eead2a0ae6a63b116bc3 /core | |
| parent | 8904791230a0fae336db93e5a80f65c4d9d584dc (diff) | |
| download | spark-cf3e9fd84dc64f8a57ecbcfdd6b22f5492d41bd7.tar.gz spark-cf3e9fd84dc64f8a57ecbcfdd6b22f5492d41bd7.tar.bz2 spark-cf3e9fd84dc64f8a57ecbcfdd6b22f5492d41bd7.zip | |
[SPARK-1458] [PySpark] Expose sc.version in Java and PySpark
Author: Josh Rosen <joshrosen@apache.org>
Closes #1596 from JoshRosen/spark-1458 and squashes the following commits:
fdbb0bf [Josh Rosen] Add SparkContext.version to Python & Java [SPARK-1458]
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala | 3 |
1 files changed, 3 insertions, 0 deletions
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 1e0493c485..a678355a1c 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 |