Skip to content

[SPARK-21345][SQL][TEST][test-maven] SparkSessionBuilderSuite should clean up stopped sessions. #18567

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
dongjoon-hyun wants to merge 6 commits into from
Closed

[SPARK-21345][SQL][TEST][test-maven] SparkSessionBuilderSuite should clean up stopped sessions. #18567

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
443b33e
SparkSessionBuilderSuite should clean up stopped sessions.
dongjoon-hyun Jul 7, 2017
1d5a0d0
Address comments.
dongjoon-hyun Jul 7, 2017
9825810
Use BeforeAndAfterEach.
dongjoon-hyun Jul 7, 2017
802163d
Clear afterEach instead of checking.
dongjoon-hyun Jul 8, 2017
4f4b452
Address comment.
dongjoon-hyun Jul 8, 2017
04f47ed
Remove session.stop at the end of the test.
dongjoon-hyun Jul 8, 2017
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
14 changes: 9 additions & 5 deletions sql/core/src/test/scala/org/apache/spark/sql/SparkSessionBuilderSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@

package org.apache.spark.sql

import org.scalatest.BeforeAndAfterEach

import org.apache.spark.{SparkConf, SparkContext, SparkFunSuite}
import org.apache.spark.sql.internal.SQLConf

/**
* Test cases for the builder pattern of [[SparkSession]].
*/
class SparkSessionBuilderSuite extends SparkFunSuite {
class SparkSessionBuilderSuite extends SparkFunSuite with BeforeAndAfterEach {

private var initialSession: SparkSession = _

@cloud-fan cloud-fan Jul 8, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Seems this is only used in the first test case? shall we just move it to the first test case?

@dongjoon-hyun dongjoon-hyun Jul 8, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This is also used in sparkContext and sparkContext is used in 3 test cases.

private lazy val sparkContext: SparkContext = {
    initialSession = SparkSession.builder()

@dongjoon-hyun dongjoon-hyun Jul 8, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Ah, yes. The other two reference are just stop. I will move this.


Expand All @@ -36,18 +38,22 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
initialSession.sparkContext
}

override def afterEach(): Unit = {
// This suite should not interfere with the other test suites.
SparkSession.clearDefaultSession()
SparkSession.clearActiveSession()

@cloud-fan cloud-fan Jul 8, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

shall we also stop the session?

@dongjoon-hyun dongjoon-hyun Jul 8, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Sure!

@dongjoon-hyun dongjoon-hyun Jul 8, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

We need to update the unit test case because SparkContext requires spark.master. I'll update like that.

    if (!_conf.contains("spark.master")) {
      throw new SparkException("A master URL must be set in your configuration")
    }

}

test("create with config options and propagate them to SparkContext and SparkSession") {
// Creating a new session with config - this works by just calling the lazy val
sparkContext
assert(initialSession.sparkContext.conf.get("some-config") == "v2")
assert(initialSession.conf.get("some-config") == "v2")
SparkSession.clearDefaultSession()
}

test("use global default session") {
val session = SparkSession.builder().getOrCreate()
assert(SparkSession.builder().getOrCreate() == session)
SparkSession.clearDefaultSession()
}

test("config options are propagated to existing SparkSession") {
Expand All @@ -56,7 +62,6 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
val session2 = SparkSession.builder().config("spark-config1", "b").getOrCreate()
assert(session1 == session2)
assert(session1.conf.get("spark-config1") == "b")
SparkSession.clearDefaultSession()
}

test("use session from active thread session and propagate config options") {
Expand All @@ -73,7 +78,6 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
SparkSession.clearActiveSession()

assert(SparkSession.builder().getOrCreate() == defaultSession)
SparkSession.clearDefaultSession()
}

test("create a new session if the default session has been stopped") {
Expand Down