From bc06643cd0c16140f6013be35b64732c1676e794 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 20 Feb 2016 11:31:07 +0100
Subject: Cleanup

---
 common/facade.h        |  1 -
 common/query.h         |  2 ++
 common/queryrunner.cpp | 10 +++++-----
 common/typeindex.cpp   |  1 -
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'common')

diff --git a/common/facade.h b/common/facade.h
index a85b1de..99fbcdc 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -26,7 +26,6 @@
 #include <Async/Async>
 
 #include "resourceaccess.h"
-#include "resultset.h"
 #include "domaintypeadaptorfactoryinterface.h"
 #include "storage.h"
 
diff --git a/common/query.h b/common/query.h
index 29cff78..60c5630 100644
--- a/common/query.h
+++ b/common/query.h
@@ -115,7 +115,9 @@ public:
         }
         requestedProperties += rhs.requestedProperties;
         parentProperty = rhs.parentProperty;
+        sortProperty = rhs.sortProperty;
         liveQuery = rhs.liveQuery;
+        limit = rhs.limit;
         return *this;
     }
 
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 1ef076e..2f627bf 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -400,11 +400,11 @@ qint64 QueryWorker<DomainType>::load(const Sink::Query &query, const std::functi
     QSet<QByteArray> remainingFilters;
     QByteArray remainingSorting;
     auto resultSet = baseSetRetriever(transaction, remainingFilters, remainingSorting);
-    Trace() << "Base set retrieved. " << time.elapsed();
+    Trace() << "Base set retrieved. " << Log::TraceTime(time.elapsed());
     auto filteredSet = filterAndSortSet(resultSet, getFilter(remainingFilters, query), db, initialQuery, remainingSorting);
-    Trace() << "Filtered set retrieved. " << time.elapsed();
+    Trace() << "Filtered set retrieved. " << Log::TraceTime(time.elapsed());
     replaySet(filteredSet, resultProvider, query.requestedProperties, offset, batchSize);
-    Trace() << "Filtered set replayed. " << time.elapsed();
+    Trace() << "Filtered set replayed. " << Log::TraceTime(time.elapsed());
     resultProvider.setRevision(Sink::Storage::maxRevision(transaction));
     return Sink::Storage::maxRevision(transaction);
 }
@@ -420,7 +420,7 @@ qint64 QueryWorker<DomainType>::executeIncrementalQuery(const Sink::Query &query
     auto revision = load(query, [&](Sink::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters, QByteArray &remainingSorting) -> ResultSet {
         return loadIncrementalResultSet(baseRevision, query, transaction, remainingFilters);
     }, resultProvider, false, 0, 0);
-    Trace() << "Incremental query took: " << time.elapsed() << " ms";
+    Trace() << "Incremental query took: " << Log::TraceTime(time.elapsed());
     return revision;
 }
 
@@ -443,7 +443,7 @@ qint64 QueryWorker<DomainType>::executeInitialQuery(const Sink::Query &query, co
     auto revision = load(modifiedQuery, [&](Sink::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters, QByteArray &remainingSorting) -> ResultSet {
         return loadInitialResultSet(modifiedQuery, transaction, remainingFilters, remainingSorting);
     }, resultProvider, true, offset, batchsize);
-    Trace() << "Initial query took: " << time.elapsed() << " ms";
+    Trace() << "Initial query took: " << Log::TraceTime(time.elapsed());
     resultProvider.initialResultSetComplete(parent);
     return revision;
 }
diff --git a/common/typeindex.cpp b/common/typeindex.cpp
index e945dcb..3ee2492 100644
--- a/common/typeindex.cpp
+++ b/common/typeindex.cpp
@@ -153,7 +153,6 @@ ResultSet TypeIndex::query(const Sink::Query &query, QSet<QByteArray> &appliedFi
             appliedSorting = it.value();
             Trace() << "Index lookup on " << it.key() << it.value() << " found " << keys.size() << " keys.";
             return ResultSet(keys);
-
         }
     }
     for (const auto &property : mProperties) {
-- 
cgit v1.2.3