azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update kotlin-dataframe to 0.8.0-dev-952

Browse Source 
This version contains fix for https://github.com/Kotlin/dataframe/issues/101

^KT-51360 In Progress
This commit is contained in:
Yahor Berdnikau
2022-04-20 17:17:18 +02:00
parent 67093b49ac
commit 375eff4993
3 changed files with 111 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/verification-metadata.xml
+106 -4
View File
@@ -1616,6 +1616,12 @@
<sha256 value="f171cbafa1dd95ab936f528fde31bc94652611d98945efe3598a20053834a5c7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.virtuald" name="curvesapi" version="1.06">
<artifact name="curvesapi-1.06.jar">
<md5 value="049221bdb7f8d8a2065c02000e854ed4" origin="Generated by Gradle"/>
<sha256 value="38bb45c99e6153260c19b97b99b6a7370a067de63344de6d1ea11922acaed86b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google" name="google" version="1">
<artifact name="google-1.pom">
<md5 value="381522d89556693d1f99b99ae29e2089" origin="Generated by Gradle"/>
@@ -1794,6 +1800,12 @@
<sha256 value="8d3b5b9fa211979e9c425e989825c07743d2eb4dc8c20ec61de0f5b3dc1a6333" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.flatbuffers" name="flatbuffers-java" version="1.12.0">
<artifact name="flatbuffers-java-1.12.0.jar">
<md5 value="26ecc1a330e441f909226a338d4bef65" origin="Generated by Gradle"/>
<sha256 value="3f8c088b4dd04a9858721f2e162508c94db0dd86f961e306ee63ef2eda871bf7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.gradle" name="osdetector-gradle-plugin" version="1.4.0">
<artifact name="osdetector-gradle-plugin-1.4.0.jar">
<md5 value="e1a70acb676ab9cf9f9b080ead2b9e44" origin="Generated by Gradle"/>
@@ -2823,6 +2835,12 @@
<sha256 value="267982c61119a055ba2b23d9cf90b02d3d16c202c03cb0c3a53b9633eae37249" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.zaxxer" name="SparseBitSet" version="1.2">
<artifact name="SparseBitSet-1.2.jar">
<md5 value="1c6032441aec11b523e1a7bfa96d60cf" origin="Generated by Gradle"/>
<sha256 value="91e6b318c901a0f2dd1f6ce781d62474435ae627d22fbac9b21bbc39ffd804b6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-beanutils" name="commons-beanutils" version="1.8.0">
<artifact name="commons-beanutils-1.8.0.jar">
<md5 value="d93127c2aa1815a25b13d971e974e9b1" origin="Generated by Gradle"/>
@@ -2851,6 +2869,12 @@
<sha256 value="c2e2a902d38230cf3031d0b434d5de2614fa0ff26d384b6d282aab56c7d3fc69" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.15">
<artifact name="commons-codec-1.15.jar">
<md5 value="303baf002ce6d382198090aedd9d79a2" origin="Generated by Gradle"/>
<sha256 value="b3e9f6d63a790109bf0d056611fbed1cf69055826defeb9894a71369d246ed63" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.3">
<artifact name="commons-codec-1.3.jar">
<md5 value="8e149c1053741c03736a52df83974dcc" origin="Generated by Gradle"/>
@@ -3601,6 +3625,12 @@
<sha256 value="0d1f101e4db7d530ed04d7cabd57d95c0750f059bb6b3fadfed0c80d4734c717" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.netty" name="netty-common" version="4.1.68.Final">
<artifact name="netty-common-4.1.68.Final.jar">
<md5 value="d8ce49acebde39147e7f1d22360dd27a" origin="Generated by Gradle"/>
<sha256 value="d592bc7e6d300a2c7a119e7b420abb76651fa0a5f7be641d1bfc1175dc40fd92" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.netty" name="netty-handler" version="4.1.52.Final">
<artifact name="netty-handler-4.1.52.Final.jar">
<md5 value="10e5983aa882053b9d02b75380c32a64" origin="Generated by Gradle"/>
@@ -4304,6 +4334,42 @@
<sha256 value="da9fd92eacdf63daf0be52eb71accc10ff7943a85d7aac9ea96cf7e03ee3d3cc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.ant" name="ant-launcher" version="1.9.9">
<artifact name="ant-launcher-1.9.9.jar">
<md5 value="430b91efb8017b5f45e1f30be05c0055" origin="Generated by Gradle"/>
<sha256 value="02cbe010ceec4acab059acfa48a16dc7b7c430200f2561b6b7c75bcab48f4044" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.arrow" name="arrow-format" version="7.0.0">
<artifact name="arrow-format-7.0.0.jar">
<md5 value="99c7a0c076a4f3604c919f84a7c4caad" origin="Generated by Gradle"/>
<sha256 value="2433e493bfe7e1e0d24bd398ca05be558e2aa41a0a1b30ea78da8ba8c069df48" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.arrow" name="arrow-memory-core" version="7.0.0">
<artifact name="arrow-memory-core-7.0.0.jar">
<md5 value="8ee3dfa77694c2a9c5302f4e0565bf0d" origin="Generated by Gradle"/>
<sha256 value="8f30d9302daa1da1897c9f017014287894b719a570b78ccfa5070de24db9e5f3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.arrow" name="arrow-memory-unsafe" version="7.0.0">
<artifact name="arrow-memory-unsafe-7.0.0.jar">
<md5 value="570eb3d2a318c8b56f26ff38d91170ec" origin="Generated by Gradle"/>
<sha256 value="0313ece1b1413ba1080b2242551ee48e4d6c31f1f2f53f4d153a112fa66759b6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.arrow" name="arrow-vector" version="7.0.0">
<artifact name="arrow-vector-7.0.0.jar">
<md5 value="e93ba6b6f8aed1709d45377455f57c90" origin="Generated by Gradle"/>
<sha256 value="84c4b24a078ec4a30f4bf972499cb59afbda920fe8bc85fbd5164162c3b6b3e2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-collections4" version="4.4">
<artifact name="commons-collections4-4.4.jar">
<md5 value="4a37023740719b391f10030362c86be6" origin="Generated by Gradle"/>
<sha256 value="1df8b9430b5c8ed143d7815e403e33ef5371b2400aadbe9bda0883762e0846d1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-compress" version="1.0">
<artifact name="commons-compress-1.0.jar">
<md5 value="0bbe31402b267ec6f54e06edcd8f06cf" origin="Generated by Gradle"/>
@@ -4340,6 +4406,12 @@
<sha256 value="0aeb625c948c697ea7b205156e112363b59ed5e2551212cd4e460bdb72c7c06e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-compress" version="1.21">
<artifact name="commons-compress-1.21.jar">
<md5 value="2a713d10331bc4e13459a3dc0463f16f" origin="Generated by Gradle"/>
<sha256 value="6aecfd5459728a595601cfa07258d131972ffc39b492eb48bdd596577a2f244a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-csv" version="1.8">
<artifact name="commons-csv-1.8.jar">
<md5 value="9019d99d6072f48fd9b1f909f0c45d24" origin="Generated by Gradle"/>
@@ -4382,6 +4454,12 @@
<sha256 value="2cd0db7bce370c1404025cc013c11f8fd49f3f3c340a6d2dcf99d363d7948a69" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-math3" version="3.6.1">
<artifact name="commons-math3-3.6.1.jar">
<md5 value="5b730d97e4e6368069de1983937c508e" origin="Generated by Gradle"/>
<sha256 value="1e56d7b058d28b65abd256b8458e3885b674c1d588fa43cd7d1cbb9c7ef2b308" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="11">
<artifact name="commons-parent-11.pom">
<md5 value="6ae42cd0d54803b08cdcee882ac702fa" origin="Generated by Gradle"/>
@@ -5420,6 +5498,24 @@
<sha256 value="340422be8f3e3c847a0a0bf944296774f6db81f2fa8b34912bc931a112a26919" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi" version="5.2.0">
<artifact name="poi-5.2.0.jar">
<md5 value="6ac9e8c56667426466ad5baa5a5acafe" origin="Generated by Gradle"/>
<sha256 value="9a3dc3e2587dbfa6c70cf738930e318cff9455b94713681e4c85370898f0e7aa" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi-ooxml" version="5.2.0">
<artifact name="poi-ooxml-5.2.0.jar">
<md5 value="12cbffb7db693cbb9babb64dc280a915" origin="Generated by Gradle"/>
<sha256 value="e4cd8ca11c7958675df366d7d33ad29146f04ea1de837ccd0c4d80ae1a2ff376" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi-ooxml-lite" version="5.2.0">
<artifact name="poi-ooxml-lite-5.2.0.jar">
<md5 value="a6e010a3746688ef4f67547be49c4b92" origin="Generated by Gradle"/>
<sha256 value="97133fdf1d1f7ae5fc18369c1ab32e28164057e2e3602416e322ff4e887e7d52" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.velocity" name="velocity" version="1.7">
<artifact name="velocity-1.7.jar">
<md5 value="3692dd72f8367cb35fb6280dc2916725" origin="Generated by Gradle"/>
@@ -5430,6 +5526,12 @@
<sha256 value="a3f97ceab5f073ed93ef8fe6304e35252d83ecf2442c83fe0492b8b73da3b40b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.xmlbeans" name="xmlbeans" version="5.0.3">
<artifact name="xmlbeans-5.0.3.jar">
<md5 value="58a3133435c7c5ad1d1afb487ffdd73b" origin="Generated by Gradle"/>
<sha256 value="b662cba69fe211084c603ecd5733d93d4f97d64c5e273b9c7fdd521122f63fe9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apiguardian" name="apiguardian-api" version="1.0.0">
<artifact name="apiguardian-api-1.0.0.jar">
<md5 value="e3695c130292987799af0d18754fa3fc" origin="Generated by Gradle"/>
@@ -7000,10 +7102,10 @@
<sha256 value="d6c3b8d52ae3653375140d67e859477ef90d193be48d44486b21efd70fa2eedc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="dataframe" version="0.8.0-rc-3">
<artifact name="dataframe-0.8.0-rc-3.jar">
<md5 value="943586a9c4f3792b51ebf516de121572" origin="Generated by Gradle"/>
<sha256 value="f30ccda59e60b641b3b7f49fef8044c3d0ec3e8a7c8d1f53b07dc7b74a4a9418" origin="Generated by Gradle"/>
<component group="org.jetbrains.kotlinx" name="dataframe" version="0.8.0-dev-952">
<artifact name="dataframe-0.8.0-dev-952.jar">
<md5 value="1a4a81445d286f53a666883c39fd821e" origin="Generated by Gradle"/>
<sha256 value="6ff9c38560fc94231ff106fa59435c50e721867a344e1a4fa041c2541e2d8a3f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="kotlinx-benchmark-plugin" version="0.3.1">
libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
+2 -1
View File
@@ -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")
}
libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt
+3 -4
View File
@@ -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<Int>().median(typeOf<Int>())
valuesOf<Int>().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 <T : Any> DataFrame<*>.rowToColumn(
private fun <T : Any?> DataFrame<*>.rowToColumn(
rowName: String,
typeConversion: (Any?) -> T
): List<T> =