summaryrefslogtreecommitdiffstats
path: root/common/queryrunner.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2016-02-20 11:31:07 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2016-02-20 11:31:07 +0100
commitbc06643cd0c16140f6013be35b64732c1676e794 (patch)
tree89193c8f8b4dcbb027397b48bc19474d521562e6 /common/queryrunner.cpp
parentd89c27c9a1cc4d2c4ea806d71653e32c2891077b (diff)
downloadsink-bc06643cd0c16140f6013be35b64732c1676e794.tar.gz
sink-bc06643cd0c16140f6013be35b64732c1676e794.zip
Cleanup
Diffstat (limited to 'common/queryrunner.cpp')
-rw-r--r--common/queryrunner.cpp10
1 files changed, 5 insertions, 5 deletions
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
400 QSet<QByteArray> remainingFilters; 400 QSet<QByteArray> remainingFilters;
401 QByteArray remainingSorting; 401 QByteArray remainingSorting;
402 auto resultSet = baseSetRetriever(transaction, remainingFilters, remainingSorting); 402 auto resultSet = baseSetRetriever(transaction, remainingFilters, remainingSorting);
403 Trace() << "Base set retrieved. " << time.elapsed(); 403 Trace() << "Base set retrieved. " << Log::TraceTime(time.elapsed());
404 auto filteredSet = filterAndSortSet(resultSet, getFilter(remainingFilters, query), db, initialQuery, remainingSorting); 404 auto filteredSet = filterAndSortSet(resultSet, getFilter(remainingFilters, query), db, initialQuery, remainingSorting);
405 Trace() << "Filtered set retrieved. " << time.elapsed(); 405 Trace() << "Filtered set retrieved. " << Log::TraceTime(time.elapsed());
406 replaySet(filteredSet, resultProvider, query.requestedProperties, offset, batchSize); 406 replaySet(filteredSet, resultProvider, query.requestedProperties, offset, batchSize);
407 Trace() << "Filtered set replayed. " << time.elapsed(); 407 Trace() << "Filtered set replayed. " << Log::TraceTime(time.elapsed());
408 resultProvider.setRevision(Sink::Storage::maxRevision(transaction)); 408 resultProvider.setRevision(Sink::Storage::maxRevision(transaction));
409 return Sink::Storage::maxRevision(transaction); 409 return Sink::Storage::maxRevision(transaction);
410} 410}
@@ -420,7 +420,7 @@ qint64 QueryWorker<DomainType>::executeIncrementalQuery(const Sink::Query &query
420 auto revision = load(query, [&](Sink::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters, QByteArray &remainingSorting) -> ResultSet { 420 auto revision = load(query, [&](Sink::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters, QByteArray &remainingSorting) -> ResultSet {
421 return loadIncrementalResultSet(baseRevision, query, transaction, remainingFilters); 421 return loadIncrementalResultSet(baseRevision, query, transaction, remainingFilters);
422 }, resultProvider, false, 0, 0); 422 }, resultProvider, false, 0, 0);
423 Trace() << "Incremental query took: " << time.elapsed() << " ms"; 423 Trace() << "Incremental query took: " << Log::TraceTime(time.elapsed());
424 return revision; 424 return revision;
425} 425}
426 426
@@ -443,7 +443,7 @@ qint64 QueryWorker<DomainType>::executeInitialQuery(const Sink::Query &query, co
443 auto revision = load(modifiedQuery, [&](Sink::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters, QByteArray &remainingSorting) -> ResultSet { 443 auto revision = load(modifiedQuery, [&](Sink::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters, QByteArray &remainingSorting) -> ResultSet {
444 return loadInitialResultSet(modifiedQuery, transaction, remainingFilters, remainingSorting); 444 return loadInitialResultSet(modifiedQuery, transaction, remainingFilters, remainingSorting);
445 }, resultProvider, true, offset, batchsize); 445 }, resultProvider, true, offset, batchsize);
446 Trace() << "Initial query took: " << time.elapsed() << " ms"; 446 Trace() << "Initial query took: " << Log::TraceTime(time.elapsed());
447 resultProvider.initialResultSetComplete(parent); 447 resultProvider.initialResultSetComplete(parent);
448 return revision; 448 return revision;
449} 449}