3 files changed, 50 insertions, 60 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index 3036d8e..d989efe 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -29,42 +29,35 @@
 #include "../propertymapper.h"
 #include "../query.h"
 #include "../definitions.h"
+#include "../typeindex.h"
 
 #include "event_generated.h"
 
 using namespace Akonadi2::ApplicationDomain;
 
-ResultSet TypeImplementation<Event>::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction)
+static TypeIndex &getIndex()
 {
-    QVector<QByteArray> keys;
-    if (query.propertyFilter.contains("uid")) {
-        Index uidIndex("event.index.uid", transaction);
-        uidIndex.lookup(query.propertyFilter.value("uid").toByteArray(), [&](const QByteArray &value) {
-            keys << value;
-        },
-        [](const Index::Error &error) {
-            Warning() << "Error in uid index: " <<  error.message;
-        });
-        appliedFilters << "uid";
+    static TypeIndex *index = 0;
+    if (!index) {
+        index = new TypeIndex("event");
+        index->addProperty<QByteArray>("uid");
     }
-    Trace() << "Index lookup found " << keys.size() << " keys.";
-    return ResultSet(keys);
+    return *index;
+}
+
+ResultSet TypeImplementation<Event>::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction)
+{
+    return getIndex().query(query, appliedFilters, transaction);
 }
 
 void TypeImplementation<Event>::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
 {
-    const auto uid = bufferAdaptor.getProperty("uid");
-    if (uid.isValid()) {
-        Index("event.index.uid", transaction).add(uid.toByteArray(), identifier);
-    }
+    return getIndex().add(identifier, bufferAdaptor, transaction);
 }
 
 void TypeImplementation<Event>::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
 {
-    const auto uid = bufferAdaptor.getProperty("uid");
-    if (uid.isValid()) {
-        Index("event.index.uid", transaction).remove(uid.toByteArray(), identifier);
-    }
+    return getIndex().remove(identifier, bufferAdaptor, transaction);
 }
 
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Event>::Buffer> > TypeImplementation<Event>::initializeReadPropertyMapper()
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index 80e9f8f..3cd221e 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -29,52 +29,37 @@
 #include "../propertymapper.h"
 #include "../query.h"
 #include "../definitions.h"
+#include "../typeindex.h"
 
 #include "folder_generated.h"
 
 using namespace Akonadi2::ApplicationDomain;
 
