Merge pull request #51 from tarantool/fix-tests-scala-213

Fix local test pipeline for all Scala versions
tarantool · Apr 15, 2023 · 509c4d3 · 509c4d3
2 parents 4910236 + 121ff1b
commit 509c4d3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -128,7 +128,6 @@ lazy val root = (project in file("."))
     },
     publishMavenStyle := true,
     // Release settings
-    crossScalaVersions := Nil,
     releaseProcess := Seq[ReleaseStep](
       checkSnapshotDependencies,
       inquireVersions,

diff --git a/src/test/scala/io/tarantool/spark/connector/integration/SharedSparkContext.scala b/src/test/scala/io/tarantool/spark/connector/integration/SharedSparkContext.scala
@@ -12,7 +12,7 @@ import scala.reflect.io.Directory
 /** Shared Docker container and Spark instance between all tests cases */
 object SharedSparkContext extends Logging {
 
-  private lazy val warehouseLocation = Files.createTempDirectory("spark-wirehouse").toFile
+  private lazy val warehouseLocation = Files.createTempDirectory("spark-warehouse").toFile
 
   private lazy val clusterCookie =
     sys.env.getOrElse("TARANTOOL_CLUSTER_COOKIE", "testapp-cluster-cookie")
@@ -74,9 +74,10 @@ object SharedSparkContext extends Logging {
       .config(conf)
       .config("spark.ui.enabled", false)
       .config("spark.sql.warehouse.dir", warehouseLocationPath)
+      .config("hive.metastore.warehouse.dir", warehouseLocationPath)
       .config(
         "javax.jdo.option.ConnectionURL",
-        "jdbc:derby:;databaseName=tarantoolTest;create=true"
+        s"jdbc:derby:;databaseName=$warehouseLocationPath/tarantoolTest;create=true"
       )
 
     if (withHiveSupport)
@@ -96,6 +97,9 @@ object SharedSparkContext extends Logging {
     _conf
   }
 
+  def dbLocation: String =
+    warehouseLocation.getAbsolutePath
+
   def sc: SparkContext =
     sparkSession.get().sparkContext
 
@@ -107,11 +111,8 @@ object SharedSparkContext extends Logging {
     if (sparkSession.compareAndSet(scRef, null)) {
       scRef.stop()
     }
-    cleanupTempDirectory()
-  }
-
-  def cleanupTempDirectory(): Unit =
     Directory(warehouseLocation).deleteRecursively()
+  }
 
   def teardown(): Unit = {
     container.stop()

diff --git a/...ala/io/tarantool/spark/connector/integration/TarantoolSparkWriteClusterWithHiveTest.scala b/...ala/io/tarantool/spark/connector/integration/TarantoolSparkWriteClusterWithHiveTest.scala
@@ -56,8 +56,9 @@ class TarantoolSparkWriteClusterWithHiveTest extends AnyFunSuite with Matchers w
     forAll(variants) { (stopOnError, batchSize) =>
       val space = "reg_numbers"
 
-      SharedSparkContext.spark.sql("create database if not exists dl_raw")
-      SharedSparkContext.spark.sql("drop table if exists DL_RAW.reg_numbers")
+      SharedSparkContext.spark.sql("drop database if exists DL_RAW cascade")
+      SharedSparkContext.spark.sql("create database if not exists DL_RAW")
+      SharedSparkContext.spark.sql("drop table if exists DL_RAW.reg_numbers purge")
 
       SharedSparkContext.spark.sql("""
                                      |create table if not exists DL_RAW.reg_numbers (
@@ -66,11 +67,11 @@ class TarantoolSparkWriteClusterWithHiveTest extends AnyFunSuite with Matchers w
                                      |    ,regnum                decimal(38) 
                                      |  ) stored as orc""".stripMargin)
       SharedSparkContext.spark.sql(s"""
-                                      |insert into dl_raw.reg_numbers values 
+                                      |insert into DL_RAW.reg_numbers values 
                                        ${generateRows}
                                       |""".stripMargin)
 
-      val ds = SharedSparkContext.spark.table("dl_raw.reg_numbers")
+      val ds = SharedSparkContext.spark.table("DL_RAW.reg_numbers")
 
       ds.printSchema()
 
@@ -79,6 +80,7 @@ class TarantoolSparkWriteClusterWithHiveTest extends AnyFunSuite with Matchers w
         .option("tarantool.space", space)
         .option("tarantool.stopOnError", stopOnError)
         .option("tarantool.batchSize", batchSize)
+        .option("path", s"${SharedSparkContext.dbLocation}/dl_raw.db")
         .mode(SaveMode.Overwrite)
         .save()