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

5 files changed, 4 insertions, 4 deletions

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/trace.parquet b/opendc-trace/opendc-trace-api/src/test/resources/opendc/trace-v2.0/fragments.parquet
index 5b6fa6b7..5b6fa6b7 100644
--- 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/fragments.parquet
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/tasks.parquet
index d6ff09d8..d6ff09d8 100644
--- 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/tasks.parquet
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/fragments.parquet
index 00ab5835..00ab5835 100644
--- 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/fragments.parquet
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/tasks.parquet
index d8184945..d8184945 100644
--- 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/tasks.parquet