diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 2fdda227ca6..436af9561fe 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1616,6 +1616,12 @@
+
+
+
+
+
+
@@ -1794,6 +1800,12 @@
+
+
+
+
+
+
@@ -2823,6 +2835,12 @@
+
+
+
+
+
+
@@ -2851,6 +2869,12 @@
+
+
+
+
+
+
@@ -3601,6 +3625,12 @@
+
+
+
+
+
+
@@ -4304,6 +4334,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4340,6 +4406,12 @@
+
+
+
+
+
+
@@ -4382,6 +4454,12 @@
+
+
+
+
+
+
@@ -5420,6 +5498,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5430,6 +5526,12 @@
+
+
+
+
+
+
@@ -7000,10 +7102,10 @@
-
-
-
-
+
+
+
+
diff --git a/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts b/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
index d8aa0acf39a..da5908a5d44 100644
--- a/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
+++ b/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
@@ -7,5 +7,6 @@ dependencies {
implementation("com.squareup.okhttp3:okhttp:4.9.0")
implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r")
implementation("org.slf4j:slf4j-nop:1.7.32")
- implementation("org.jetbrains.kotlinx:dataframe:0.8.0-rc-3")
+ // Dev version contains the fix for this bug: https://github.com/Kotlin/dataframe/issues/101
+ implementation("org.jetbrains.kotlinx:dataframe:0.8.0-dev-952")
}
diff --git a/libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt b/libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt
index 47ac37bb4d8..654b197e0ef 100644
--- a/libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt
+++ b/libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt
@@ -20,7 +20,6 @@ import org.jetbrains.kotlinx.dataframe.math.median
import java.io.File
import java.io.InputStream
import java.util.zip.ZipInputStream
-import kotlin.reflect.typeOf
import kotlin.script.experimental.annotations.KotlinScript
import kotlin.script.experimental.api.*
import kotlin.script.experimental.util.PropertiesCollection
@@ -203,12 +202,12 @@ abstract class BenchmarkTemplate(
.remove("version", "tasks") // removing unused columns
.remove { nameContains("warm-up build") } // removing warm-up times
.add("median build time") { // squashing build times into median build time
- valuesOf().median(typeOf())
+ valuesOf().median()
}
.remove { nameContains("measured build") } // removing iterations results
.groupBy("scenario").aggregate { // merging configuration and build times into one row
first { it.values().contains("task start") }["median build time"] into "tasks start median time"
- first { it.values().contains("execution") }["median build time"] into "execution median time"
+ first { it.values().contains("total execution time") }["median build time"] into "execution median time"
}
.add("benchmark") { result.name }
}
@@ -350,7 +349,7 @@ abstract class BenchmarkTemplate(
}
}
- private fun DataFrame<*>.rowToColumn(
+ private fun DataFrame<*>.rowToColumn(
rowName: String,
typeConversion: (Any?) -> T
): List =