cloud-fan commented on a change in pull request #28055:
URL: https://github.com/apache/spark/pull/28055#discussion_r426121267
##########
File path:
sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
##########
@@ -218,35 +229,45 @@ class CliSuite extends SparkFunSuite with
BeforeAndAfterAll with BeforeAndAfterE
test("load warehouse dir from --conf spark(.hadoop).hive.*") {
// override conf from hive-site.xml
- runCliWithin(
- 2.minute,
- extraArgs = Seq("--conf",
s"spark.hadoop.${ConfVars.METASTOREWAREHOUSE}=$sparkWareHouseDir"),
- maybeWarehouse = None,
- useExternalHiveFile = true)(
- "desc database default;" -> sparkWareHouseDir.getAbsolutePath,
- "create database cliTestDb;" -> "",
- "desc database cliTestDb;" -> sparkWareHouseDir.getAbsolutePath,
- "set spark.sql.warehouse.dir;" -> sparkWareHouseDir.getAbsolutePath)
-
- // override conf from --hiveconf too
- runCliWithin(
- 2.minute,
- extraArgs = Seq("--conf",
s"spark.${ConfVars.METASTOREWAREHOUSE}=$sparkWareHouseDir"))(
- "desc database default;" -> sparkWareHouseDir.getAbsolutePath,
- "create database cliTestDb;" -> "",
- "desc database cliTestDb;" -> sparkWareHouseDir.getAbsolutePath,
- "set spark.sql.warehouse.dir;" -> sparkWareHouseDir.getAbsolutePath)
+ val metastore = Utils.createTempDir()
+ metastore.delete()
+ try {
+ runCliWithin(2.minute,
+ extraArgs =
+ Seq("--conf",
s"spark.hadoop.${ConfVars.METASTOREWAREHOUSE}=$sparkWareHouseDir"),
+ maybeWarehouse = None,
+ useExternalHiveFile = true,
+ metastore = metastore)(
+ "desc database default;" -> sparkWareHouseDir.getAbsolutePath,
+ "create database cliTestDb;" -> "",
+ "desc database cliTestDb;" -> sparkWareHouseDir.getAbsolutePath,
+ "set spark.sql.warehouse.dir;" -> sparkWareHouseDir.getAbsolutePath)
+
+ // override conf from --hiveconf too
+ runCliWithin(2.minute,
+ extraArgs = Seq("--conf",
s"spark.${ConfVars.METASTOREWAREHOUSE}=$sparkWareHouseDir"),
+ metastore = metastore)(
+ "desc database default;" -> sparkWareHouseDir.getAbsolutePath,
+ "create database cliTestDb;" -> "",
+ "desc database cliTestDb;" -> sparkWareHouseDir.getAbsolutePath,
+ "set spark.sql.warehouse.dir;" -> sparkWareHouseDir.getAbsolutePath)
+ } finally {
+ Utils.deleteRecursively(metastore)
+ }
}
test("load warehouse dir from spark.sql.warehouse.dir") {
// spark.sql.warehouse.dir overrides all hive ones
- runCliWithin(
- 2.minute,
- extraArgs =
- Seq("--conf",
- s"${StaticSQLConf.WAREHOUSE_PATH.key}=${sparkWareHouseDir}1",
- "--conf",
s"spark.hadoop.${ConfVars.METASTOREWAREHOUSE}=${sparkWareHouseDir}2"))(
- "desc database default;" ->
sparkWareHouseDir.getAbsolutePath.concat("1"))
+ val metastore = Utils.createTempDir()
+ metastore.delete()
+ try {
+ runCliWithin(2.minute,
+ extraArgs = Seq(
+ "--conf",
s"${StaticSQLConf.WAREHOUSE_PATH.key}=${sparkWareHouseDir}1",
+ "--conf",
s"spark.hadoop.${ConfVars.METASTOREWAREHOUSE}=${sparkWareHouseDir}2"),
+ metastore = metastore)(
+ "desc database default;" ->
sparkWareHouseDir.getAbsolutePath.concat("1"))
+ }
Review comment:
do we miss a finally clause?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
