Updated the index on modifications and removals.

Misses tests.

5 files changed, 38 insertions, 23 deletions

diff --git a/common/index.cpp b/common/index.cpp
index f752f5f..2fc0fe3 100644
--- a/common/index.cpp
+++ b/common/index.cpp
@@ -19,6 +19,11 @@ void Index::add(const QByteArray &key, const QByteArray &value)
     mDb.write(key, value);
 }
 
+void Index::remove(const QByteArray &key, const QByteArray &value)
+{
+    mDb.remove(key, value);
+}
+
 void Index::lookup(const QByteArray &key, const std::function<void(const QByteArray &value)> &resultHandler,
                                           const std::function<void(const Error &error)> &errorHandler)
 {
diff --git a/common/index.h b/common/index.h
index e1b7e3a..0ca32af 100644
--- a/common/index.h
+++ b/common/index.h
@@ -29,7 +29,7 @@ public:
     Index(const QByteArray &name, Akonadi2::Storage::Transaction &);
 
     void add(const QByteArray &key, const QByteArray &value);
-    // void remove(const QByteArray &key, const QByteArray &value);
+    void remove(const QByteArray &key, const QByteArray &value);
 
     void lookup(const QByteArray &key, const std::function<void(const QByteArray &value)> &resultHandler,
                                        const std::function<void(const Error &error)> &errorHandler);
diff --git a/common/storage.h b/common/storage.h
index aa0be4c..a4137ce 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -63,11 +63,17 @@ public:
         bool write(const QByteArray &key, const QByteArray &value, const std::function<void(const Storage::Error &error)> &errorHandler = std::function<void(const Storage::Error &error)>());
 
         /**
-         * Remove a value
+         * Remove a key
          */
         void remove(const QByteArray &key,
                     const std::function<void(const Storage::Error &error)> &errorHandler = std::function<void(const Storage::Error &error)>());
         /**
+         * Remove a key-value pair
+         */
+        void remove(const QByteArray &key, const QByteArray &value,
+                    const std::function<void(const Storage::Error &error)> &errorHandler = std::function<void(const Storage::Error &error)>());
+
+        /**
         * Read values with a given key.
         *
         * * An empty @param key results in a full scan
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index be5a9da..1516e69 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -149,6 +149,12 @@ bool Storage::NamedDatabase::write(const QByteArray &sKey, const QByteArray &sVa
 void Storage::NamedDatabase::remove(const QByteArray &k,
                      const std::function<void(const Storage::Error &error)> &errorHandler)
 {
+    remove(k, QByteArray(), errorHandler);
+}
+
+void Storage::NamedDatabase::remove(const QByteArray &k, const QByteArray &value,
+                     const std::function<void(const Storage::Error &error)> &errorHandler)
+{
     if (!d || !d->transaction) {
         Error error(d->name.toLatin1(), ErrorCodes::GenericError, "Not open");
         if (d) {
@@ -161,14 +167,19 @@ void Storage::NamedDatabase::remove(const QByteArray &k,
     MDB_val key;
     key.mv_size = k.size();
     key.mv_data = const_cast<void*>(static_cast<const void*>(k.data()));
-    rc = mdb_del(d->transaction, d->dbi, &key, 0);
+    if (value.isEmpty()) {
+        rc = mdb_del(d->transaction, d->dbi, &key, 0);
+    } else {
+        MDB_val data;
+        data.mv_size = value.size();
+        data.mv_data = const_cast<void*>(static_cast<const void*>(value.data()));
+        rc = mdb_del(d->transaction, d->dbi, &key, &data);
+    }
 
     if (rc) {
         Error error(d->name.toLatin1(), ErrorCodes::GenericError, QString("Error on mdb_del: %1 %2").arg(rc).arg(mdb_strerror(rc)).toLatin1());
         errorHandler ? errorHandler(error) : d->defaultErrorHandler(error);
     }
-
-    return;
 }
 
 int Storage::NamedDatabase::scan(const QByteArray &k,
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 0a2e90b..b742611 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -41,13 +41,6 @@
 #define ENTITY_TYPE_EVENT "event"
 #define ENTITY_TYPE_MAIL "mail"
 
-static void index(const QByteArray &index, const QVariant &value, const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
-{
-    if (value.isValid()) {
-        Index(index, transaction).add(value.toByteArray(), uid);
-    }
-}
-
 /**
  * Index types:
  * * uid - property
@@ -74,13 +67,20 @@ public:
         add(newEntity.getProperty("remoteId"), uid, transaction);
     }
 
-    void modifiedEntity(const QByteArray &key, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    void modifiedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
     {
+        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::removeIndex(uid, oldEntity, transaction);
+        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::index(uid, newEntity, transaction);
+        remove(oldEntity.getProperty("remoteId"), uid, transaction);
+        add(newEntity.getProperty("remoteId"), uid, transaction);
     }
 
-    void deletedEntity(const QByteArray &key, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    void deletedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
     {
+        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::removeIndex(uid, oldEntity, transaction);
+        remove(oldEntity.getProperty("remoteId"), uid, transaction);
     }
+
 private:
     void add(const QVariant &value, const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
     {
@@ -89,16 +89,9 @@ private:
         }
     }
 
-    void remove(const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
-    {
-        //Knowning the indexed value would probably help removing the uid efficiently. Otherwise we have to execute a full scan.
-        // Index(mIndexIdentifier, transaction).remove(uid);
-    }
-
-    void modify(Akonadi2::Storage::Transaction &transaction)
+    void remove(const QVariant &value, const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
     {
-        //Knowning the indexed value would probably help removing the uid efficiently. Otherwise we have to execute a full scan.
-        // Index(mIndexIdentifier, transaction).remove(uid);
+        Index(mIndexIdentifier, transaction).remove(value.toByteArray(), uid);
     }
 
     QByteArray mIndexIdentifier;