Skip to content

[SPARK-21516][SQL][Test] Overriding afterEach() in DatasetCacheSuite must call super.afterEach() #18721

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
kiszk wants to merge 3 commits into from
Closed

[SPARK-21516][SQL][Test] Overriding afterEach() in DatasetCacheSuite must call super.afterEach() #18721

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e4d057
initial commit
kiszk Jul 24, 2017
2ac2798
address review comment
kiszk Jul 24, 2017
bd6c2ad
address review comment
kiszk Jul 24, 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
5 changes: 0 additions & 5 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ import org.apache.spark.storage.StorageLevel
class DatasetCacheSuite extends QueryTest with SharedSQLContext {
import testImplicits._

// Clear all persistent datasets after each test
override def afterEach(): Unit = {
spark.sharedState.cacheManager.clearCache()
}

test("get storage level") {
val ds1 = Seq("1", "2").toDS().as("a")
val ds2 = Seq(2, 3).toDS().as("b")
Expand Down
7 changes: 6 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ trait SharedSQLContext extends SQLTestUtils with BeforeAndAfterEach with Eventua
}

protected override def afterEach(): Unit = {
super.afterEach()
try {
// Clear all persistent datasets after each test
spark.sharedState.cacheManager.clearCache()
} finally {
super.afterEach()

@cloud-fan cloud-fan Jul 24, 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.

sorry to be nit-pick, but seems we can just do

super.afterEach()
// Clear all persistent datasets after each test
spark.sharedState.cacheManager.clearCache()

@kiszk kiszk Jul 24, 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.

I see. done

}
// files can be closed from other threads, so wait a bit
// normally this doesn't take more than 1s
eventually(timeout(10.seconds)) {
Expand Down