From 0e4d057528198d711df501450b1ef6fb84abe491 Mon Sep 17 00:00:00 2001 From: Kazuaki Ishizaki Date: Mon, 24 Jul 2017 14:43:38 +0900 Subject: [PATCH 1/3] initial commit --- .../test/scala/org/apache/spark/sql/DatasetCacheSuite.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 2dc6b44ecef3d..87e0d4a6ecaa7 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 @@ -27,7 +27,11 @@ class DatasetCacheSuite extends QueryTest with SharedSQLContext { // Clear all persistent datasets after each test override def afterEach(): Unit = { - spark.sharedState.cacheManager.clearCache() + try { + spark.sharedState.cacheManager.clearCache() + } finally { + super.afterEach() + } } test("get storage level") { From 2ac2798d6df98b9200502e27620415370aa99c3c Mon Sep 17 00:00:00 2001 From: Kazuaki Ishizaki Date: Mon, 24 Jul 2017 19:18:56 +0900 Subject: [PATCH 2/3] address review comment --- .../scala/org/apache/spark/sql/DatasetCacheSuite.scala | 9 --------- .../org/apache/spark/sql/test/SharedSQLContext.scala | 7 ++++++- 2 files changed, 6 insertions(+), 10 deletions(-) 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 87e0d4a6ecaa7..e0561ee2797a5 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,15 +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 = { - try { - spark.sharedState.cacheManager.clearCache() - } finally { - super.afterEach() - } - } - test("get storage level") { val ds1 = Seq("1", "2").toDS().as("a") val ds2 = Seq(2, 3).toDS().as("b") 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 7cea4c02155ea..8e5e188099ebb 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 @@ -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() + } // files can be closed from other threads, so wait a bit // normally this doesn't take more than 1s eventually(timeout(10.seconds)) { From bd6c2ad5aab7ef50281537e6f33582b016b85436 Mon Sep 17 00:00:00 2001 From: Kazuaki Ishizaki Date: Tue, 25 Jul 2017 02:06:06 +0900 Subject: [PATCH 3/3] address review comment --- .../org/apache/spark/sql/test/SharedSQLContext.scala | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 8e5e188099ebb..5ec76a4f0ec90 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 @@ -86,12 +86,9 @@ trait SharedSQLContext extends SQLTestUtils with BeforeAndAfterEach with Eventua } protected override def afterEach(): Unit = { - try { - // Clear all persistent datasets after each test - spark.sharedState.cacheManager.clearCache() - } finally { - super.afterEach() - } + 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)) {