diff options
| -rw-r--r-- | python/pyspark/sql/session.py | 6 | ||||
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/python/pyspark/sql/session.py b/python/pyspark/sql/session.py index a360fbefa4..594f9375f7 100644 --- a/python/pyspark/sql/session.py +++ b/python/pyspark/sql/session.py @@ -234,6 +234,12 @@ class SparkSession(object): @property @since(2.0) + def version(self): + """The version of Spark on which this application is running.""" + return self._jsparkSession.version() + + @property + @since(2.0) def conf(self): """Runtime configuration interface for Spark. diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala b/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala index 1271d1c55b..1a40b7e2c1 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala @@ -25,7 +25,7 @@ import scala.reflect.ClassTag import scala.reflect.runtime.universe.TypeTag import scala.util.control.NonFatal -import org.apache.spark.{SparkConf, SparkContext} +import org.apache.spark.{SPARK_VERSION, SparkConf, SparkContext} import org.apache.spark.annotation.{DeveloperApi, Experimental} import org.apache.spark.api.java.JavaRDD import org.apache.spark.internal.Logging @@ -79,6 +79,13 @@ class SparkSession private( sparkContext.assertNotStopped() + /** + * The version of Spark on which this application is running. + * + * @since 2.0.0 + */ + def version: String = SPARK_VERSION + /* ----------------------- * | Session-related state | * ----------------------- */ |