8 files changed, 26 insertions, 33 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index b24dfa8..29b7e68 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -41,7 +41,7 @@
 
 namespace async
 {
-    void run(const std::function<void()> &runner) {
+    static void run(const std::function<void()> &runner) {
         auto timer = new QTimer();
         timer->setSingleShot(true);
         QObject::connect(timer, &QTimer::timeout, [runner, timer]() {
@@ -98,15 +98,6 @@ QList<QByteArray> Store::getResources(const QList<QByteArray> &resourceFilter, c
 }
 
 template <class DomainType>
-QSharedPointer<ResultEmitter<typename DomainType::Ptr> > Store::load(Query query)
-{
-    auto resultSet = QSharedPointer<ResultProvider<typename DomainType::Ptr> >::create();
-    qWarning() << "Main thread " << QThread::currentThreadId();
-    //FIXME remove
-    return resultSet->emitter();
-}
-
-template <class DomainType>
 QSharedPointer<QAbstractItemModel> Store::loadModel(Query query)
 {
     auto model = QSharedPointer<ModelResult<DomainType, typename DomainType::Ptr> >::create(query, query.requestedProperties.toList());
@@ -213,7 +204,6 @@ KAsync::Job<void> Store::synchronize(const Akonadi2::Query &query)
 #define REGISTER_TYPE(T) template KAsync::Job<void> Store::remove<T>(const T &domainObject); \
     template KAsync::Job<void> Store::create<T>(const T &domainObject); \
     template KAsync::Job<void> Store::modify<T>(const T &domainObject); \
-    template QSharedPointer<ResultEmitter<typename T::Ptr> > Store::load<T>(Query query); \
     template QSharedPointer<QAbstractItemModel> Store::loadModel<T>(Query query); \
 
 REGISTER_TYPE(ApplicationDomain::Event);
diff --git a/common/clientapi.h b/common/clientapi.h
index c48c6e9..7fee6ae 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -33,12 +33,6 @@ Q_DECLARE_METATYPE(std::shared_ptr<void>);
 
 class QAbstractItemModel;
 
-namespace async {
-    //This should abstract if we execute from eventloop or in thread.
-    //It supposed to allow the caller to finish the current method before executing the runner.
-    void run(const std::function<void()> &runner);
-}
-
 namespace Akonadi2 {
 
 using namespace async;
@@ -54,12 +48,6 @@ public:
     static QString storageLocation();
     static QByteArray resourceName(const QByteArray &instanceIdentifier);
 
-    /**
-     * Asynchronusly load a dataset
-     */
-    template <class DomainType>
-    static QSharedPointer<ResultEmitter<typename DomainType::Ptr> > load(Query query);
-
     enum Roles {
         DomainObjectRole = Qt::UserRole + 1 //Must be the same as in ModelResult
     };
diff --git a/common/modelresult.cpp b/common/modelresult.cpp
index 65eaba9..930048f 100644
--- a/common/modelresult.cpp
+++ b/common/modelresult.cpp
@@ -141,7 +141,7 @@ void ModelResult<T, Ptr>::add(const Ptr &value)
         return;
     }
     // qDebug() << "Inserting rows " << index << parent;
-    beginInsertRows(QModelIndex(), index, index);
+    beginInsertRows(parent, index, index);
     mEntities.insert(childId, value);
     mTree[id].insert(index, childId);
     mParents.insert(childId, id);
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 4159112..3f62f6a 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -21,6 +21,7 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include <QFuture>
 #include <QFutureWatcher>
+#include <QTime>
 #include "commands.h"
 #include "log.h"
 #include "storage.h"
@@ -45,7 +46,7 @@ static inline ResultSet fullScan(const Akonadi2::Storage::Transaction &transacti
         qWarning() << "Error during query: " << error.message;
     });
 
-    Trace() << "Full scan found " << keys.size() << " results";
+    Trace() << "Full scan on " << bufferType << " found " << keys.size() << " results";
     return ResultSet(keys);
 }
 
@@ -97,6 +98,12 @@ QueryRunner<DomainType>::QueryRunner(const Akonadi2::Query &query, const Akonadi
 }
 
 template<class DomainType>
+QueryRunner<DomainType>::~QueryRunner()
+{
+    Trace() << "Stopped query";
+}
+
+template<class DomainType>
 typename Akonadi2::ResultEmitter<typename DomainType::Ptr>::Ptr QueryRunner<DomainType>::emitter()
 {
     return mResultProvider->emitter();
@@ -202,7 +209,6 @@ ResultSet QueryRunner<DomainType>::filterSet(const ResultSet &resultSet, const s
             readEntity(db, resultSetPtr->id(), [this, filter, callback, initialQuery](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &domainObject, Akonadi2::Operation operation) {
                 //Always remove removals, they probably don't match due to non-available properties
                 if (filter(domainObject) || operation == Akonadi2::Operation_Removal) {
-                    Trace() << "entity is not filtered" << initialQuery;
                     if (initialQuery) {
                         //We're not interested in removals during the initial query
                         if (operation != Akonadi2::Operation_Removal) {
@@ -262,16 +268,24 @@ qint64 QueryRunner<DomainType>::load(const Akonadi2::Query &query, const std::fu
 template<class DomainType>
 qint64 QueryRunner<DomainType>::executeIncrementalQuery(const Akonadi2::Query &query, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider)
 {
+    QTime time;
+    time.start();
+
     const qint64 baseRevision = resultProvider.revision() + 1;
     Trace() << "Running incremental query " << baseRevision;
-    return load(query, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
+    auto revision = load(query, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
         return loadIncrementalResultSet(baseRevision, query, transaction, remainingFilters);
     }, resultProvider, false);
+    Trace() << "Incremental query took: " << time.elapsed() << " ms";
+    return revision;
 }
 
 template<class DomainType>
 qint64 QueryRunner<DomainType>::executeInitialQuery(const Akonadi2::Query &query, const typename DomainType::Ptr &parent, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider)
 {
+    QTime time;
+    time.start();
+
     auto modifiedQuery = query;
     if (!query.parentProperty.isEmpty()) {
         if (parent) {
@@ -282,9 +296,11 @@ qint64 QueryRunner<DomainType>::executeInitialQuery(const Akonadi2::Query &query
             modifiedQuery.propertyFilter.insert(query.parentProperty, QVariant());
         }
     }
-    return load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
+    auto revision = load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
         return loadInitialResultSet(modifiedQuery, transaction, remainingFilters);
     }, resultProvider, true);
+    Trace() << "Initial query took: " << time.elapsed() << " ms";
+    return revision;
 }
 
 template class QueryRunner<Akonadi2::ApplicationDomain::Folder>;
diff --git a/common/queryrunner.h b/common/queryrunner.h
index e2af9de..c918dcb 100644
--- a/common/queryrunner.h
+++ b/common/queryrunner.h
@@ -79,6 +79,7 @@ class QueryRunner : public QueryRunnerBase
 {
 public:
     QueryRunner(const Akonadi2::Query &query, const Akonadi2::ResourceAccessInterface::Ptr &, const QByteArray &instanceIdentifier, const DomainTypeAdaptorFactoryInterface::Ptr &, const QByteArray &bufferType);
+    virtual ~QueryRunner();
 
     typename Akonadi2::ResultEmitter<typename DomainType::Ptr>::Ptr emitter();
 
diff --git a/common/resultprovider.h b/common/resultprovider.h
index 86382ef..6d7867a 100644
--- a/common/resultprovider.h
+++ b/common/resultprovider.h
@@ -106,7 +106,7 @@ private:
 public:
     typedef QSharedPointer<ResultProvider<T> > Ptr;
 
-    ~ResultProvider()
+    virtual ~ResultProvider()
     {
     }
 
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index c75b3ce..3fa5a4e 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -77,7 +77,6 @@ public:
         topLayout->addWidget(titleLabel);
         topLayout->addWidget(syncButton);
         topLayout->addWidget(modelView, 10);
-        model->fetchMore(QModelIndex());
 
         show();
     }
@@ -127,6 +126,7 @@ int main(int argc, char *argv[])
     query.syncOnDemand = false;
     query.processAll = false;
     query.requestedProperties << "name";
+    query.liveQuery = true;
 
     auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
     if (cliOptions.isSet("list")) {
@@ -137,11 +137,9 @@ int main(int argc, char *argv[])
                 qDebug() << model->data(model->index(i, 0, index)).toString();
             }
         });
-        model->fetchMore(QModelIndex());
         return app.exec();
     } else if (cliOptions.isSet("count")) {
         query.liveQuery = false;
-        model->fetchMore(QModelIndex());
         qDebug() << "Counted results " << model->rowCount(QModelIndex());
     } else {
         query.liveQuery = true;
diff --git a/examples/dummyresource/dummystore.cpp b/examples/dummyresource/dummystore.cpp
index 39ecfe4..458695f 100644
--- a/examples/dummyresource/dummystore.cpp
+++ b/examples/dummyresource/dummystore.cpp
@@ -64,7 +64,7 @@ QMap<QString, QMap<QString, QVariant> > populateMails()
 QMap<QString, QMap<QString, QVariant> > populateFolders()
 {
     QMap<QString, QMap<QString, QVariant>> content;
-    for (int i = 0; i < 5000; i++) {
+    for (int i = 0; i < 5; i++) {
         content.insert(QString("key%1").arg(i), createFolder(i));
     }
     return content;