fix tests

UnitTestBot · Oct 10, 2023 · dff5e16 · dff5e16
1 parent 78727c5
commit dff5e16
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -8,6 +8,7 @@ object Versions {
     const val dokka = "1.7.20"
     const val gradle_download = "5.3.0"
     const val gradle_versions = "0.47.0"
+    const val hikaricp = "5.0.1"
     const val guava = "31.1-jre"
     const val javax_activation = "1.1"
     const val javax_mail = "1.4.7"
@@ -158,6 +159,13 @@ object Libs {
         version = Versions.kotlinx_cli
     )
 
+    // https://github.com/brettwooldridge/HikariCP
+    val hikaricp = dep(
+        group = "com.zaxxer",
+        name = "HikariCP",
+        version = Versions.hikaricp
+    )
+
     // https://github.com/xerial/sqlite-jdbc
     val sqlite = dep(
         group = "org.xerial",

diff --git a/jacodb-core/build.gradle.kts b/jacodb-core/build.gradle.kts
@@ -41,6 +41,7 @@ dependencies {
     testImplementation(Libs.javax_mail)
     testImplementation(Libs.joda_time)
     testImplementation(Libs.slf4j_simple)
+    testImplementation(Libs.hikaricp)
 
     testFixturesImplementation(project(":jacodb-api"))
     testFixturesImplementation(kotlin("reflect"))

diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/storage/JcRefactoring.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/storage/JcRefactoring.kt
@@ -22,6 +22,8 @@ import org.jacodb.impl.features.Usages
 import org.jacodb.impl.storage.jooq.tables.references.APPLICATIONMETADATA
 import org.jacodb.impl.storage.jooq.tables.references.REFACTORINGS
 import org.jooq.DSLContext
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTime
 
 abstract class JcRefactoring {
 
@@ -40,6 +42,7 @@ class JcRefactoringChain(private val chain: List<JcRefactoring>) {
 
     private val applied = hashSetOf<String>()
 
+    @OptIn(ExperimentalTime::class)
     fun execute(jooq: DSLContext) {
         try {
             applied.addAll(jooq.select(REFACTORINGS.NAME).from(REFACTORINGS).fetchArray(REFACTORINGS.NAME))
@@ -50,8 +53,11 @@ class JcRefactoringChain(private val chain: List<JcRefactoring>) {
         chain.forEach { ref ->
             jooq.connection {
                 if (!applied.contains(ref.name)) {
-                    ref.run(jooq)
-                    jooq.insertInto(REFACTORINGS).set(REFACTORINGS.NAME, ref.name).execute()
+                    val time = measureTime {
+                        ref.run(jooq)
+                        jooq.insertInto(REFACTORINGS).set(REFACTORINGS.NAME, ref.name).execute()
+                    }
+                    logger.info("Refactoring ${ref.name} took $time msc")
                 }
             }
         }