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

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

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

lw-lin wants to merge 4 commits into from

Conversation

@lw-lin
Copy link
Contributor

@lw-lin lw-lin commented Jul 12, 2016 •
edited
Loading

What changes were proposed in this pull request?

This patch enables SparkSession to provide spark version.

How was this patch tested?

Manual test:

scala> sc.version
res0: String = 2.1.0-SNAPSHOT

scala> spark.version
res1: String = 2.1.0-SNAPSHOT

>>> sc.version
u'2.1.0-SNAPSHOT'
>>> spark.version
u'2.1.0-SNAPSHOT'

@SparkQA
Copy link

SparkQA commented Jul 12, 2016

Test build #62197 has finished for PR 14165 at commit 4309100.

  • This patch fails Scala style tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Jul 13, 2016

Test build #62199 has finished for PR 14165 at commit 97f6b92.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

rxin
rxin reviewed Jul 13, 2016
View reviewed changes
sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala
sparkContext.assertNotStopped()

/** The version of Spark on which this application is running. */
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?

@rxin
Copy link
Contributor

rxin commented Jul 13, 2016

LGTM pending Jenkins.

@SparkQA
Copy link

SparkQA commented Jul 13, 2016

Test build #62223 has finished for PR 14165 at commit b4372f7.

  • This patch fails Python style tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Jul 13, 2016

Test build #62216 has finished for PR 14165 at commit 1ea0247.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Jul 13, 2016

Test build #62220 has finished for PR 14165 at commit b0a724e.

  • This patch passes all tests.
  • This patch does not merge cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Jul 13, 2016

Test build #62221 has finished for PR 14165 at commit 1ea0247.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@lw-lin
Copy link
Contributor Author

lw-lin commented Jul 13, 2016

Jenkins retest this please

@SparkQA
Copy link

SparkQA commented Jul 13, 2016

Test build #62236 has finished for PR 14165 at commit b4372f7.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@rxin
Copy link
Contributor

rxin commented Jul 14, 2016

Merging in master/2.0. Thanks.

asfgit pushed a commit that referenced this pull request Jul 14, 2016
@lw-lin @rxin
[SPARK-16503] SparkSession should provide Spark version
f6eda6b 
## What changes were proposed in this pull request?

This patch enables SparkSession to provide spark version.

## How was this patch tested?

Manual test:

```
scala> sc.version
res0: String = 2.1.0-SNAPSHOT

scala> spark.version
res1: String = 2.1.0-SNAPSHOT
```

```
>>> sc.version
u'2.1.0-SNAPSHOT'
>>> spark.version
u'2.1.0-SNAPSHOT'
```

Author: Liwei Lin <lwlin7@gmail.com>

Closes #14165 from lw-lin/add-version.

(cherry picked from commit 39c836e)
Signed-off-by: Reynold Xin <rxin@databricks.com>
@asfgit asfgit closed this in 39c836e Jul 14, 2016
@lw-lin lw-lin deleted the add-version branch August 1, 2016 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lw-lin @SparkQA @rxin @lins05