From dcfc70808ab9680a8caed6ff0fb98f978fbbef97 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 17 Oct 2017 12:40:03 +0200
Subject: Split up dummyresourcewritebenchmark into datasets that we want to
 display.

---
 tests/hawd/dataset.cpp      | 15 +++++++++++++++
 tests/hawd/dataset.h        |  4 +++-
 tests/hawd/modules/json.cpp |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'tests/hawd')

diff --git a/tests/hawd/dataset.cpp b/tests/hawd/dataset.cpp
index 62fa0d7..3325850 100644
--- a/tests/hawd/dataset.cpp
+++ b/tests/hawd/dataset.cpp
@@ -31,6 +31,7 @@ namespace HAWD
 
 static const QString s_annotationKey("__annotation__");
 static const QString s_hashKey("__commithash__");
+static const QString s_timestampKey("__timestamp");
 static const int s_fieldWidth(20);
 
 Dataset::Row::Row(const Row &other)
@@ -118,6 +119,8 @@ void Dataset::Row::fromBinary(QByteArray data)
             m_annotation = value.toString();
         } else if (key == s_hashKey) {
             m_commitHash = value.toString();
+        } else if (key == s_timestampKey) {
+            m_timeStamp = value.toDateTime();
         } else {
             setValue(key, value);
         }
@@ -141,6 +144,10 @@ QByteArray Dataset::Row::toBinary() const
         stream << s_hashKey << QVariant(m_commitHash);
     }
 
+    if (!m_timeStamp.isValid()) {
+        stream << s_timestampKey << QVariant(m_timeStamp);
+    }
+
     if (!m_annotation.isEmpty()) {
         stream << s_annotationKey << QVariant(m_annotation);
     }
@@ -189,11 +196,19 @@ QString Dataset::Row::commitHash() const
 
 QDateTime Dataset::Row::timestamp() const
 {
+    if (m_timeStamp.isValid()) {
+        return m_timeStamp;
+    }
     QDateTime dt;
     dt.setMSecsSinceEpoch(m_key);
     return dt;
 }
 
+void Dataset::Row::setTimestamp(const QDateTime &dt)
+{
+    m_timeStamp = dt;
+}
+
 QString Dataset::Row::toString(const QStringList &cols, int standardCols, const QString &seperator) const
 {
     if (m_data.isEmpty()) {
diff --git a/tests/hawd/dataset.h b/tests/hawd/dataset.h
index 9660709..f24cacf 100644
--- a/tests/hawd/dataset.h
+++ b/tests/hawd/dataset.h
@@ -28,6 +28,7 @@
 
 #include <QHash>
 #include <QVariant>
+#include <QDateTime>
 
 namespace HAWD
 {
@@ -52,6 +53,7 @@ public:
             QDateTime timestamp() const;
             void annotate(const QString &note);
             void setCommitHash(const QString &hash);
+            void setTimestamp(const QDateTime &dt);
             qint64 key() const;
             QByteArray toBinary() const;
             QString toString(const QStringList &cols = QStringList(), int standardCols = All, const QString &seperator = "|") const;
@@ -66,6 +68,7 @@ public:
             QHash<QString, QVariant> m_data;
             QString m_annotation;
             QString m_commitHash;
+            QDateTime m_timeStamp;
             const Dataset *m_dataset;
             friend class Dataset;
     };
@@ -82,7 +85,6 @@ public:
     void eachRow(const std::function<void(const Row &row)> &resultHandler);
     Row row(qint64 key = 0);
     Row lastRow();
-    //TODO: row cursor
 
 private:
     DatasetDefinition m_definition;
diff --git a/tests/hawd/modules/json.cpp b/tests/hawd/modules/json.cpp
index d299761..092c977 100644
--- a/tests/hawd/modules/json.cpp
+++ b/tests/hawd/modules/json.cpp
@@ -63,6 +63,7 @@ bool Json::toJson(const QStringList &commands, State &state)
 
     QJsonObject json;
     json.insert("dataset", datasetName);
+    json.insert("name", definition.name());
     json.insert("description", definition.description());
 
     const auto columns = definition.columns();
-- 
cgit v1.2.3