Only load the properties we need.

...and adjust the test accordingly with what we expect.

4 files changed, 18 insertions, 13 deletions

diff --git a/common/bufferadaptor.h b/common/bufferadaptor.h
index 121ef9d..aaff1c2 100644
--- a/common/bufferadaptor.h
+++ b/common/bufferadaptor.h
@@ -45,11 +45,17 @@ public:
     {
     }
 
-    MemoryBufferAdaptor(const BufferAdaptor &buffer)
+    MemoryBufferAdaptor(const BufferAdaptor &buffer, const QList<QByteArray> &properties)
         : BufferAdaptor()
     {
-        for(const auto &property : buffer.availableProperties()) {
-            mValues.insert(property, buffer.getProperty(property));
+        if (properties.isEmpty()) {
+            for(const auto &property : buffer.availableProperties()) {
+                mValues.insert(property, buffer.getProperty(property));
+            }
+        } else {
+            for(const auto &property : properties) {
+                mValues.insert(property, buffer.getProperty(property));
+            }
         }
     }
 
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 227ab4d..cff0172 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -46,10 +46,9 @@ public:
     ApplicationDomainType& operator=(const ApplicationDomainType &other);
 
     template <typename DomainType>
-    static typename DomainType::Ptr getInMemoryRepresentation(const ApplicationDomainType &domainType)
+    static typename DomainType::Ptr getInMemoryRepresentation(const ApplicationDomainType &domainType, const QList<QByteArray> properties = QList<QByteArray>())
     {
-        //TODO only copy requested properties
-        auto memoryAdaptor = QSharedPointer<Akonadi2::ApplicationDomain::MemoryBufferAdaptor>::create(*(domainType.mAdaptor));
+        auto memoryAdaptor = QSharedPointer<Akonadi2::ApplicationDomain::MemoryBufferAdaptor>::create(*(domainType.mAdaptor), properties);
         //The identifier still internal refers to the memory-mapped pointer, we need to copy the memory or it will become invalid
         return QSharedPointer<DomainType>::create(domainType.mResourceInstanceIdentifier, QByteArray(domainType.mIdentifier.constData(), domainType.mIdentifier.size()), domainType.mRevision, memoryAdaptor);
     }
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 2de3c10..d3f5254 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -103,23 +103,23 @@ typename Akonadi2::ResultEmitter<typename DomainType::Ptr>::Ptr QueryRunner<Doma
 }
 
 template<class DomainType>
-void QueryRunner<DomainType>::replaySet(ResultSet &resultSet, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider)
+void QueryRunner<DomainType>::replaySet(ResultSet &resultSet, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, const QList<QByteArray> &properties)
 {
     int counter = 0;
-    while (resultSet.next([&resultProvider, &counter](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value, Akonadi2::Operation operation) -> bool {
+    while (resultSet.next([&resultProvider, &counter, &properties](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value, Akonadi2::Operation operation) -> bool {
         counter++;
         switch (operation) {
         case Akonadi2::Operation_Creation:
             // Trace() << "Got creation";
-            resultProvider.add(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<DomainType>(*value).template staticCast<DomainType>());
+            resultProvider.add(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<DomainType>(*value, properties).template staticCast<DomainType>());
             break;
         case Akonadi2::Operation_Modification:
             // Trace() << "Got modification";
-            resultProvider.modify(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<DomainType>(*value).template staticCast<DomainType>());
+            resultProvider.modify(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<DomainType>(*value, properties).template staticCast<DomainType>());
             break;
         case Akonadi2::Operation_Removal:
             // Trace() << "Got removal";
-            resultProvider.remove(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<DomainType>(*value).template staticCast<DomainType>());
+            resultProvider.remove(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<DomainType>(*value, properties).template staticCast<DomainType>());
             break;
         }
         return true;
@@ -263,7 +263,7 @@ qint64 QueryRunner<DomainType>::load(const Akonadi2::Query &query, const std::fu
     QSet<QByteArray> remainingFilters;
     auto resultSet = baseSetRetriever(transaction, remainingFilters);
     auto filteredSet = filterSet(resultSet, getFilter(remainingFilters, query), db, initialQuery);
-    replaySet(filteredSet, resultProvider);
+    replaySet(filteredSet, resultProvider, query.requestedProperties);
     resultProvider.setRevision(Akonadi2::Storage::maxRevision(transaction));
     return Akonadi2::Storage::maxRevision(transaction);
 }
diff --git a/common/queryrunner.h b/common/queryrunner.h
index c918dcb..8df0ecd 100644
--- a/common/queryrunner.h
+++ b/common/queryrunner.h
@@ -84,7 +84,7 @@ public:
     typename Akonadi2::ResultEmitter<typename DomainType::Ptr>::Ptr emitter();
 
 private:
-    static void replaySet(ResultSet &resultSet, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider);
+    static void replaySet(ResultSet &resultSet, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, const QList<QByteArray> &properties);
 
     void readEntity(const Akonadi2::Storage::NamedDatabase &db, const QByteArray &key, const std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &, Akonadi2::Operation)> &resultCallback);