From ce204780ee2434ff6bae50428ae37083835798d3 Mon Sep 17 00:00:00 2001
From: Greg Owen <greg@databricks.com>
Date: Mon, 25 Sep 2017 14:16:11 -0700
Subject: [PATCH] [SPARK-22120][SQL] TestHiveSparkSession.reset() should clean
out Hive warehouse directory
## What changes were proposed in this pull request?
During TestHiveSparkSession.reset(), which is called after each TestHiveSingleton suite, we now delete and recreate the Hive warehouse directory.
## How was this patch tested?
Ran full suite of tests locally, verified that they pass.
Author: Greg Owen <greg@databricks.com>
Closes #19341 from GregOwen/SPARK-22120.
---
.../scala/org/apache/spark/sql/hive/test/TestHive.scala | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala
index 0f6a81b6f8..b6be00dbb3 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala
@@ -18,6 +18,7 @@
package org.apache.spark.sql.hive.test
import java.io.File
+import java.net.URI
import java.util.{Set => JavaSet}
import scala.collection.JavaConverters._
@@ -498,6 +499,11 @@ private[hive] class TestHiveSparkSession(
}
}
+ // Clean out the Hive warehouse between each suite
+ val warehouseDir = new File(new URI(sparkContext.conf.get("spark.sql.warehouse.dir")).getPath)
+ Utils.deleteRecursively(warehouseDir)
+ warehouseDir.mkdir()
+
sharedState.cacheManager.clearCache()
loadedTables.clear()
sessionState.catalog.reset()
--
GitLab