4 files changed, 491 insertions, 1 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index d409828..9b3f777 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -2,10 +2,20 @@ project(akonadinextcommon)
 generate_flatbuffers(commands/handshake
                      commands/revisionupdate)
 
+if (STORAGE_KYOTO)
+    set(storage_SRCS storage_kyoto.cpp)
+    set(storage_LIBS kyotocabinet)
+else (STORAGE_KYOTO)
+    set(storage_SRCS storage_lmdb.cpp)
+    set(storage_LIBS lmdb)
+endif (STORAGE_KYOTO)
+
 set(command_SRCS
    commands.cpp
    console.cpp
-   ${CMAKE_CURRENT_BINARY_DIR}/commands/handshake_generated.h)
+   ${storage_SRCS})
 
 add_library(${PROJECT_NAME} ${command_SRCS})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 qt5_use_modules(${PROJECT_NAME} Widgets)
+target_link_libraries(${PROJECT_NAME} ${storage_LIBS})
diff --git a/common/storage.h b/common/storage.h
new file mode 100644
index 0000000..0b548fb
--- /dev/null
+++ b/common/storage.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <string>
+#include <QString>
+
+class Storage {
+public:
+    enum TransactionType { ReadOnly, ReadWrite };
+
+    Storage(const QString &storageRoot, const QString &name);
+    ~Storage();
+    bool isInTransaction() const;
+    bool startTransaction(TransactionType type = ReadWrite);
+    bool commitTransaction();
+    void abortTransaction();
+    bool write(const char *key, size_t keySize, const char *value, size_t valueSize);
+    bool write(const std::string &sKey, const std::string &sValue);
+    //Perhaps prefer iterators (assuming we need to be able to match multiple values
+    bool read(const std::string &sKey, const std::function<void(const std::string &value)> &);
+    bool read(const std::string &sKey, const std::function<void(void *ptr, int size)> &);
+
+    qint64 diskUsage() const;
+    void removeFromDisk() const;
+private:
+    class Private;
+    Private * const d;
+};
+
diff --git a/common/storage_kyoto.cpp b/common/storage_kyoto.cpp
new file mode 100644
index 0000000..40bd3e6
--- /dev/null
+++ b/common/storage_kyoto.cpp
@@ -0,0 +1,170 @@
+#include "storage.h"
+
+#include <iostream>
+
+#include <QAtomicInt>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QReadWriteLock>
+#include <QString>
+#include <QTime>
+
+#include <kchashdb.h>
+
+class Storage::Private
+{
+public:
+    Private(const QString &storageRoot, const QString &name);
+    ~Private();
+
+    kyotocabinet::TreeDB db;
+    bool dbOpen;
+    bool inTransaction;
+};
+
+Storage::Private::Private(const QString &storageRoot, const QString &name)
+    : inTransaction(false)
+{
+    QDir dir;
+    dir.mkdir(storageRoot);
+
+    //create file
+    dbOpen = db.open((storageRoot + "/" + name + ".kch").toStdString(), kyotocabinet::BasicDB::OWRITER | kyotocabinet::BasicDB::OCREATE);
+    if (!dbOpen) {
+        // TODO: handle error
+    }
+}
+
+Storage::Private::~Private()
+{
+    if (dbOpen && inTransaction) {
+        db.end_transaction(false);
+    }
+}
+
+Storage::Storage(const QString &storageRoot, const QString &name)
+    : d(new Private(storageRoot, name))
+{
+}
+
+Storage::~Storage()
+{
+    delete d;
+}
+
+bool Storage::isInTransaction() const
+{
+    return d->inTransaction;
+}
+
+bool Storage::startTransaction(TransactionType type)
+{
+    if (!d->dbOpen) {
+        return false;
+    }
+
+    if (d->inTransaction) {
+        return true;
+    }
+
+    //TODO handle errors
+    d->inTransaction = d->db.begin_transaction();
+    return d->inTransaction;
+}
+
+bool Storage::commitTransaction()
+{
+    if (!d->dbOpen) {
+        return false;
+    }
+
+    if (!d->inTransaction) {
+        return false;
+    }
+
+    bool success = d->db.end_transaction(true);
+    d->inTransaction = false;
+    return success;
+}
+
+void Storage::abortTransaction()
+{
+    if (!d->dbOpen || !d->inTransaction) {
+        return;
+    }
+
+    d->db.end_transaction(false);
+    d->inTransaction = false;
+}
+
+bool Storage::write(const char *key, size_t keySize, const char *value, size_t valueSize)
+{
+    if (!d->dbOpen) {
+        return false;
+    }
+
+    bool success = d->db.set(key, keySize, value, valueSize);
+    return success; 
+}
+
+bool Storage::write(const std::string &sKey, const std::string &sValue)
+{
+    if (!d->dbOpen) {
+        return false;
+    }
+
+    bool success = d->db.set(sKey, sValue);
+    return success; 
+}
+
+bool Storage::read(const std::string &sKey, const std::function<void(const std::string &value)> &resultHandler)
+{
+    if (!d->dbOpen) {
+        return false;
+    }
+
+    std::string value;
+    if (d->db.get(sKey, &value)) {
+        resultHandler(value);
+        return true;
+    }
+
+    return false;
+}
+
+bool Storage::read(const std::string &sKey, const std::function<void(void *ptr, int size)> &resultHandler)
+{
+    if (!d->dbOpen) {
+        return false;
+    }
+
+    size_t valueSize;
+    char *valueBuffer = d->db.get(sKey.data(), sKey.size(), &valueSize);
+    if (valueBuffer) {
+        resultHandler(valueBuffer, valueSize);
+    }
+    delete[] valueBuffer;
+    return valueBuffer != nullptr;
+}
+
+qint64 Storage::diskUsage() const
+{
+    if (!d->dbOpen) {
+        return 0;
+    }
+
+    QFileInfo info(QString::fromStdString(d->db.path()));
+    return info.size();
+}
+
+void Storage::removeFromDisk() const
+{
+    if (!d->dbOpen) {
+        return;
+    }
+
+   QFileInfo info(QString::fromStdString(d->db.path()));
+   QDir dir = info.dir();
+   dir.remove(info.fileName());
+}
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
new file mode 100644
index 0000000..283205f
--- /dev/null
+++ b/common/storage_lmdb.cpp
@@ -0,0 +1,282 @@
+#include "storage.h"
+
+#include <iostream>
+
+#include <QAtomicInt>
+#include <QDebug>
+#include <QDir>
+#include <QReadWriteLock>
+#include <QString>
+#include <QTime>
+
+#include <lmdb.h>
+
+class Storage::Private
+{
+public:
+    Private(const QString &s, const QString &name);
+    ~Private();
+
+    QString storageRoot;
+    QString name;
+
+    MDB_dbi dbi;
+    MDB_env *env;
+    MDB_txn *transaction;
+    bool readTransaction;
+    bool firstOpen;
+};
+
+Storage::Private::Private(const QString &s, const QString &n)
+    : transaction(0),
+      readTransaction(false),
+      firstOpen(true),
+      storageRoot(s),
+      name(n)
+{
+    QDir dir;
+    dir.mkdir(storageRoot);
+
+    //create file
+    if (mdb_env_create(&env)) {
+        // TODO: handle error
+    } else {
+        int rc = mdb_env_open(env, storageRoot.toStdString().data(), 0, 0664);
+
+        if (rc) {
+            std::cerr << "mdb_env_open: " << rc << " " << mdb_strerror(rc) << std::endl;
+            mdb_env_close(env);
+            env = 0;
+        } else {
+            const size_t dbSize = 10485760 * 100; //10MB * 100
+            mdb_env_set_mapsize(env, dbSize);
+        }
+    }
+}
+
+Storage::Private::~Private()
+{
+    if (transaction) {
+        mdb_txn_abort(transaction);
+    }
+
+    // it is still there and still unused, so we can shut it down
+    mdb_dbi_close(env, dbi);
+    mdb_env_close(env);
+}
+
+Storage::Storage(const QString &storageRoot, const QString &name)
+    : d(new Private(storageRoot, name))
+{
+}
+
+Storage::~Storage()
+{
+    delete d;
+}
+
+bool Storage::isInTransaction() const
+{
+    return d->transaction;
+}
+
+bool Storage::startTransaction(TransactionType type)
+{
+    if (!d->env) {
+        return false;
+    }
+
+    bool requestedRead = type == ReadOnly;
+    if (d->transaction && (!d->readTransaction || requestedRead)) {
+        return true;
+    }
+
+    if (d->transaction) {
+        // we are about to turn a read transaction into a writable one
+        abortTransaction();
+    }
+
+    if (d->firstOpen && requestedRead) {
+        //A write transaction is at least required the first time
+        mdb_txn_begin(d->env, nullptr, 0, &d->transaction);
+        //Open the database
+        //With this we could open multiple named databases if we wanted to
+        mdb_dbi_open(d->transaction, nullptr, 0, &d->dbi);
+        mdb_txn_abort(d->transaction);
+    }
+
+    int rc;
+    rc = mdb_txn_begin(d->env, NULL, requestedRead ? MDB_RDONLY : 0, &d->transaction);
+    if (!rc) {
+        rc = mdb_dbi_open(d->transaction, NULL, 0, &d->dbi);
+    }
+
+    d->firstOpen = false;
+    return !rc;
+}
+
+bool Storage::commitTransaction()
+{
+    if (!d->env) {
+        return false;
+    }
+
+    if (!d->transaction) {
+        return false;
+    }
+
+    int rc;
+    rc = mdb_txn_commit(d->transaction);
+    d->transaction = 0;
+
+    if (rc) {
+        std::cerr << "mdb_txn_commit: " << rc << " " << mdb_strerror(rc) << std::endl;
+    }
+
+    return !rc;
+}
+
+void Storage::abortTransaction()
+{
+    if (!d->env || !d->transaction) {
+        return;
+    }
+
+    mdb_txn_abort(d->transaction);
+    d->transaction = 0;
+}
+
+bool Storage::write(const char *key, size_t keySize, const char *value, size_t valueSize)
+{
+    write(std::string(key, keySize), std::string(value, valueSize));
+}
+
+bool Storage::write(const std::string &sKey, const std::string &sValue)
+{
+    if (!d->env) {
+        return false;
+    }
+
+    const bool implicitTransaction = !d->transaction || d->readTransaction;
+    if (implicitTransaction) {
+        // TODO: if this fails, still try the write below?
+        if (!startTransaction()) {
+            return false;
+        }
+    }
+
+    int rc;
+    MDB_val key, data;
+    key.mv_size = sKey.size();
+    key.mv_data = (void*)sKey.data();
+    data.mv_size = sValue.size();
+    data.mv_data = (void*)sValue.data();
+    rc = mdb_put(d->transaction, d->dbi, &key, &data, 0);
+
+    if (rc) {
+        std::cerr << "mdb_put: " << rc << " " << mdb_strerror(rc) << std::endl;
+    }
+
+    if (implicitTransaction) {
+        if (rc) {
+            abortTransaction();
+        } else {
+            rc = commitTransaction();
+        }
+    }
+
+    return !rc;
+}
+
+bool Storage::read(const std::string &sKey, const std::function<void(const std::string &value)> &resultHandler)
+{
+    return read(sKey,
+         [&](void *ptr, int size) {
+            const std::string resultValue(static_cast<char*>(ptr), size);
+            resultHandler(resultValue);
+         });
+// std::cout << "key: " << resultKey << " data: " << resultValue << std::endl;
+}
+
+bool Storage::read(const std::string &sKey, const std::function<void(void *ptr, int size)> &resultHandler)
+{
+    if (!d->env) {
+        return false;
+    }
+
+    int rc;
+    MDB_val key;
+    MDB_val data;
+    MDB_cursor *cursor;
+
+    key.mv_size = sKey.size();
+    key.mv_data = (void*)sKey.data();
+
+    const bool implicitTransaction = !d->transaction;
+    if (implicitTransaction) {
+        // TODO: if this fails, still try the write below?
+        if (!startTransaction(ReadOnly)) {
+            return false;
+        }
+    }
+
+    rc = mdb_cursor_open(d->transaction, d->dbi, &cursor);
+    if (rc) {
+        std::cerr << "mdb_cursor_get: " << rc << " " << mdb_strerror(rc) << std::endl;
+        return false;
+    }
+
+    if (sKey.empty()) {
+        std::cout << "Iterating over all values of store!" << std::endl;
+        rc = mdb_cursor_get(cursor, &key, &data, MDB_FIRST);
+        while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
+            resultHandler(key.mv_data, data.mv_size);
+        }
+
+        //We never find the last value
+        if (rc == MDB_NOTFOUND) {
+            rc = 0;
+        }
+    } else {
+        if ((rc = mdb_cursor_get(cursor, &key, &data, MDB_SET)) == 0) {
+            resultHandler(data.mv_data, data.mv_size);
+        } else {
+            std::cout << "couldn't find value " << sKey << " " << std::endl;
+        }
+    }
+
+    mdb_cursor_close(cursor);
+
+    if (rc) {
+        std::cerr << "mdb_cursor_get: " << rc << " " << mdb_strerror(rc) << std::endl;
+        return false;
+    }
+
+    /**
+      we don't abort the transaction since we need it for reading the values
+    if (implicitTransaction) {
+        abortTransaction();
+    }
+    */
+    return true;
+}
+
+qint64 Storage::diskUsage() const
+{
+    QFileInfo info(d->storageRoot + "/data.mdb");
+    return info.size();
+}
+
+void Storage::removeFromDisk() const
+{
+    QDir dir(d->path);
+    dir.remove("data.mdb");
+    dir.remove("lock.mdb");
+}
+
+void Storage::removeFromDisk() const
+{
+    QDir dir(d->storageRoot);
+    dir.remove("data.mdb");
+    dir.remove("lock.mdb");
+}