From 4309100777c7fd6f1fbd9081a49605fc0f8b1ff2 Mon Sep 17 00:00:00 2001 From: Liwei Lin Date: Wed, 13 Jul 2016 07:51:35 +0800 Subject: [PATCH 1/4] add version --- .../src/main/scala/org/apache/spark/sql/SparkSession.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 a3fd39d42eeb9..f0ffa0e0477a0 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.{SparkConf, SparkContext, SPARK_VERSION} import org.apache.spark.annotation.{DeveloperApi, Experimental} import org.apache.spark.api.java.JavaRDD import org.apache.spark.internal.Logging @@ -79,6 +79,9 @@ class SparkSession private( sparkContext.assertNotStopped() + /** The version of Spark on which this application is running. */ + def version: String = SPARK_VERSION + /* ----------------------- * | Session-related state | * ----------------------- */ From 97f6b927ffc3583786eefa3bfe755708a95cccac Mon Sep 17 00:00:00 2001 From: Liwei Lin Date: Wed, 13 Jul 2016 08:02:42 +0800 Subject: [PATCH 2/4] Fix import order --- sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f0ffa0e0477a0..5a5f66133a6f9 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, SPARK_VERSION} +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 From 1ea0247cfd68823ce6175cec42e2027334d31451 Mon Sep 17 00:00:00 2001 From: Liwei Lin Date: Wed, 13 Jul 2016 14:38:16 +0800 Subject: [PATCH 3/4] Add since tag --- .../src/main/scala/org/apache/spark/sql/SparkSession.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 5a5f66133a6f9..df0950de1525e 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 @@ -79,7 +79,11 @@ class SparkSession private( sparkContext.assertNotStopped() - /** The version of Spark on which this application is running. */ + /** + * The version of Spark on which this application is running. + * + * @since 2.0.0 + */ def version: String = SPARK_VERSION /* ----------------------- * From b4372f75dea7d486c03a4d35b48d65779c316831 Mon Sep 17 00:00:00 2001 From: Liwei Lin Date: Wed, 13 Jul 2016 16:04:14 +0800 Subject: [PATCH 4/4] Add for python --- python/pyspark/sql/session.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python/pyspark/sql/session.py b/python/pyspark/sql/session.py index a360fbefa492c..594f9375f7678 100644 --- a/python/pyspark/sql/session.py +++ b/python/pyspark/sql/session.py @@ -232,6 +232,12 @@ def sparkContext(self): """Returns the underlying :class:`SparkContext`.""" return self._sc + @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):