From 3363df4c72a064e590ca98f8e01832cfa4e15a3f Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Tue, 27 Aug 2024 13:48:46 +0200 Subject: Renamed input files and internally server is changed to task (#246) * Updated SimTrace to use a single ArrayDeque instead of three separate lists for deadline, cpuUsage, and coreCount * Renamed input files to tasks.parquet and fragments.parquet. Renamed server to task. OpenDC nows exports tasks.parquet instead of server.parquet --- .../org/opendc/trace/formats/opendc/OdcVmTraceFormat.kt | 8 ++++---- .../test/resources/opendc/trace-v2.0/fragments.parquet | Bin 0 -> 83524 bytes .../src/test/resources/opendc/trace-v2.0/meta.parquet | Bin 1582 -> 0 bytes .../src/test/resources/opendc/trace-v2.0/tasks.parquet | Bin 0 -> 1582 bytes .../src/test/resources/opendc/trace-v2.0/trace.parquet | Bin 83524 -> 0 bytes .../test/resources/opendc/trace-v2.1/fragments.parquet | Bin 0 -> 65174 bytes .../src/test/resources/opendc/trace-v2.1/meta.parquet | Bin 1679 -> 0 bytes .../src/test/resources/opendc/trace-v2.1/tasks.parquet | Bin 0 -> 1679 bytes .../src/test/resources/opendc/trace-v2.1/trace.parquet | Bin 65174 -> 0 bytes 9 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/fragments.parquet delete mode 100644 opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/meta.parquet create mode 100644 opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/tasks.parquet delete mode 100644 opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/trace.parquet create mode 100644 opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/fragments.parquet delete mode 100644 opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/meta.parquet create mode 100644 opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/tasks.parquet delete mode 100644 opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/trace.parquet (limited to 'opendc-trace/opendc-trace-api') diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/formats/opendc/OdcVmTraceFormat.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/formats/opendc/OdcVmTraceFormat.kt index 7a7bc834..2e2617ef 100644 --- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/formats/opendc/OdcVmTraceFormat.kt +++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/formats/opendc/OdcVmTraceFormat.kt @@ -131,11 +131,11 @@ public class OdcVmTraceFormat : TraceFormat { ): TableReader { return when (table) { TABLE_RESOURCES -> { - val reader = LocalParquetReader(path.resolve("meta.parquet"), ResourceReadSupport(projection)) + val reader = LocalParquetReader(path.resolve("tasks.parquet"), ResourceReadSupport(projection)) OdcVmResourceTableReader(reader) } TABLE_RESOURCE_STATES -> { - val reader = LocalParquetReader(path.resolve("trace.parquet"), ResourceStateReadSupport(projection)) + val reader = LocalParquetReader(path.resolve("fragments.parquet"), ResourceStateReadSupport(projection)) OdcVmResourceStateTableReader(reader) } TABLE_INTERFERENCE_GROUPS -> { @@ -160,7 +160,7 @@ public class OdcVmTraceFormat : TraceFormat { return when (table) { TABLE_RESOURCES -> { val writer = - LocalParquetWriter.builder(path.resolve("meta.parquet"), ResourceWriteSupport()) + LocalParquetWriter.builder(path.resolve("tasks.parquet"), ResourceWriteSupport()) .withCompressionCodec(CompressionCodecName.ZSTD) .withPageWriteChecksumEnabled(true) .withWriterVersion(ParquetProperties.WriterVersion.PARQUET_2_0) @@ -170,7 +170,7 @@ public class OdcVmTraceFormat : TraceFormat { } TABLE_RESOURCE_STATES -> { val writer = - LocalParquetWriter.builder(path.resolve("trace.parquet"), ResourceStateWriteSupport()) + LocalParquetWriter.builder(path.resolve("fragments.parquet"), ResourceStateWriteSupport()) .withCompressionCodec(CompressionCodecName.ZSTD) .withDictionaryEncoding("id", true) .withBloomFilterEnabled("id", true) diff --git a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/fragments.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/fragments.parquet new file mode 100644 index 00000000..5b6fa6b7 Binary files /dev/null and b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/fragments.parquet differ diff --git a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/meta.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/meta.parquet deleted file mode 100644 index d6ff09d8..00000000 Binary files a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/meta.parquet and /dev/null differ diff --git a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/tasks.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/tasks.parquet new file mode 100644 index 00000000..d6ff09d8 Binary files /dev/null and b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/tasks.parquet differ diff --git a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/trace.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/trace.parquet deleted file mode 100644 index 5b6fa6b7..00000000 Binary files a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/trace.parquet and /dev/null differ diff --git a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/fragments.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/fragments.parquet new file mode 100644 index 00000000..00ab5835 Binary files /dev/null and b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/fragments.parquet differ diff --git a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/meta.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/meta.parquet deleted file mode 100644 index d8184945..00000000 Binary files a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/meta.parquet and /dev/null differ diff --git a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/tasks.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/tasks.parquet new file mode 100644 index 00000000..d8184945 Binary files /dev/null and b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/tasks.parquet differ diff --git a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/trace.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/trace.parquet deleted file mode 100644 index 00ab5835..00000000 Binary files a/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.1/trace.parquet and /dev/null differ -- cgit v1.2.3