Get access to properties in indexes.

12 files changed, 114 insertions, 26 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index a8098b7..10c92bb 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -50,3 +50,8 @@ void TypeImplementation<Event>::configure(WritePropertyMapper<BufferBuilder> &pr
     propertyMapper.addMapping<Event::Uid>(&BufferBuilder::add_uid);
     propertyMapper.addMapping<Event::Attachment>(&BufferBuilder::add_attachment);
 }
+
+void TypeImplementation<Event>::configure(IndexPropertyMapper &)
+{
+
+}
diff --git a/common/domain/event.h b/common/domain/event.h
index d85b9b3..b683f5f 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -26,6 +26,7 @@ template<typename T>
 class ReadPropertyMapper;
 template<typename T>
 class WritePropertyMapper;
+class IndexPropertyMapper;
 
 class TypeIndex;
 
@@ -49,6 +50,7 @@ public:
     static void configure(TypeIndex &);
     static void configure(ReadPropertyMapper<Buffer> &);
     static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
 }
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index e6701ac..4bc2efb 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -51,3 +51,8 @@ void TypeImplementation<Folder>::configure(WritePropertyMapper<BufferBuilder> &p
     propertyMapper.addMapping<Folder::Icon>(&BufferBuilder::add_icon);
     propertyMapper.addMapping<Folder::SpecialPurpose>(&BufferBuilder::add_specialpurpose);
 }
+
+void TypeImplementation<Folder>::configure(IndexPropertyMapper &)
+{
+
+}
diff --git a/common/domain/folder.h b/common/domain/folder.h
index 3c83794..f232ab5 100644
--- a/common/domain/folder.h
+++ b/common/domain/folder.h
@@ -24,6 +24,7 @@ template<typename T>
 class ReadPropertyMapper;
 template<typename T>
 class WritePropertyMapper;
+class IndexPropertyMapper;
 
 class TypeIndex;
 
@@ -43,6 +44,7 @@ public:
     static void configure(TypeIndex &);
     static void configure(ReadPropertyMapper<Buffer> &);
     static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
 }
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 8abe259..c1b0b34 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -27,6 +27,7 @@
 #include "entitybuffer.h"
 #include "entity_generated.h"
 #include "mail/threadindexer.h"
+#include "domainadaptor.h"
 
 #include "mail_generated.h"
 
@@ -53,6 +54,15 @@ void TypeImplementation<Mail>::configure(TypeIndex &index)
     index.addSecondaryProperty<Mail::ThreadId, Mail::MessageId>();
 }
 
+void TypeImplementation<Mail>::configure(IndexPropertyMapper &indexPropertyMapper)
+{
+    indexPropertyMapper.addIndexLookupProperty<Mail::ThreadId>([](TypeIndex &index, const ApplicationDomain::BufferAdaptor &entity) {
+            auto messageId = entity.getProperty(Mail::MessageId::name);
+            auto thread = index.secondaryLookup<Mail::MessageId, Mail::ThreadId>(messageId);
+            Q_ASSERT(!thread.isEmpty());
+            return thread.first();
+        });
+}
 
 void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
 {
diff --git a/common/domain/mail.h b/common/domain/mail.h
index c12976a..e052448 100644
--- a/common/domain/mail.h
+++ b/common/domain/mail.h
@@ -26,6 +26,7 @@ template<typename T>
 class ReadPropertyMapper;
 template<typename T>
 class WritePropertyMapper;
+class IndexPropertyMapper;
 
 class TypeIndex;
 
@@ -44,6 +45,7 @@ public:
     static void configure(TypeIndex &index);
     static void configure(ReadPropertyMapper<Buffer> &propertyMapper);
     static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
 }
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index 0eb90b3..0f5bdc7 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -83,6 +83,42 @@ static void createBufferPartBuffer(const Sink::ApplicationDomain::ApplicationDom
     }
 }
 
