Skip to content
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

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

Closed
wants to merge 6 commits into from
Closed

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

Changes from 1 commit
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
12 changes: 12 additions & 0 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 @@ -56,6 +56,7 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
val session2 = SparkSession.builder().config("spark-config1", "b").getOrCreate()
assert(session1 == session2)
assert(session1.conf.get("spark-config1") == "b")
SparkSession.clearActiveSession()
SparkSession.clearDefaultSession()
}

Expand All @@ -73,6 +74,7 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
SparkSession.clearActiveSession()

assert(SparkSession.builder().getOrCreate() == defaultSession)
SparkSession.clearActiveSession()
Copy link
Member

Choose a reason for hiding this comment

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

Line 76 sets the active session?

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Jul 7, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

I thought line 76 may reach here. Do you want me to remove this?

Copy link
Member

Choose a reason for hiding this comment

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

That line will not set active session, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, right. I'll remove this.

SparkSession.clearDefaultSession()
}

Expand All @@ -83,6 +85,8 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
val newSession = SparkSession.builder().master("local").getOrCreate()
assert(newSession != defaultSession)
newSession.stop()
SparkSession.clearActiveSession()
SparkSession.clearDefaultSession()
}

test("create a new session if the active thread session has been stopped") {
Expand All @@ -92,6 +96,8 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
val newSession = SparkSession.builder().master("local").getOrCreate()
assert(newSession != activeSession)
newSession.stop()
SparkSession.clearActiveSession()
SparkSession.clearDefaultSession()
}

test("create SparkContext first then SparkSession") {
Expand All @@ -106,6 +112,8 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
assert(!sparkContext2.conf.contains("key2"))
assert(sparkContext2.conf.get("key1") == "value1")
session.stop()
SparkSession.clearActiveSession()
SparkSession.clearDefaultSession()
}

test("create SparkContext first then pass context to SparkSession") {
Expand All @@ -122,13 +130,17 @@ class SparkSessionBuilderSuite extends SparkFunSuite {
assert(!session.sparkContext.conf.contains("key2"))
assert(session.sparkContext.conf.get("spark.app.name") == "test")
session.stop()
SparkSession.clearActiveSession()
SparkSession.clearDefaultSession()
}

test("SPARK-15887: hive-site.xml should be loaded") {
val session = SparkSession.builder().master("local").getOrCreate()
assert(session.sessionState.newHadoopConf().get("hive.in.test") == "true")
assert(session.sparkContext.hadoopConfiguration.get("hive.in.test") == "true")
session.stop()
SparkSession.clearActiveSession()
SparkSession.clearDefaultSession()
}

test("SPARK-15991: Set global Hadoop conf") {
Expand Down