From b0806dcf21ab811c46b715cfdff8a6307e117810 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 1 Sep 2021 18:28:34 +0200
Subject: feat(trace): Add API for trace reading

This change introduces a new OpenDC API for reading various trace
formats in a streaming manner.
---
 .../main/kotlin/org/opendc/trace/TableColumn.kt    | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt

(limited to 'opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt')

diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt
new file mode 100644
index 00000000..247e7312
--- /dev/null
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021 AtLarge Research
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.opendc.trace
+
+import java.util.*
+
+/**
+ * A column in a trace table.
+ *
+ * @param name The universal name of this column.
+ */
+public class TableColumn<out T>(public val name: String, type: Class<T>) {
+    /**
+     * The type of the column.
+     */
+    private val type: Class<*> = type
+
+    /**
+     * Determine whether the type of the column is a subtype of [column].
+     */
+    public fun isAssignableTo(column: TableColumn<*>): Boolean {
+        return type.isAssignableFrom(column.type)
+    }
+
+    /**
+     * Compute a hash code for this column.
+     */
+    public override fun hashCode(): Int = Objects.hash(name, type)
+
+    /**
+     * Determine whether this column is equal to [other].
+     */
+    public override fun equals(other: Any?): Boolean = other is TableColumn<*> && name == other.name && type == other.type
+
+    /**
+     * Return a string representation of this column.
+     */
+    public override fun toString(): String = "TableColumn[$name,$type]"
+}
-- 
cgit v1.2.3


From 5935531137a22fdb920921580d491f86adec65c9 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 2 Sep 2021 11:11:50 +0200
Subject: perf(trace): Improve performance of column lookup

---
 .../src/main/kotlin/org/opendc/trace/TableColumn.kt         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt')

diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt
index 247e7312..776c40c0 100644
--- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt
@@ -39,7 +39,7 @@ public class TableColumn<out T>(public val name: String, type: Class<T>) {
      * Determine whether the type of the column is a subtype of [column].
      */
     public fun isAssignableTo(column: TableColumn<*>): Boolean {
-        return type.isAssignableFrom(column.type)
+        return name == column.name && type.isAssignableFrom(column.type)
     }
 
     /**
@@ -50,7 +50,16 @@ public class TableColumn<out T>(public val name: String, type: Class<T>) {
     /**
      * Determine whether this column is equal to [other].
      */
-    public override fun equals(other: Any?): Boolean = other is TableColumn<*> && name == other.name && type == other.type
+    public override fun equals(other: Any?): Boolean {
+        // Fast-path: reference equality
+        if (this === other) {
+            return true
+        } else if (other == null || other !is TableColumn<*>) {
+            return false
+        }
+
+        return name == other.name && type == other.type
+    }
 
     /**
      * Return a string representation of this column.
-- 
cgit v1.2.3