+class IndexPropertyMapper
+{
+public:
+    typedef std::function<QVariant(TypeIndex &index, const Sink::ApplicationDomain::BufferAdaptor &adaptor)> Accessor;
+    virtual ~IndexPropertyMapper(){};
+
+    virtual QVariant getProperty(const QByteArray &key, TypeIndex &index, const Sink::ApplicationDomain::BufferAdaptor &adaptor) const
+    {
+        auto accessor = mReadAccessors.value(key);
+        Q_ASSERT(accessor);
+        if (!accessor) {
+            return QVariant();
+        }
+        return accessor(index, adaptor);
+    }
+
+    bool hasMapping(const QByteArray &key) const
+    {
+        return mReadAccessors.contains(key);
+    }
+
+    QList<QByteArray> availableProperties() const
+    {
+        return mReadAccessors.keys();
+    }
+
+    template<typename Property>
+    void addIndexLookupProperty(const Accessor &accessor)
+    {
+        mReadAccessors.insert(Property::name, accessor);
+    }
+
+private:
+    QHash<QByteArray, Accessor> mReadAccessors;
+};
+
 /**
  * A generic adaptor implementation that uses a property mapper to read/write values.
  */
@@ -107,6 +143,8 @@ public:
             return mResourceMapper->getProperty(key, mResourceBuffer);
         } else if (mLocalBuffer && mLocalMapper->hasMapping(key)) {
             return mLocalMapper->getProperty(key, mLocalBuffer);
+        } else if (mIndex && mIndexMapper->hasMapping(key)) {
+            return mIndexMapper->getProperty(key, *mIndex, *this);
         }
         SinkWarning() << "No mapping available for key " << key << mLocalBuffer << mResourceBuffer;
         return QVariant();
@@ -117,13 +155,15 @@ public:
      */
     virtual QList<QByteArray> availableProperties() const Q_DECL_OVERRIDE
     {
-        return mResourceMapper->availableProperties() + mLocalMapper->availableProperties();
+        return mResourceMapper->availableProperties() + mLocalMapper->availableProperties() + mIndexMapper->availableProperties();
     }
 
     LocalBuffer const *mLocalBuffer;
     ResourceBuffer const *mResourceBuffer;
     QSharedPointer<ReadPropertyMapper<LocalBuffer>> mLocalMapper;
     QSharedPointer<ReadPropertyMapper<ResourceBuffer>> mResourceMapper;
+    QSharedPointer<IndexPropertyMapper> mIndexMapper;
+    TypeIndex *mIndex;
 };
 
 /**
@@ -142,11 +182,14 @@ public:
         : mLocalMapper(QSharedPointer<ReadPropertyMapper<LocalBuffer>>::create()),
           mResourceMapper(QSharedPointer<ReadPropertyMapper<ResourceBuffer>>::create()),
           mLocalWriteMapper(QSharedPointer<WritePropertyMapper<LocalBuilder>>::create()),
-          mResourceWriteMapper(QSharedPointer<WritePropertyMapper<ResourceBuilder>>::create())
+          mResourceWriteMapper(QSharedPointer<WritePropertyMapper<ResourceBuilder>>::create()),
+          mIndexMapper(QSharedPointer<IndexPropertyMapper>::create())
     {
         Sink::ApplicationDomain::TypeImplementation<DomainType>::configure(*mLocalMapper);
         Sink::ApplicationDomain::TypeImplementation<DomainType>::configure(*mLocalWriteMapper);
+        Sink::ApplicationDomain::TypeImplementation<DomainType>::configure(*mIndexMapper);
     }
+
     virtual ~DomainTypeAdaptorFactory(){};
 
     /**
@@ -154,13 +197,15 @@ public:
      *
      * This returns by default a DatastoreBufferAdaptor initialized with the corresponding property mappers.
      */
-    virtual QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> createAdaptor(const Sink::Entity &entity) Q_DECL_OVERRIDE
+    virtual QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> createAdaptor(const Sink::Entity &entity, TypeIndex *index = nullptr) Q_DECL_OVERRIDE
     {
         auto adaptor = QSharedPointer<DatastoreBufferAdaptor<LocalBuffer, ResourceBuffer>>::create();
         adaptor->mLocalBuffer = Sink::EntityBuffer::readBuffer<LocalBuffer>(entity.local());
         adaptor->mLocalMapper = mLocalMapper;
         adaptor->mResourceBuffer = Sink::EntityBuffer::readBuffer<ResourceBuffer>(entity.resource());
         adaptor->mResourceMapper = mResourceMapper;
+        adaptor->mIndexMapper = mIndexMapper;
+        adaptor->mIndex = index;
         return adaptor;
     }
 