-ResultSet TypeImplementation<Folder>::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction)
+static TypeIndex &getIndex()
 {
-    QVector<QByteArray> keys;
-    if (query.propertyFilter.contains("parent")) {
-        Index index("folder.index.parent", transaction);
-        auto lookupKey = query.propertyFilter.value("parent").toByteArray();
-        if (lookupKey.isEmpty()) {
-            lookupKey = "toplevel";
-        }
-        index.lookup(lookupKey, [&](const QByteArray &value) {
-            keys << value;
-        },
-        [](const Index::Error &error) {
-            Warning() << "Error in uid index: " <<  error.message;
-        });
-        appliedFilters << "parent";
+    static TypeIndex *index = 0;
+    if (!index) {
+        index = new TypeIndex("folder");
+        index->addProperty<QByteArray>("parent");
+        index->addProperty<QString>("name");
     }
-    Trace() << "Index lookup found " << keys.size() << " keys.";
-    return ResultSet(keys);
+    return *index;
+}
+
+ResultSet TypeImplementation<Folder>::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction)
+{
+    return getIndex().query(query, appliedFilters, transaction);
 }
 
 void TypeImplementation<Folder>::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
 {
-    const auto parent = bufferAdaptor.getProperty("parent");
-    Trace() << "indexing " << identifier << " with parent " << parent.toByteArray();
-    if (parent.isValid()) {
-        Q_ASSERT(!parent.toByteArray().isEmpty());
-        Index("folder.index.parent", transaction).add(parent.toByteArray(), identifier);
-    } else {
-        Index("folder.index.parent", transaction).add("toplevel", identifier);
-    }
+    Trace() << "Indexing " << identifier;
+    getIndex().add(identifier, bufferAdaptor, transaction);
 }
 
 void TypeImplementation<Folder>::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
 {
-    const auto parent = bufferAdaptor.getProperty("parent");
-    if (parent.isValid()) {
-        Index("folder.index.parent", transaction).remove(parent.toByteArray(), identifier);
-    } else {
-        Index("folder.index.parent", transaction).remove("toplevel", identifier);
-    }
+    getIndex().remove(identifier, bufferAdaptor, transaction);
 }
 
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Folder>::Buffer> > TypeImplementation<Folder>::initializeReadPropertyMapper()
diff --git a/common/typeindex.cpp b/common/typeindex.cpp
index 0a0dc33..1e41267 100644
--- a/common/typeindex.cpp
+++ b/common/typeindex.cpp
@@ -32,7 +32,11 @@ void TypeIndex::addProperty<QByteArray>(const QByteArray &property)
 {
     auto indexer = [this, property](const QByteArray &identifier, const QVariant &value, Akonadi2::Storage::Transaction &transaction) {
         // Trace() << "Indexing " << mType + ".index." + property << value.toByteArray();
-        Index(mType + ".index." + property, transaction).add(value.toByteArray(), identifier);
+        if (value.isValid()) {
+            Index(mType + ".index." + property, transaction).add(value.toByteArray(), identifier);
+        } else {
+            Index(mType + ".index." + property, transaction).add("toplevel", identifier);
+        }
     };
     mIndexer.insert(property, indexer);
     mProperties << property;
@@ -43,7 +47,11 @@ void TypeIndex::addProperty<QString>(const QByteArray &property)
 {
     auto indexer = [this, property](const QByteArray &identifier, const QVariant &value, Akonadi2::Storage::Transaction &transaction) {
         // Trace() << "Indexing " << mType + ".index." + property << value.toByteArray();
-        Index(mType + ".index." + property, transaction).add(value.toByteArray(), identifier);
+        if (value.isValid()) {
+            Index(mType + ".index." + property, transaction).add(value.toByteArray(), identifier);
+        } else {
+            Index(mType + ".index." + property, transaction).add("toplevel", identifier);
+        }
     };
     mIndexer.insert(property, indexer);
     mProperties << property;
@@ -64,10 +72,8 @@ void TypeIndex::add(const QByteArray &identifier, const Akonadi2::ApplicationDom
 {
     for (const auto &property : mProperties) {
         const auto value = bufferAdaptor.getProperty(property);
-        if (value.isValid()) {
-            auto indexer = mIndexer.value(property);
-            indexer(identifier, value, transaction);
-        }
+        auto indexer = mIndexer.value(property);
+        indexer(identifier, value, transaction);
     }
 }
 
@@ -78,6 +84,8 @@ void TypeIndex::remove(const QByteArray &identifier, const Akonadi2::Application
         if (value.isValid()) {
             //FIXME don't always convert to byte array
             Index(mType + ".index." + property, transaction).remove(value.toByteArray(), identifier);
+        } else {
+            Index(mType + ".index." + property, transaction).remove("toplevel", identifier);
         }
     }
 }
@@ -88,7 +96,11 @@ ResultSet TypeIndex::query(const Akonadi2::Query &query, QSet<QByteArray> &appli
     for (const auto &property : mProperties) {
         if (query.propertyFilter.contains(property)) {
             Index index(mType + ".index." + property, transaction);
-            index.lookup(query.propertyFilter.value(property).toByteArray(), [&](const QByteArray &value) {
+            auto lookupKey = query.propertyFilter.value(property).toByteArray();
+            if (lookupKey.isEmpty()) {
+                lookupKey = "toplevel";
+            }
+            index.lookup(lookupKey, [&](const QByteArray &value) {
                 keys << value;
             },
             [property](const Index::Error &error) {
@@ -96,7 +108,7 @@ ResultSet TypeIndex::query(const Akonadi2::Query &query, QSet<QByteArray> &appli
             });
             appliedFilters << property;
         }
-        Trace() << "Index lookup found keys: " << keys.size();
+        Trace() << "Index lookup on " << property << " found " << keys.size() << " keys.";
         return ResultSet(keys);
     }
     Trace() << "No matching index";