You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by we...@apache.org on 2017/07/25 02:51:12 UTC
spark git commit: [SPARK-21516][SQL][TEST] Overriding afterEach() in
DatasetCacheSuite must call super.afterEach()
Repository: spark
Updated Branches:
refs/heads/master b09ec92a6 -> 7f295059c
[SPARK-21516][SQL][TEST] Overriding afterEach() in DatasetCacheSuite must call super.afterEach()
## What changes were proposed in this pull request?
This PR ensures to call `super.afterEach()` in overriding `afterEach()` method in `DatasetCacheSuite`. When we override `afterEach()` method in Testsuite, we have to call `super.afterEach()`.
This is a follow-up of #18719 and SPARK-21512.
## How was this patch tested?
Used the existing test suite
Author: Kazuaki Ishizaki <is...@jp.ibm.com>
Closes #18721 from kiszk/SPARK-21516.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7f295059
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7f295059
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7f295059
Branch: refs/heads/master
Commit: 7f295059ca573fd56a7923badfe213cb6cb0881d
Parents: b09ec92
Author: Kazuaki Ishizaki <is...@jp.ibm.com>
Authored: Tue Jul 25 10:51:00 2017 +0800
Committer: Wenchen Fan <we...@databricks.com>
Committed: Tue Jul 25 10:51:00 2017 +0800
----------------------------------------------------------------------
.../src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala | 5 -----
.../test/scala/org/apache/spark/sql/test/SharedSQLContext.scala | 2 ++
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7f295059/sql/core/src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala
index 2dc6b44..e0561ee 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala
@@ -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")
http://git-wip-us.apache.org/repos/asf/spark/blob/7f295059/sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala b/sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala
index 7cea4c0..5ec76a4 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala
@@ -87,6 +87,8 @@ trait SharedSQLContext extends SQLTestUtils with BeforeAndAfterEach with Eventua
protected override def afterEach(): Unit = {
super.afterEach()
+ // Clear all persistent datasets after each test
+ spark.sharedState.cacheManager.clearCache()
// files can be closed from other threads, so wait a bit
// normally this doesn't take more than 1s
eventually(timeout(10.seconds)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org