Skip to content

[SPARK-17330] [SPARK UT] Clean up spark-warehouse in UT #14894

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
tone-zhang wants to merge 1 commit into from
Closed

[SPARK-17330] [SPARK UT] Clean up spark-warehouse in UT #14894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
// drop all databases, tables and functions after each test
spark.sessionState.catalog.reset()
} finally {
val path = System.getProperty("user.dir") + "/spark-warehouse"
Utils.deleteRecursively(new File(path))
super.afterEach()
}
}
Expand Down
6 changes: 5 additions & 1 deletion sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,9 @@ object SparkSubmitClassLoaderTest extends Logging {
def main(args: Array[String]) {
Utils.configTestLog4j("INFO")
val conf = new SparkConf()
val hiveWarehouseLocation = Utils.createTempDir()
conf.set("spark.ui.enabled", "false")
conf.set("spark.sql.warehouse.dir", hiveWarehouseLocation.toString)
val sc = new SparkContext(conf)
val hiveContext = new TestHiveContext(sc)
val df = hiveContext.createDataFrame((1 to 100).map(i => (i, i))).toDF("i", "j")
Expand Down Expand Up @@ -699,11 +701,13 @@ object SPARK_9757 extends QueryTest {
def main(args: Array[String]): Unit = {
Utils.configTestLog4j("INFO")

val hiveWarehouseLocation = Utils.createTempDir()
val sparkContext = new SparkContext(
new SparkConf()
.set("spark.sql.hive.metastore.version", "0.13.1")
.set("spark.sql.hive.metastore.jars", "maven")
.set("spark.ui.enabled", "false"))
.set("spark.ui.enabled", "false")
.set("spark.sql.warehouse.dir", hiveWarehouseLocation.toString))

val hiveContext = new TestHiveContext(sparkContext)
spark = hiveContext.sparkSession
Expand Down