Updated the index on modifications and removals.

Misses tests.

4 files changed, 27 insertions, 5 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,