From 150a6b07ac84c1a5c5fd65a23072e7644090f1e4 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 23 Jun 2022 11:14:13 +0200 Subject: build: Update simulator dependencies This change updates the simulator dependencies to the latest available version where possible. --- buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts | 2 +- buildSrc/src/main/kotlin/quarkus-conventions.gradle.kts | 2 +- gradle/libs.versions.toml | 14 +++++++------- opendc-trace/opendc-trace-opendc/build.gradle.kts | 1 + .../trace/opendc/OdcVmInterferenceJsonTableReader.kt | 6 +++--- .../trace/opendc/OdcVmInterferenceJsonTableWriter.kt | 2 +- .../kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt | 4 ++-- opendc-web/opendc-web-runner-quarkus/build.gradle.kts | 2 +- opendc-web/opendc-web-ui-quarkus/build.gradle.kts | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts b/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts index 7d8775c6..554d2279 100644 --- a/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts @@ -34,7 +34,7 @@ configure { } jmh { - jmhVersion.set("1.33") + jmhVersion.set("1.35") profilers.add("stack") profilers.add("gc") diff --git a/buildSrc/src/main/kotlin/quarkus-conventions.gradle.kts b/buildSrc/src/main/kotlin/quarkus-conventions.gradle.kts index a0447362..75c4a454 100644 --- a/buildSrc/src/main/kotlin/quarkus-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/quarkus-conventions.gradle.kts @@ -51,7 +51,7 @@ tasks.withType { /* Launch Quarkus dev mode from project root directory */ tasks.quarkusDev { - workingDir = rootProject.projectDir.toString() + workingDirectory.set(rootProject.projectDir) } /* Make sure the jacoco-report-aggregation plugin picks up the Quarkus coverage data */ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d4b1b300..899d3cfc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] calcite = "1.30.0" -clikt = "3.4.2" +clikt = "3.5.0" commons-math3 = "3.6.1" dokka = "1.6.21" gradle-node = "3.3.0" -hadoop = "3.3.2" +hadoop = "3.3.3" jackson = "2.13.3" jandex-gradle = "0.12.0" jline = "3.21.0" @@ -12,17 +12,17 @@ jmh-gradle = "0.6.6" jakarta-validation = "2.0.2" junit-jupiter = "5.8.2" kotlin = "1.6.21" -kotlin-logging = "2.1.21" -kotlinx-coroutines = "1.6.1" +kotlin-logging = "2.1.23" +kotlinx-coroutines = "1.6.3" ktlint-gradle = "10.3.0" log4j = "2.17.2" microprofile-openapi = "3.0" mockk = "1.12.4" -parquet = "1.12.2" +parquet = "1.12.3" progressbar = "0.9.3" -quarkus = "2.9.0.Final" +quarkus = "2.10.0.Final" quarkus-junit5-mockk = "1.1.1" -sentry = "5.7.2" +sentry = "6.1.2" slf4j = "1.7.36" [libraries] diff --git a/opendc-trace/opendc-trace-opendc/build.gradle.kts b/opendc-trace/opendc-trace-opendc/build.gradle.kts index 236bdedc..18967136 100644 --- a/opendc-trace/opendc-trace-opendc/build.gradle.kts +++ b/opendc-trace/opendc-trace-opendc/build.gradle.kts @@ -32,6 +32,7 @@ dependencies { api(projects.opendcTrace.opendcTraceApi) implementation(projects.opendcTrace.opendcTraceParquet) + implementation(libs.jackson.core) testImplementation(projects.opendcTrace.opendcTraceTestkit) testRuntimeOnly(libs.slf4j.simple) diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt index 1841c486..d4858f23 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt @@ -22,14 +22,14 @@ package org.opendc.trace.opendc +import com.fasterxml.jackson.core.JsonParseException +import com.fasterxml.jackson.core.JsonParser +import com.fasterxml.jackson.core.JsonToken import org.opendc.trace.* import org.opendc.trace.conv.INTERFERENCE_GROUP_MEMBERS import org.opendc.trace.conv.INTERFERENCE_GROUP_SCORE import org.opendc.trace.conv.INTERFERENCE_GROUP_TARGET import org.opendc.trace.util.convertTo -import shaded.parquet.com.fasterxml.jackson.core.JsonParseException -import shaded.parquet.com.fasterxml.jackson.core.JsonParser -import shaded.parquet.com.fasterxml.jackson.core.JsonToken import java.time.Duration import java.time.Instant import java.util.* diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableWriter.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableWriter.kt index d726e890..d5e8a0b6 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableWriter.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableWriter.kt @@ -22,11 +22,11 @@ package org.opendc.trace.opendc +import com.fasterxml.jackson.core.JsonGenerator import org.opendc.trace.* import org.opendc.trace.conv.INTERFERENCE_GROUP_MEMBERS import org.opendc.trace.conv.INTERFERENCE_GROUP_SCORE import org.opendc.trace.conv.INTERFERENCE_GROUP_TARGET -import shaded.parquet.com.fasterxml.jackson.core.JsonGenerator import java.time.Duration import java.time.Instant import java.util.* diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt index a9c5b934..2c5f892b 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt @@ -22,6 +22,8 @@ package org.opendc.trace.opendc +import com.fasterxml.jackson.core.JsonEncoding +import com.fasterxml.jackson.core.JsonFactory import org.apache.parquet.column.ParquetProperties import org.apache.parquet.hadoop.ParquetFileWriter import org.apache.parquet.hadoop.metadata.CompressionCodecName @@ -35,8 +37,6 @@ import org.opendc.trace.spi.TableDetails import org.opendc.trace.spi.TraceFormat import org.opendc.trace.util.parquet.LocalParquetReader import org.opendc.trace.util.parquet.LocalParquetWriter -import shaded.parquet.com.fasterxml.jackson.core.JsonEncoding -import shaded.parquet.com.fasterxml.jackson.core.JsonFactory import java.nio.file.Files import java.nio.file.Path import kotlin.io.path.exists diff --git a/opendc-web/opendc-web-runner-quarkus/build.gradle.kts b/opendc-web/opendc-web-runner-quarkus/build.gradle.kts index a92e03f2..8e4e08d5 100644 --- a/opendc-web/opendc-web-runner-quarkus/build.gradle.kts +++ b/opendc-web/opendc-web-runner-quarkus/build.gradle.kts @@ -28,7 +28,7 @@ plugins { } quarkusExtension { - deploymentModule = "opendc-web-runner-quarkus-deployment" + deploymentModule.set("opendc-web-runner-quarkus-deployment") } dependencies { diff --git a/opendc-web/opendc-web-ui-quarkus/build.gradle.kts b/opendc-web/opendc-web-ui-quarkus/build.gradle.kts index 7f2fad20..3f8887f6 100644 --- a/opendc-web/opendc-web-ui-quarkus/build.gradle.kts +++ b/opendc-web/opendc-web-ui-quarkus/build.gradle.kts @@ -28,7 +28,7 @@ plugins { } quarkusExtension { - deploymentModule = "opendc-web-ui-quarkus-deployment" + deploymentModule.set("opendc-web-ui-quarkus-deployment") } dependencies { -- cgit v1.2.3 From 5000b72355d7b02acd525375ac4861445d10d89f Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 23 Jun 2022 11:18:21 +0200 Subject: bug(compute/workload): Fix conversion from UUID to Binary This change fixes an issue with the metric exporting code in OpenDC where a UUID is not converted correctly into a `Binary` object that is consumed by the Apache Parquet library. --- .../main/kotlin/org/opendc/compute/workload/export/parquet/Utils.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/export/parquet/Utils.kt b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/export/parquet/Utils.kt index 9921f5b8..050e0f0a 100644 --- a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/export/parquet/Utils.kt +++ b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/export/parquet/Utils.kt @@ -27,12 +27,12 @@ import java.nio.ByteBuffer import java.util.UUID /** - * - * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl) + * Helper method to convert a [UUID] into a [Binary] object consumed by Parquet. */ internal fun UUID.toBinary(): Binary { - val bb = ByteBuffer.wrap(ByteArray(16)) + val bb = ByteBuffer.allocate(16) bb.putLong(mostSignificantBits) bb.putLong(leastSignificantBits) + bb.rewind() return Binary.fromConstantByteBuffer(bb) } -- cgit v1.2.3