4 files changed, 81 insertions, 167 deletions

diff --git a/store/database.cpp b/store/database.cpp
index 71ec47d..542667a 100644
--- a/store/database.cpp
+++ b/store/database.cpp
@@ -5,61 +5,46 @@
 #include <QAtomicInt>
 #include <QDebug>
 #include <QDir>
+#include <QFileInfo>
 #include <QReadWriteLock>
 #include <QString>
 #include <QTime>
 
-#include <lmdb.h>
+#include <kchashdb.h>
 
 class Database::Private
 {
 public:
-    Private(const QString &path);
+    Private(const QString &storageRoot, const QString &name);
     ~Private();
 
-    MDB_dbi dbi;
-    MDB_env *env;
-    MDB_txn *transaction;
-    bool readTransaction;
+    kyotocabinet::TreeDB db;
+    bool dbOpen;
+    bool inTransaction;
 };
 
-Database::Private::Private(const QString &path)
-    : transaction(0),
-      readTransaction(false)
+Database::Private::Private(const QString &storageRoot, const QString &name)
+    : inTransaction(false)
 {
     QDir dir;
-    dir.mkdir(path);
+    dir.mkdir(storageRoot);
 
     //create file
-    if (mdb_env_create(&env)) {
+    dbOpen = db.open((storageRoot + "/" + name + ".kch").toStdString(), kyotocabinet::BasicDB::OWRITER | kyotocabinet::BasicDB::OCREATE);
+    if (!dbOpen) {
         // TODO: handle error
-    } else {
-        int rc = mdb_env_open(env, path.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);
-        }
     }
 }
 
 Database::Private::~Private()
 {
-    if (transaction) {
-        mdb_txn_abort(transaction);
+    if (dbOpen && inTransaction) {
+        db.end_transaction(false);
     }
-
-    // it is still there and still unused, so we can shut it down
-    mdb_dbi_close(env, dbi);
-    mdb_env_close(env);
 }
 
-Database::Database(const QString &path)
-    : d(new Private(path))
+Database::Database(const QString &storageRoot, const QString &name)
+    : d(new Private(storageRoot, name))
 {
 }
 
@@ -70,181 +55,110 @@ Database::~Database()
 
 bool Database::isInTransaction() const
 {
-    return d->transaction;
+    return d->inTransaction;
 }
 
 bool Database::startTransaction(TransactionType type)
 {
-    if (!d->env) {
+    if (!d->dbOpen) {
         return false;
     }
 
-    bool requestedRead = type == ReadOnly;
-    if (d->transaction && (!d->readTransaction || requestedRead)) {
+    if (d->inTransaction) {
         return true;
     }
 
-    if (d->transaction) {
-        // we are about to turn a read transaction into a writable one
-        abortTransaction();
-    }
-
     //TODO handle errors
-    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);
-    }
-
-    return !rc;
+    d->inTransaction = d->db.begin_transaction();
+    return d->inTransaction;
 }
 
 bool Database::commitTransaction()
 {
-    if (!d->env) {
+    if (!d->dbOpen) {
         return false;
     }
 
-    if (!d->transaction) {
+    if (!d->inTransaction) {
         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;
+    bool success = d->db.end_transaction(true);
+    d->inTransaction = false;
+    return success;
 }
 
 void Database::abortTransaction()
 {
-    if (!d->env || !d->transaction) {
+    if (!d->dbOpen || !d->inTransaction) {
         return;
     }
 
-    mdb_txn_abort(d->transaction);
-    d->transaction = 0;
+    d->db.end_transaction(false);
+    d->inTransaction = false;
 }
 
-bool Database::write(const std::string &sKey, const std::string &sValue)
+bool Database::write(const char *key, size_t keySize, const char *value, size_t valueSize)
 {
-    if (!d->env) {
+    if (!d->dbOpen) {
         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;
-    }
+    bool success = d->db.set(key, keySize, value, valueSize);
+    return success; 
+}
 
-    if (implicitTransaction) {
-        if (rc) {
-            abortTransaction();
-        } else {
-            rc = commitTransaction();
-        }
+bool Database::write(const std::string &sKey, const std::string &sValue)
+{
+    if (!d->dbOpen) {
+        return false;
     }
 
-    return !rc;
+    bool success = d->db.set(sKey, sValue);
+    return success; 
 }
 
 void Database::read(const std::string &sKey, const std::function<void(const std::string &value)> &resultHandler)
 {
-    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;
-}
-
-void Database::read(const std::string &sKey, const std::function<void(void *ptr, int size)> &resultHandler)
-{
-    if (!d->env) {
+    if (!d->dbOpen) {
         return;
     }
 
-    int rc;
-    MDB_val key;
-    MDB_val data;
-    MDB_cursor *cursor;
-
-    key.mv_size = sKey.size();
-    key.mv_data = (void*)sKey.data();
-
-    /*
-TODO: do we need a write transaction before a read transaction? only relevant for implicitTransactions in any case
-    {
-        //A write transaction is at least required the first time
-        rc = mdb_txn_begin(env, nullptr, 0, &txn);
-        //Open the database
-        //With this we could open multiple named databases if we wanted to
-        rc = mdb_dbi_open(txn, nullptr, 0, &dbi);
-        mdb_txn_abort(txn);
-    }
-    */
-    const bool implicitTransaction = !d->transaction;
-    if (implicitTransaction) {
-        // TODO: if this fails, still try the write below?
-        if (!startTransaction(ReadOnly)) {
-            return;
-        }
+    std::string value;
+    if (d->db.get(sKey, &value)) {
+        resultHandler(value);
     }
+}
 
-    rc = mdb_cursor_open(d->transaction, d->dbi, &cursor);
-    if (rc) {
-        std::cerr << "mdb_cursor_get: " << rc << " " << mdb_strerror(rc) << std::endl;
+void Database::read(const std::string &sKey, const std::function<void(void *ptr, int size)> &resultHandler)
+{
+    if (!d->dbOpen) {
         return;
     }
 
-    if (sKey.empty()) {
-        std::cout << "Iterating over all values of store!" << std::endl;
-        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;
-        }
-    }
+    size_t valueSize;
+    char *valueBuffer = d->db.get(sKey.data(), sKey.size(), &valueSize);
+    resultHandler(valueBuffer, valueSize);
+    delete[] valueBuffer;
+}
 
-    if (rc) {
-        std::cerr << "mdb_cursor_get: " << rc << " " << mdb_strerror(rc) << std::endl;
+qint64 Database::diskUsage() const
+{
+    if (!d->dbOpen) {
+        return 0;
     }
 
-    mdb_cursor_close(cursor);
+    QFileInfo info(QString::fromStdString(d->db.path()));
+    return info.size();
+}
 
-    /**
-      we don't abort the transaction since we need it for reading the values
-    if (implicitTransaction) {
-        abortTransaction();
+void Database::removeFromDisk() const
+{
+    if (!d->dbOpen) {
+        return;
     }
-    */
-}
 
+   QFileInfo info(QString::fromStdString(d->db.path()));
+   QDir dir = info.dir();
+   dir.remove(info.fileName());
+}
diff --git a/store/database.h b/store/database.h
index 2bf0556..e752ff5 100644
--- a/store/database.h
+++ b/store/database.h
@@ -7,17 +7,20 @@ class Database {
 public:
     enum TransactionType { ReadOnly, ReadWrite };
 
-    Database(const QString &path);
+    Database(const QString &storageRoot, const QString &name);
     ~Database();
     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
     void read(const std::string &sKey, const std::function<void(const std::string &value)> &);
     void 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/store/test/CMakeLists.txt b/store/test/CMakeLists.txt
index 4743cfb..1b9dc9e 100644
--- a/store/test/CMakeLists.txt
+++ b/store/test/CMakeLists.txt
@@ -12,7 +12,7 @@ macro(manual_tests)
     foreach(_testname ${ARGN})
         add_executable(${_testname} ${_testname}.cpp ${store_SRCS})
         qt5_use_modules(${_testname} Core Test)
-        target_link_libraries(${_testname} lmdb)
+        target_link_libraries(${_testname} kyotocabinet)
     endforeach(_testname)
 endmacro(auto_tests)
 
diff --git a/store/test/storagebenchmark.cpp b/store/test/storagebenchmark.cpp
index 3be90e9..d42dea8 100644
--- a/store/test/storagebenchmark.cpp
+++ b/store/test/storagebenchmark.cpp
@@ -46,21 +46,16 @@ class StorageBenchmark : public QObject
 private:
     //This should point to a directory on disk and not a ramdisk (since we're measuring performance)
     QString testDataPath;
-    QString dbPath;
+    QString dbName;
     QString filePath;
     const int count = 50000;
 
 private Q_SLOTS:
     void initTestCase()
     {
-        testDataPath = "./";
-        dbPath = testDataPath + "testdb";
+        testDataPath = "./testdb";
+        dbName = "test";
         filePath = testDataPath + "buffer.fb";
-
-        QDir dir(testDataPath);
-        dir.remove("testdb/data.mdb");
-        dir.remove("testdb/lock.mdb");
-        dir.remove(filePath);
     }
 
     void testWriteRead_data()
@@ -79,7 +74,7 @@ private Q_SLOTS:
 
         Database *db = 0;
         if (useDb) {
-            db = new Database(dbPath);
+            db = new Database(testDataPath, dbName);
         }
 
         std::ofstream myfile;
@@ -118,7 +113,7 @@ private Q_SLOTS:
         {
             for (int i = 0; i < count; i++) {
                 if (db) {
-                    db->read(keyPrefix + std::to_string(i), [](void *ptr, int size){});
+                    db->read(keyPrefix + std::to_string(i), [](std::string value){});
                 }
             }
         }
@@ -149,9 +144,11 @@ private Q_SLOTS:
 
     void testSizes()
     {
-        QFileInfo dbInfo(dbPath, "data.mdb");
+        Database db(testDataPath, dbName);
+        qDebug() << "Database size [kb]: " << db.diskUsage()/1024;
+        db.removeFromDisk();
+
         QFileInfo fileInfo(filePath);
-        qDebug() << "Database size [kb]: " << dbInfo.size()/1024;
         qDebug() << "File size [kb]: " << fileInfo.size()/1024;
     }
 };