Skip to content

[SPARK-16503] SparkSession should provide Spark version #14165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lw-lin wants to merge 4 commits into from
Closed

[SPARK-16503] SparkSession should provide Spark version #14165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4309100
add version
lw-lin Jul 12, 2016
97f6b92
Fix import order
lw-lin Jul 13, 2016
1ea0247
Add since tag
lw-lin Jul 13, 2016
b4372f7
Add for python
lw-lin Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions python/pyspark/sql/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
9 changes: 8 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Copy link
Contributor

@rxin rxin Jul 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add @SInCE version to the comment.

Copy link
Contributor

@rxin rxin Jul 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you fix this asap, I can port this in 2.0 too.

Copy link
Contributor Author

@lw-lin lw-lin Jul 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixing this; thanks!

Copy link
Contributor

@lins05 lins05 Jul 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rxin May I ask when should we use the @Since java annotation and when use @since in javadoc?


/* ----------------------- *
| Session-related state |
* ----------------------- */
Expand Down