From e5dd64ba354aef193c5516d9a58e1d724220c55b Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 13 Feb 2016 19:53:31 +0100
Subject: Cleanup

---
 common/queryrunner.cpp                              | 4 ++--
 hawd_defs/facade_query                              | 2 +-
 tests/databasepopulationandfacadequerybenchmark.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index fde5b04..d4ace86 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -147,7 +147,7 @@ static inline ResultSet fullScan(const Sink::Storage::Transaction &transaction,
         return true;
     },
     [](const Sink::Storage::Error &error) {
-        qWarning() << "Error during query: " << error.message;
+        Warning() << "Error during query: " << error.message;
     });
 
     Trace() << "Full scan on " << bufferType << " found " << keys.size() << " results";
@@ -221,7 +221,7 @@ void QueryWorker<DomainType>::readEntity(const Sink::Storage::NamedDatabase &db,
         return false;
     },
     [](const Sink::Storage::Error &error) {
-        qWarning() << "Error during query: " << error.message;
+        Warning() << "Error during query: " << error.message;
     });
 }
 
diff --git a/hawd_defs/facade_query b/hawd_defs/facade_query
index 8567a5d..615a023 100644
--- a/hawd_defs/facade_query
+++ b/hawd_defs/facade_query
@@ -3,6 +3,6 @@
     "description": "Measures performance of the query system",
     "columns": [
         { "name": "rows", "type": "int" },
-        { "name": "queryTimePerResult", "type": "float", "unit": "result/ms" }
+        { "name": "queryResultPerMs", "type": "float", "unit": "result/ms" }
     ]
 }
diff --git a/tests/databasepopulationandfacadequerybenchmark.cpp b/tests/databasepopulationandfacadequerybenchmark.cpp
index 6a2b616..ad3682e 100644
--- a/tests/databasepopulationandfacadequerybenchmark.cpp
+++ b/tests/databasepopulationandfacadequerybenchmark.cpp
@@ -127,7 +127,7 @@ class DatabasePopulationAndFacadeQueryBenchmark : public QObject
         const auto percentageRssError = static_cast<double>(peakRss - finalRss)*100.0/static_cast<double>(finalRss);
         auto rssGrowthPerEntity = rssGrowth/count;
 
-        std::cout << "Loaded " << list.size() << "results." << std::endl;
+        std::cout << "Loaded " << list.size() << " results." << std::endl;
         std::cout << "The query took [ms]: " << elapsed << std::endl;
         std::cout << "Current Rss usage [kb]: " << finalRss/1024 << std::endl;
         std::cout << "Peak Rss usage [kb]: " << peakRss/1024 << std::endl;
@@ -139,7 +139,7 @@ class DatabasePopulationAndFacadeQueryBenchmark : public QObject
         HAWD::Dataset dataset("facade_query", mHawdState);
         HAWD::Dataset::Row row = dataset.row();
         row.setValue("rows", list.size());
-        row.setValue("queryTimePerResult", (qreal)list.size()/elapsed);
+        row.setValue("queryResultPerMs", (qreal)list.size()/elapsed);
         dataset.insertRow(row);
         HAWD::Formatter::print(dataset);
 
-- 
cgit v1.2.3