Merge branch 'kyoto'

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

1 files changed, 28 insertions, 0 deletions

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;
+};
+