Always get the latest revision directly from storage

We can just as well read the latest available revision from storage.

4 files changed, 20 insertions, 15 deletions

diff --git a/common/entitystorage.cpp b/common/entitystorage.cpp
index 60d58ad..c60135e 100644
--- a/common/entitystorage.cpp
+++ b/common/entitystorage.cpp
@@ -121,8 +121,9 @@ ResultSet EntityStorageBase::loadInitialResultSet(const Akonadi2::Query &query,
     return resultSet;
 }
 
-ResultSet EntityStorageBase::getResultSet(const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, qint64 baseRevision, qint64 topRevision)
+ResultSet EntityStorageBase::getResultSet(const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, qint64 baseRevision)
 {
+    const qint64 topRevision = Akonadi2::Storage::maxRevision(transaction);
     QSet<QByteArray> remainingFilters = query.propertyFilter.keys().toSet();
     ResultSet resultSet;
     const bool initialQuery = (baseRevision == 0);
diff --git a/common/entitystorage.h b/common/entitystorage.h
index f1d7f84..68b9e46 100644
--- a/common/entitystorage.h
+++ b/common/entitystorage.h
@@ -54,7 +54,7 @@ protected:
      * TODO: Resources should be able to customize this for cases where an entity is not the same as a single buffer.
      */
     void readEntity(const Akonadi2::Storage::Transaction &transaction, const QByteArray &key, const std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &, Akonadi2::Operation)> &resultCallback);
-    ResultSet getResultSet(const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, qint64 baseRevision, qint64 topRevision);
+    ResultSet getResultSet(const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, qint64 baseRevision);
 
 protected:
     QByteArray mResourceInstanceIdentifier;
@@ -99,7 +99,7 @@ protected:
 
 public:
 
-    virtual void read(const Akonadi2::Query &query, const QPair<qint64, qint64> &revisionRange, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider)
+    virtual qint64 read(const Akonadi2::Query &query, qint64 baseRevision, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider)
     {
         Akonadi2::Storage storage(Akonadi2::storageLocation(), mResourceInstanceIdentifier);
         storage.setDefaultErrorHandler([](const Akonadi2::Storage::Error &error) {
@@ -108,10 +108,10 @@ public:
 
         auto transaction = storage.createTransaction(Akonadi2::Storage::ReadOnly);
 
-        Log() << "Querying" << revisionRange.first << revisionRange.second;
+        Log() << "Querying" << baseRevision;
         //TODO fallback in case the old revision is no longer available to clear + redo complete initial scan
         //
-        auto resultSet = getResultSet(query, transaction, revisionRange.first, revisionRange.second);
+        auto resultSet = getResultSet(query, transaction, baseRevision);
         while(resultSet.next([this, resultProvider](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value, Akonadi2::Operation operation) -> bool {
             switch (operation) {
             case Akonadi2::Operation_Creation:
@@ -128,6 +128,7 @@ public:
             }
             return true;
         })){};
+        return Akonadi2::Storage::maxRevision(transaction);
     }
 
 };
diff --git a/common/facade.h b/common/facade.h
index dab1578..5ed3bde 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -44,7 +44,7 @@ class QueryRunner : public QObject
 {
     Q_OBJECT
 public:
-    typedef std::function<KAsync::Job<qint64>(qint64 oldRevision, qint64 newRevision)> QueryFunction;
+    typedef std::function<KAsync::Job<qint64>(qint64 oldRevision)> QueryFunction;
 
     QueryRunner(const Akonadi2::Query &query) : mLatestRevision(0) {};
     /**
@@ -53,10 +53,11 @@ public:
     KAsync::Job<void> run(qint64 newRevision = 0)
     {
         //TODO: JOBAPI: that last empty .then should not be necessary
+        //TODO: remove newRevision
         if (mLatestRevision == newRevision && mLatestRevision > 0) {
             return KAsync::null<void>();
         }
-        return queryFunction(mLatestRevision, newRevision).then<void, qint64>([this](qint64 revision) {
+        return queryFunction(mLatestRevision).then<void, qint64>([this](qint64 revision) {
             mLatestRevision = revision + 1;
         }).then<void>([](){});
     }
@@ -160,9 +161,9 @@ public:
     {
         auto runner = QSharedPointer<QueryRunner>::create(query);
         QWeakPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > weakResultProvider = resultProvider;
-        runner->setQuery([this, weakResultProvider, query] (qint64 oldRevision, qint64 newRevision) -> KAsync::Job<qint64> {
-            return KAsync::start<qint64>([this, weakResultProvider, query, oldRevision, newRevision](KAsync::Future<qint64> &future) {
-                Trace() << "Executing query " << oldRevision << newRevision;
+        runner->setQuery([this, weakResultProvider, query] (qint64 oldRevision) -> KAsync::Job<qint64> {
+            return KAsync::start<qint64>([this, weakResultProvider, query, oldRevision](KAsync::Future<qint64> &future) {
+                Trace() << "Executing query " << oldRevision;
                 auto resultProvider = weakResultProvider.toStrongRef();
                 if (!resultProvider) {
                     Warning() << "Tried executing query after result provider is already gone";
@@ -170,7 +171,7 @@ public:
                     future.setFinished();
                     return;
                 }
-                load(query, resultProvider, oldRevision, newRevision).template then<void, qint64>([&future](qint64 queriedRevision) {
+                load(query, resultProvider, oldRevision).template then<void, qint64>([&future](qint64 queriedRevision) {
                     //TODO set revision in result provider?
                     //TODO update all existing results with new revision
                     future.setValue(queriedRevision);
@@ -213,11 +214,10 @@ protected:
     }
 
 private:
-    virtual KAsync::Job<qint64> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider, qint64 oldRevision, qint64 newRevision)
+    virtual KAsync::Job<qint64> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider, qint64 oldRevision)
     {
         return KAsync::start<qint64>([=]() -> qint64 {
-            mStorage->read(query, qMakePair(oldRevision, newRevision), resultProvider);
-            return newRevision;
+            return mStorage->read(query, oldRevision, resultProvider);
         });
     }
 
diff --git a/tests/genericfacadetest.cpp b/tests/genericfacadetest.cpp
index 4c58b91..f21de70 100644
--- a/tests/genericfacadetest.cpp
+++ b/tests/genericfacadetest.cpp
@@ -25,14 +25,16 @@ class TestEntityStorage : public EntityStorage<Akonadi2::ApplicationDomain::Even
 {
 public:
     using EntityStorage::EntityStorage;
-    virtual void read(const Akonadi2::Query &query, const QPair<qint64, qint64> &revisionRange, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > &resultProvider)  Q_DECL_OVERRIDE
+    virtual qint64 read(const Akonadi2::Query &query, qint64 oldRevision, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > &resultProvider)  Q_DECL_OVERRIDE
     {
         for (const auto &res : mResults) {
             resultProvider->add(res);
         }
+        return mLatestRevision;
     }
 
     QList<Akonadi2::ApplicationDomain::Event::Ptr> mResults;
+    qint64 mLatestRevision;
 };
 
 class TestResourceAccess : public Akonadi2::ResourceAccessInterface
@@ -117,6 +119,7 @@ private Q_SLOTS:
         //Enter a second result
         storage->mResults.clear();
         storage->mResults << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
+        storage->mLatestRevision = 2;
         resourceAccess->emit revisionChanged(2);
 
         //Hack to get event loop in synclistresult to abort again