HAWD: Ensure the column order is maintained

By turning the columns into an array instead of an object,
we can print the values in the same order as in the definition file.
Previosly the order was random, and even headers and values were
somtimes mixed up.

2 files changed, 11 insertions, 11 deletions

diff --git a/hawd_defs/buffer_creation b/hawd_defs/buffer_creation
index 16c1f8c..38426d3 100644
--- a/hawd_defs/buffer_creation
+++ b/hawd_defs/buffer_creation
@@ -1,9 +1,9 @@
 {
     "name": "Buffer Creation",
     "description": "Tests how fast buffer creation is",
-    "columns": {
-        "numBuffers": { "type": "int" },
-        "time": { "type": "int", "unit": "ms", "min": 0, "max": 100 },
-        "ops": { "type": "float", "unit": "ops/ms" }
-    }
+    "columns": [
+        { "name: "numBuffers", "type": "int" },
+        { "name: "time", "type": "int", "unit": "ms", "min": 0, "max": 100 },
+        { "name: "ops", "type": "float", "unit": "ops/ms" }
+    ]
 }
diff --git a/hawd_defs/storage_readwrite b/hawd_defs/storage_readwrite
index 4b5f6c7..d2504e3 100644
--- a/hawd_defs/storage_readwrite
+++ b/hawd_defs/storage_readwrite
@@ -1,10 +1,10 @@
 {
     "name": "Storage Read/Write Performance",
     "description": "Measures performance of the storage class by writing and reading non-trivial datasets",
-    "columns": {
-        "rows": { "type": "int" },
-        "dbWrite": { "type": "float", "unit": "ops/ms" },
-        "fileWrite": { "type": "float", "unit": "ops/ms" },
-        "dbRead": { "type": "float", "unit": "ops/ms" }
-    }
+    "columns": [
+        { "name": "rows", "type": "int" },
+        { "name": "dbWrite", "type": "float", "unit": "ops/ms" },
+        { "name": "fileWrite", "type": "float", "unit": "ops/ms" },
+        { "name": "dbRead", "type": "float", "unit": "ops/ms" }
+    ]
 }