@@ -198,4 +243,5 @@ protected:
     QSharedPointer<ReadPropertyMapper<ResourceBuffer>> mResourceMapper;
     QSharedPointer<WritePropertyMapper<LocalBuilder>> mLocalWriteMapper;
     QSharedPointer<WritePropertyMapper<ResourceBuilder>> mResourceWriteMapper;
+    QSharedPointer<IndexPropertyMapper> mIndexMapper;
 };
diff --git a/common/domaintypeadaptorfactoryinterface.h b/common/domaintypeadaptorfactoryinterface.h
index 8829c87..4becbe5 100644
--- a/common/domaintypeadaptorfactoryinterface.h
+++ b/common/domaintypeadaptorfactoryinterface.h
@@ -20,6 +20,7 @@
 
 #include <QSharedPointer>
 
+class TypeIndex;
 namespace Sink {
 namespace ApplicationDomain {
 class BufferAdaptor;
@@ -37,7 +38,7 @@ class DomainTypeAdaptorFactoryInterface
 public:
     typedef QSharedPointer<DomainTypeAdaptorFactoryInterface> Ptr;
     virtual ~DomainTypeAdaptorFactoryInterface(){};
-    virtual QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> createAdaptor(const Sink::Entity &entity) = 0;
+    virtual QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> createAdaptor(const Sink::Entity &entity, TypeIndex *index = nullptr) = 0;
 
     /*
      * Creates a buffer from @param domainType
diff --git a/common/mail/threadindexer.cpp b/common/mail/threadindexer.cpp
index 4a18625..17ee31e 100644
--- a/common/mail/threadindexer.cpp
+++ b/common/mail/threadindexer.cpp
@@ -91,16 +91,16 @@ void ThreadIndexer::updateThreadingIndex(const QByteArray &identifier, const App
     QVector<QByteArray> thread;
 
     //a child already registered our thread.
-    thread = index().secondaryLookup<Mail::MessageId, Mail::ThreadId>(messageId, transaction);
+    thread = index().secondaryLookup<Mail::MessageId, Mail::ThreadId>(messageId);
 
     //If parent is already available, add to thread of parent
     if (thread.isEmpty() && parentMessageId.isValid()) {
-        thread = index().secondaryLookup<Mail::MessageId, Mail::ThreadId>(parentMessageId, transaction);
+        thread = index().secondaryLookup<Mail::MessageId, Mail::ThreadId>(parentMessageId);
         SinkTrace() << "Found parent";
     }
     if (thread.isEmpty()) {
         //Try to lookup the thread by subject:
-        thread = index().secondaryLookup<Mail::Subject, Mail::ThreadId>(normalizedSubject, transaction);
+        thread = index().secondaryLookup<Mail::Subject, Mail::ThreadId>(normalizedSubject);
         if (thread.isEmpty()) {
             SinkTrace() << "Created a new thread ";
             thread << QUuid::createUuid().toByteArray();
diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp
index f7f235e..dce2fc6 100644
--- a/common/storage/entitystore.cpp
+++ b/common/storage/entitystore.cpp
@@ -69,9 +69,8 @@ public:
     /*     return *index; */
     /* } */
 
-    TypeIndex &typeIndex(const QByteArray &type)
+    TypeIndex &cachedIndex(const QByteArray &type)
     {
-        /* return applyType<typeIndex>(type); */
         if (indexByType.contains(type)) {
             return *indexByType.value(type);
         }
@@ -92,7 +91,19 @@ public:
         }
         indexByType.insert(type, index);
         return *index;
+    TypeIndex &typeIndex(const QByteArray &type)
+    {
+        auto &index = cachedIndex(type);
+        index.mTransaction = &transaction;
+        return index;
+    }
+
+    ApplicationDomain::ApplicationDomainType createApplicationDomainType(const QByteArray &type, const QByteArray &uid, qint64 revision, const EntityBuffer &buffer)
+    {
+        auto adaptor = resourceContext.adaptorFactory(type).createAdaptor(buffer.entity(), &typeIndex(type));
+        return ApplicationDomain::ApplicationDomainType{resourceContext.instanceId(), uid, revision, adaptor};
     }
+
 };
 
 EntityStore::EntityStore(const ResourceContext &context)
@@ -373,17 +384,16 @@ void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, cons
 void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, const std::function<void(const ApplicationDomain::ApplicationDomainType &)> callback)
 {
     readLatest(type, uid, [&](const QByteArray &uid, const EntityBuffer &buffer) {
-        auto adaptor = d->resourceContext.adaptorFactory(type).createAdaptor(buffer.entity());
-        callback(ApplicationDomain::ApplicationDomainType{d->resourceContext.instanceId(), uid, DataStore::maxRevision(d->getTransaction()), adaptor});
+        //TODO cache max revision for the duration of the transaction.
+        callback(d->createApplicationDomainType(type, uid, DataStore::maxRevision(d->getTransaction()), buffer));
     });
 }
 
 void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, const std::function<void(const ApplicationDomain::ApplicationDomainType &, Sink::Operation)> callback)
 {
     readLatest(type, uid, [&](const QByteArray &uid, const EntityBuffer &buffer) {
-        auto adaptor = d->resourceContext.adaptorFactory(type).createAdaptor(buffer.entity());
         //TODO cache max revision for the duration of the transaction.
-        callback(ApplicationDomain::ApplicationDomainType{d->resourceContext.instanceId(), uid, DataStore::maxRevision(d->getTransaction()), adaptor}, buffer.operation());
+        callback(d->createApplicationDomainType(type, uid, DataStore::maxRevision(d->getTransaction()), buffer), buffer.operation());
     });
 }
 
