Merge branch 'kyoto'

Conflicts:
	common/storage.h
	common/storage_lmdb.cpp
	dummyresource/facade.cpp
	store/test/CMakeLists.txt
	tests/storagebenchmark.cpp

6 files changed, 0 insertions, 498 deletions

diff --git a/store/CMakeLists.txt b/store/CMakeLists.txt
deleted file mode 100644
index 552439e..0000000
--- a/store/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(test)
diff --git a/store/database.cpp b/store/database.cpp
deleted file mode 100644
index c4dfbd6..0000000
--- a/store/database.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-#include "database.h"
-
-#include <iostream>
-
-#include <QAtomicInt>
-#include <QDebug>
-#include <QDir>
-#include <QReadWriteLock>
-#include <QString>
-#include <QTime>
-
-#include <lmdb.h>
-
-class Database::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;
-};
-
-Database::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);
-        }
-    }
-}
-
-Database::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);
-}
-
-Database::Database(const QString &storageRoot, const QString &name)
-    : d(new Private(storageRoot, name))
-{
-}
-
-Database::~Database()
-{
-    delete d;
-}
-
-bool Database::isInTransaction() const
-{
-    return d->transaction;
-}
-
-bool Database::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 Database::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 Database::abortTransaction()
-{
-    if (!d->env || !d->transaction) {
-        return;
-    }
-
-    mdb_txn_abort(d->transaction);
-    d->transaction = 0;
-}
-
-bool Database::write(const char *key, size_t keySize, const char *value, size_t valueSize)
-{
-    write(std::string(key, keySize), std::string(value, valueSize));
-}
-
-bool Database::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 Database::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 Database::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;
-        }
-    }
-
-    if (rc) {
-        std::cerr << "mdb_cursor_get: " << rc << " " << mdb_strerror(rc) << std::endl;
-        return false;
-    }
-
-    mdb_cursor_close(cursor);
-
-    /**
-      we don't abort the transaction since we need it for reading the values
-    if (implicitTransaction) {
-        abortTransaction();
-    }
-    */
-    return true;
-}
-
-qint64 Database::diskUsage() const
-{
-    QFileInfo info(d->storageRoot + "/data.mdb");
-    return info.size();
-}
-
-void Database::removeFromDisk() const
-{
-    QDir dir(d->storageRoot);
-    dir.remove("data.mdb");
-    dir.remove("lock.mdb");
-}
diff --git a/store/database.h b/store/database.h
deleted file mode 100644
index 1cede39..0000000
--- a/store/database.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <string>
-#include <QString>
-
-class Database {
-public:
-    enum TransactionType { ReadOnly, ReadWrite };
-
-    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
-    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/store/test/CMakeLists.txt b/store/test/CMakeLists.txt
deleted file mode 100644
index c5c4fcb..0000000
--- a/store/test/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-set(store_path "../")
-set(store_SRCS
-    ${store_path}/database.cpp
-)
-
-generate_flatbuffers(calendar)
-
-macro(manual_tests)
-    foreach(_testname ${ARGN})
-        add_executable(${_testname} ${_testname}.cpp ${store_SRCS})
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} lmdb)
-    endforeach(_testname)
-endmacro(auto_tests)
-
-manual_tests (
-    storagebenchmark
-    storagetest
-)
diff --git a/store/test/calendar.fbs b/store/test/calendar.fbs
deleted file mode 100644
index 203ee43..0000000
--- a/store/test/calendar.fbs
+++ /dev/null
@@ -1,12 +0,0 @@
-// example IDL file
-
-namespace Calendar;
-
-table Event {
-  summary:string;
-  description:string;
-  attachment:[byte];
-}
-
-root_type Event;
-file_identifier "AKFB";
diff --git a/store/test/storagebenchmark.cpp b/store/test/storagebenchmark.cpp
deleted file mode 100644
index 0bad138..0000000
--- a/store/test/storagebenchmark.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-#include <QtTest>
-
-#include "calendar_generated.h"
-
-#include <iostream>
-#include <fstream>
-
-#include <QDebug>
-#include <QString>
-#include <QTime>
-
-#include "store/database.h"
-
-using namespace Calendar;
-using namespace flatbuffers;
-
-static std::string createEvent()
-{
-    FlatBufferBuilder fbb;
-    {
-        auto summary = fbb.CreateString("summary");
-
-        const int attachmentSize = 1024*2; // 2KB
-        int8_t rawData[attachmentSize];
-        auto data = fbb.CreateVector(rawData, attachmentSize);
-
-        Calendar::EventBuilder eventBuilder(fbb);
-        eventBuilder.add_summary(summary);
-        eventBuilder.add_attachment(data);
-        auto eventLocation = eventBuilder.Finish();
-        FinishEventBuffer(fbb, eventLocation);
-    }
-    return std::string(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize());
-}
-
-// static void readEvent(const std::string &data)
-// {
-//     auto readEvent = GetEvent(data.c_str());
-//     std::cout << readEvent->summary()->c_str() << std::endl;
-// }
-
-class StorageBenchmark : public QObject
-{
-    Q_OBJECT
-private:
-    //This should point to a directory on disk and not a ramdisk (since we're measuring performance)
-    QString testDataPath;
-    QString dbName;
-    QString filePath;
-    const int count = 50000;
-
-private Q_SLOTS:
-    void initTestCase()
-    {
-        testDataPath = "./testdb";
-        dbName = "test";
-        filePath = testDataPath + "buffer.fb";
-    }
-
-    void cleanupTestCase()
-    {
-        Database db(testDataPath, dbName);
-        db.removeFromDisk();
-    }
-
-    void testWriteRead_data()
-    {
-        QTest::addColumn<bool>("useDb");
-        QTest::addColumn<int>("count");
-
-        QTest::newRow("db, 50k") << true << count;
-        QTest::newRow("file, 50k") << false << count;
-    }
-
-    void testWriteRead()
-    {
-        QFETCH(bool, useDb);
-        QFETCH(int, count);
-
-        Database *db = 0;
-        if (useDb) {
-            db = new Database(testDataPath, dbName);
-        }
-
-        std::ofstream myfile;
-        myfile.open(filePath.toStdString());
-        const char *keyPrefix = "key";
-
-        QTime time;
-
-        time.start();
-        {
-            auto event = createEvent();
-            for (int i = 0; i < count; i++) {
-                if (db) {
-                    if (i % 10000 == 0) {
-                        if (i > 0) {
-                            db->commitTransaction();
-                        }
-                        db->startTransaction();
-                    }
-
-                    db->write(keyPrefix + std::to_string(i), event);
-                } else {
-                    myfile << event;
-                }
-            }
-
-            if (db) {
-                db->commitTransaction();
-            } else {
-                myfile.close();
-            }
-        }
-        const int writeDuration = time.restart();
-        qDebug() << "Writing took[ms]: " << writeDuration;
-
-        {
-            for (int i = 0; i < count; i++) {
-                if (db) {
-                    db->read(keyPrefix + std::to_string(i), [](std::string value){});
-                }
-            }
-        }
-        const int readDuration = time.restart();
-
-        if (db) {
-            qDebug() << "Reading took[ms]: " << readDuration;
-        } else {
-            qDebug() << "File reading is not implemented.";
-        }
-
-        delete db;
-    }
-
-    void testBufferCreation()
-    {
-        QTime time;
-
-        time.start();
-        {
-            for (int i = 0; i < count; i++) {
-                auto event = createEvent();
-            }
-        }
-        const int bufferDuration = time.elapsed();
-        qDebug() << "Creating buffers took[ms]: " << bufferDuration;
-    }
-
-    void testSizes()
-    {
-        Database db(testDataPath, dbName);
-        qDebug() << "Database size [kb]: " << db.diskUsage()/1024;
-
-        QFileInfo fileInfo(filePath);
-        qDebug() << "File size [kb]: " << fileInfo.size()/1024;
-    }
-};
-
-QTEST_MAIN(StorageBenchmark)
-#include "storagebenchmark.moc"