refactor(trace/api): Introduce type system for trace API

This change updates the trace API by introducing a limited type system
for the table columns. Previously, the table columns could have any
possible type representable by the JVM. With this change, we limit the
available types to a small type system.

3 files changed, 79 insertions, 43 deletions

diff --git a/opendc-trace/opendc-trace-swf/src/main/kotlin/org/opendc/trace/swf/SwfTaskTableReader.kt b/opendc-trace/opendc-trace-swf/src/main/kotlin/org/opendc/trace/swf/SwfTaskTableReader.kt
index 40b604c3..4d0a9008 100644
--- a/opendc-trace/opendc-trace-swf/src/main/kotlin/org/opendc/trace/swf/SwfTaskTableReader.kt
+++ b/opendc-trace/opendc-trace-swf/src/main/kotlin/org/opendc/trace/swf/SwfTaskTableReader.kt
@@ -27,6 +27,7 @@ import org.opendc.trace.conv.*
 import java.io.BufferedReader
 import java.time.Duration
 import java.time.Instant
+import java.util.*
 
 /**
  * A [TableReader] implementation for the SWF format.
@@ -70,43 +71,92 @@ internal class SwfTaskTableReader(private val reader: BufferedReader) : TableRea
         return true
     }
 
-    override fun resolve(column: TableColumn<*>): Int = columns[column] ?: -1
+    override fun resolve(name: String): Int {
+        return when (name) {
+            TASK_ID -> COL_JOB_ID
+            TASK_SUBMIT_TIME -> COL_SUBMIT_TIME
+            TASK_WAIT_TIME -> COL_WAIT_TIME
+            TASK_RUNTIME -> COL_RUN_TIME
+            TASK_ALLOC_NCPUS -> COL_ALLOC_NCPUS
+            TASK_REQ_NCPUS -> COL_REQ_NCPUS
+            TASK_STATUS -> COL_STATUS
+            TASK_USER_ID -> COL_USER_ID
+            TASK_GROUP_ID -> COL_GROUP_ID
+            TASK_PARENTS -> COL_PARENT_JOB
+            else -> -1
+        }
+    }
 
     override fun isNull(index: Int): Boolean {
-        require(index in columns.values) { "Invalid column index" }
+        require(index in COL_JOB_ID..COL_PARENT_THINK_TIME) { "Invalid column index" }
         return false
     }
 
-    override fun get(index: Int): Any? {
+    override fun getBoolean(index: Int): Boolean {
+        throw IllegalArgumentException("Invalid column")
+    }
+
+    override fun getInt(index: Int): Int {
+        return when (index) {
+            COL_REQ_NCPUS, COL_ALLOC_NCPUS, COL_STATUS, COL_GROUP_ID, COL_USER_ID -> fields[index].toInt(10)
+            else -> throw IllegalArgumentException("Invalid column")
+        }
+    }
+
+    override fun getLong(index: Int): Long {
+        throw IllegalArgumentException("Invalid column")
+    }
+
+    override fun getFloat(index: Int): Float {
+        throw IllegalArgumentException("Invalid column")
+    }
+
+    override fun getDouble(index: Int): Double {
+        throw IllegalArgumentException("Invalid column")
+    }
+
+    override fun getString(index: Int): String {
         return when (index) {
             COL_JOB_ID -> fields[index]
-            COL_SUBMIT_TIME -> Instant.ofEpochSecond(fields[index].toLong(10))
-            COL_WAIT_TIME, COL_RUN_TIME -> Duration.ofSeconds(fields[index].toLong(10))
-            COL_REQ_NCPUS, COL_ALLOC_NCPUS, COL_STATUS, COL_GROUP_ID, COL_USER_ID -> getInt(index)
-            COL_PARENT_JOB -> {
-                val parent = fields[index].toLong(10)
-                if (parent < 0) emptySet() else setOf(parent)
-            }
             else -> throw IllegalArgumentException("Invalid column")
         }
     }
 
-    override fun getBoolean(index: Int): Boolean {
+    override fun getUUID(index: Int): UUID? {
         throw IllegalArgumentException("Invalid column")
     }
 
-    override fun getInt(index: Int): Int {
+    override fun getInstant(index: Int): Instant? {
         return when (index) {
-            COL_REQ_NCPUS, COL_ALLOC_NCPUS, COL_STATUS, COL_GROUP_ID, COL_USER_ID -> fields[index].toInt(10)
+            COL_SUBMIT_TIME -> Instant.ofEpochSecond(fields[index].toLong(10))
             else -> throw IllegalArgumentException("Invalid column")
         }
     }
 
-    override fun getLong(index: Int): Long {
+    override fun getDuration(index: Int): Duration? {
+        return when (index) {
+            COL_WAIT_TIME, COL_RUN_TIME -> Duration.ofSeconds(fields[index].toLong(10))
+            else -> throw IllegalArgumentException("Invalid column")
+        }
+    }
+
+    override fun <T> getList(index: Int, elementType: Class<T>): List<T>? {
         throw IllegalArgumentException("Invalid column")
     }
 
-    override fun getDouble(index: Int): Double {
+    override fun <T> getSet(index: Int, elementType: Class<T>): Set<T>? {
+        @Suppress("UNCHECKED_CAST")
+        return when (index) {
+            COL_PARENT_JOB -> {
+                require(elementType.isAssignableFrom(String::class.java))
+                val parent = fields[index].toLong(10)
+                if (parent < 0) emptySet() else setOf(parent)
+            }
+            else -> throw IllegalArgumentException("Invalid column")
+        } as Set<T>?
+    }
+
+    override fun <K, V> getMap(index: Int, keyType: Class<K>, valueType: Class<V>): Map<K, V>? {
         throw IllegalArgumentException("Invalid column")
     }
 
@@ -135,17 +185,4 @@ internal class SwfTaskTableReader(private val reader: BufferedReader) : TableRea
     private val COL_PART_NUM = 15
     private val COL_PARENT_JOB = 16
     private val COL_PARENT_THINK_TIME = 17
-
-    private val columns = mapOf(
-        TASK_ID to COL_JOB_ID,
-        TASK_SUBMIT_TIME to COL_SUBMIT_TIME,
-        TASK_WAIT_TIME to COL_WAIT_TIME,
-        TASK_RUNTIME to COL_RUN_TIME,
-        TASK_ALLOC_NCPUS to COL_ALLOC_NCPUS,
-        TASK_REQ_NCPUS to COL_REQ_NCPUS,
-        TASK_STATUS to COL_STATUS,
-        TASK_USER_ID to COL_USER_ID,
-        TASK_GROUP_ID to COL_GROUP_ID,
-        TASK_PARENTS to COL_PARENT_JOB
-    )
 }
diff --git a/opendc-trace/opendc-trace-swf/src/main/kotlin/org/opendc/trace/swf/SwfTraceFormat.kt b/opendc-trace/opendc-trace-swf/src/main/kotlin/org/opendc/trace/swf/SwfTraceFormat.kt
index 916a5eca..40f98a01 100644
--- a/opendc-trace/opendc-trace-swf/src/main/kotlin/org/opendc/trace/swf/SwfTraceFormat.kt
+++ b/opendc-trace/opendc-trace-swf/src/main/kotlin/org/opendc/trace/swf/SwfTraceFormat.kt
@@ -47,24 +47,23 @@ public class SwfTraceFormat : TraceFormat {
         return when (table) {
             TABLE_TASKS -> TableDetails(
                 listOf(
-                    TASK_ID,
-                    TASK_SUBMIT_TIME,
-                    TASK_WAIT_TIME,
-                    TASK_RUNTIME,
-                    TASK_REQ_NCPUS,
-                    TASK_ALLOC_NCPUS,
-                    TASK_PARENTS,
-                    TASK_STATUS,
-                    TASK_GROUP_ID,
-                    TASK_USER_ID
-                ),
-                emptyList()
+                    TableColumn(TASK_ID, TableColumnType.String),
+                    TableColumn(TASK_SUBMIT_TIME, TableColumnType.Instant),
+                    TableColumn(TASK_WAIT_TIME, TableColumnType.Duration),
+                    TableColumn(TASK_RUNTIME, TableColumnType.Duration),
+                    TableColumn(TASK_REQ_NCPUS, TableColumnType.Int),
+                    TableColumn(TASK_ALLOC_NCPUS, TableColumnType.Int),
+                    TableColumn(TASK_PARENTS, TableColumnType.Set(TableColumnType.String)),
+                    TableColumn(TASK_STATUS, TableColumnType.String),
+                    TableColumn(TASK_GROUP_ID, TableColumnType.Int),
+                    TableColumn(TASK_USER_ID, TableColumnType.Int)
+                )
             )
             else -> throw IllegalArgumentException("Table $table not supported")
         }
     }
 
-    override fun newReader(path: Path, table: String, projection: List<TableColumn<*>>?): TableReader {
+    override fun newReader(path: Path, table: String, projection: List<String>?): TableReader {
         return when (table) {
             TABLE_TASKS -> SwfTaskTableReader(path.bufferedReader())
             else -> throw IllegalArgumentException("Table $table not supported")
diff --git a/opendc-trace/opendc-trace-swf/src/test/kotlin/org/opendc/trace/swf/SwfTraceFormatTest.kt b/opendc-trace/opendc-trace-swf/src/test/kotlin/org/opendc/trace/swf/SwfTraceFormatTest.kt
index c3d644e8..afecdbb9 100644
--- a/opendc-trace/opendc-trace-swf/src/test/kotlin/org/opendc/trace/swf/SwfTraceFormatTest.kt
+++ b/opendc-trace/opendc-trace-swf/src/test/kotlin/org/opendc/trace/swf/SwfTraceFormatTest.kt
@@ -62,10 +62,10 @@ internal class SwfTraceFormatTest {
 
         assertAll(
             { assertTrue(reader.nextRow()) },
-            { assertEquals("1", reader.get(TASK_ID)) },
+            { assertEquals("1", reader.getString(TASK_ID)) },
             { assertEquals(306, reader.getInt(TASK_ALLOC_NCPUS)) },
             { assertTrue(reader.nextRow()) },
-            { assertEquals("2", reader.get(TASK_ID)) },
+            { assertEquals("2", reader.getString(TASK_ID)) },
             { assertEquals(17, reader.getInt(TASK_ALLOC_NCPUS)) },
         )