@@ -410,8 +420,7 @@ void EntityStore::readEntity(const QByteArray &type, const QByteArray &key, cons
 void EntityStore::readEntity(const QByteArray &type, const QByteArray &uid, const std::function<void(const ApplicationDomain::ApplicationDomainType &)> callback)
 {
     readEntity(type, uid, [&](const QByteArray &uid, const EntityBuffer &buffer) {
-        auto adaptor = d->resourceContext.adaptorFactory(type).createAdaptor(buffer.entity());
-        callback(ApplicationDomain::ApplicationDomainType{d->resourceContext.instanceId(), uid, DataStore::maxRevision(d->getTransaction()), adaptor});
+        callback(d->createApplicationDomainType(type, uid, DataStore::maxRevision(d->getTransaction()), buffer));
     });
 }
 
@@ -432,8 +441,7 @@ void EntityStore::readAll(const QByteArray &type, const std::function<void(const
         [=](const QByteArray &key, const QByteArray &value) -> bool {
             auto uid = DataStore::uidFromKey(key);
             auto buffer = Sink::EntityBuffer{value.data(), value.size()};
-            auto adaptor = d->resourceContext.adaptorFactory(type).createAdaptor(buffer.entity());
-            callback(ApplicationDomain::ApplicationDomainType{d->resourceContext.instanceId(), uid, DataStore::maxRevision(d->getTransaction()), adaptor});
+            callback(d->createApplicationDomainType(type, uid, DataStore::maxRevision(d->getTransaction()), buffer));
             return true;
         },
         [&](const DataStore::Error &error) { SinkWarning() << "Error during query: " << error.message; });
@@ -480,8 +488,7 @@ void EntityStore::readPrevious(const QByteArray &type, const QByteArray &uid, qi
 void EntityStore::readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision, const std::function<void(const ApplicationDomain::ApplicationDomainType &)> callback)
 {
     readPrevious(type, uid, revision, [&](const QByteArray &uid, const EntityBuffer &buffer) {
-        auto adaptor = d->resourceContext.adaptorFactory(type).createAdaptor(buffer.entity());
-        callback(ApplicationDomain::ApplicationDomainType{d->resourceContext.instanceId(), uid, DataStore::maxRevision(d->getTransaction()), adaptor});
+        callback(d->createApplicationDomainType(type, uid, DataStore::maxRevision(d->getTransaction()), buffer));
     });
 }
 
diff --git a/common/typeindex.cpp b/common/typeindex.cpp
index 8f5de4f..036b662 100644
--- a/common/typeindex.cpp
+++ b/common/typeindex.cpp
@@ -238,10 +238,10 @@ void TypeIndex::index<QString, QByteArray>(const QByteArray &leftName, const QBy
 }
 
 template <>
-QVector<QByteArray> TypeIndex::secondaryLookup<QByteArray>(const QByteArray &leftName, const QByteArray &rightName, const QVariant &value, Sink::Storage::DataStore::Transaction &transaction)
+QVector<QByteArray> TypeIndex::secondaryLookup<QByteArray>(const QByteArray &leftName, const QByteArray &rightName, const QVariant &value)
 {
     QVector<QByteArray> keys;
-    Index index(indexName(leftName + rightName), transaction);
+    Index index(indexName(leftName + rightName), *mTransaction);
     const auto lookupKey = getByteArray(value);
     index.lookup(
         lookupKey, [&](const QByteArray &value) { keys << value; }, [=](const Index::Error &error) { SinkWarning() << "Error in index: " << error.message << value; });
@@ -250,10 +250,10 @@ QVector<QByteArray> TypeIndex::secondaryLookup<QByteArray>(const QByteArray &lef
 }
 
 template <>
-QVector<QByteArray> TypeIndex::secondaryLookup<QString>(const QByteArray &leftName, const QByteArray &rightName, const QVariant &value, Sink::Storage::DataStore::Transaction &transaction)
+QVector<QByteArray> TypeIndex::secondaryLookup<QString>(const QByteArray &leftName, const QByteArray &rightName, const QVariant &value)
 {
     QVector<QByteArray> keys;
-    Index index(indexName(leftName + rightName), transaction);
+    Index index(indexName(leftName + rightName), *mTransaction);
     const auto lookupKey = getByteArray(value);
     index.lookup(
         lookupKey, [&](const QByteArray &value) { keys << value; }, [=](const Index::Error &error) { SinkWarning() << "Error in index: " << error.message << value; });
diff --git a/common/typeindex.h b/common/typeindex.h
index 041e04a..3cffb1e 100644
--- a/common/typeindex.h
+++ b/common/typeindex.h
@@ -25,6 +25,12 @@
 #include "indexer.h"
 #include <QByteArray>
 
+namespace Sink {
+namespace Storage {
+    class EntityStore;
+}
+}
+
 class TypeIndex
 {
 public:
@@ -66,13 +72,13 @@ public:
     QVector<QByteArray> lookup(const QByteArray &property, const QVariant &value, Sink::Storage::DataStore::Transaction &transaction);
 
     template <typename Left, typename Right>
-    QVector<QByteArray> secondaryLookup(const QVariant &value, Sink::Storage::DataStore::Transaction &transaction)
+    QVector<QByteArray> secondaryLookup(const QVariant &value)
     {
-        return secondaryLookup<typename Left::Type>(Left::name, Right::name, value, transaction);
+        return secondaryLookup<typename Left::Type>(Left::name, Right::name, value);
     }
 
     template <typename Type>
-    QVector<QByteArray> secondaryLookup(const QByteArray &leftName, const QByteArray &rightName, const QVariant &value, Sink::Storage::DataStore::Transaction &transaction);
+    QVector<QByteArray> secondaryLookup(const QByteArray &leftName, const QByteArray &rightName, const QVariant &value);
 
     template <typename Left, typename Right>
     void index(const QVariant &leftValue, const QVariant &rightValue, Sink::Storage::DataStore::Transaction &transaction)
@@ -85,6 +91,7 @@ public:
 
 
 private:
+    friend class Sink::Storage::EntityStore;
     QByteArray indexName(const QByteArray &property, const QByteArray &sortProperty = QByteArray()) const;
     QByteArray mType;
     SINK_DEBUG_COMPONENT(mType)
@@ -93,6 +100,7 @@ private:
     //<Property, ResultProperty>
     QMap<QByteArray, QByteArray> mSecondaryProperties;
     QList<Sink::Indexer::Ptr> mCustomIndexer;
+    Sink::Storage::DataStore::Transaction *mTransaction;
     QHash<QByteArray, std::function<void(const QByteArray &identifier, const QVariant &value, Sink::Storage::DataStore::Transaction &transaction)>> mIndexer;
     QHash<QByteArray, std::function<void(const QByteArray &identifier, const QVariant &value, const QVariant &sortValue, Sink::Storage::DataStore::Transaction &transaction)>> mSortIndexer;
 };