From 6081493b35855090a965aa4f81d07253458179b7 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Thu, 4 Dec 2014 21:04:36 +0100
Subject: build

---
 dummyresource/facade.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dummyresource')

diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index 162f76f..012bcf0 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -69,14 +69,14 @@ public:
     DummyEvent const *buffer;
 
     //Keep query alive so values remain valid
-    QSharedPointer<ReadTransaction> db;
+    QSharedPointer<Database> db;
 };
 
 void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback)
 {
     qDebug() << "load called";
     //TODO only read values matching the query
-    auto db = QSharedPointer<ReadTransaction>::create("dummyresource");
+    auto db = QSharedPointer<Database>::create("dummyresource");
     db->read("", [resultCallback, db](void *data, int size) {
         //TODO read second buffer as well
         auto eventBuffer = GetDummyEvent(data);
-- 
cgit v1.2.3


From 2b4e5743cca6a59e6e1a32b03863bf5ec4a4c30f Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Thu, 4 Dec 2014 21:13:17 +0100
Subject: use the standard storage location

---
 dummyresource/facade.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dummyresource')

diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index 012bcf0..7e9881b 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -11,7 +11,7 @@ using namespace flatbuffers;
 DummyResourceFacade::DummyResourceFacade()
     : Akonadi2::StoreFacade<Akonadi2::Domain::Event>(),
     mResourceAccess(new ResourceAccess("dummyresource")),
-    mDatabase(new Database("dummyresource"))
+    mDatabase(new Database(Akonadi2::Store::storageLocation(), "dummyresource"))
 {
     // connect(mResourceAccess.data(), &ResourceAccess::ready, this, onReadyChanged);
 }
@@ -76,7 +76,7 @@ void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function
 {
     qDebug() << "load called";
     //TODO only read values matching the query
-    auto db = QSharedPointer<Database>::create("dummyresource");
+    auto db = QSharedPointer<Database>::create(Akonadi2::Store::storageLocation(), "dummyresource");
     db->read("", [resultCallback, db](void *data, int size) {
         //TODO read second buffer as well
         auto eventBuffer = GetDummyEvent(data);
-- 
cgit v1.2.3


From 767312e2063f4e58af3de0f27aba52de49e14295 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Fri, 5 Dec 2014 09:17:46 +0100
Subject: major reorg that puts Storage (previously Database) into common

there is now a top-level tests dir, and a compile time switch for
lmdb vs kyotocabinet
---
 dummyresource/facade.cpp | 10 +++++-----
 dummyresource/facade.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'dummyresource')

diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index 7e9881b..9758c1b 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -11,7 +11,7 @@ using namespace flatbuffers;
 DummyResourceFacade::DummyResourceFacade()
     : Akonadi2::StoreFacade<Akonadi2::Domain::Event>(),
     mResourceAccess(new ResourceAccess("dummyresource")),
-    mDatabase(new Database(Akonadi2::Store::storageLocation(), "dummyresource"))
+    mStorage(new Storage(Akonadi2::Store::storageLocation(), "dummyresource"))
 {
     // connect(mResourceAccess.data(), &ResourceAccess::ready, this, onReadyChanged);
 }
@@ -69,20 +69,20 @@ public:
     DummyEvent const *buffer;
 
     //Keep query alive so values remain valid
-    QSharedPointer<Database> db;
+    QSharedPointer<Storage> storage;
 };
 
 void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback)
 {
     qDebug() << "load called";
     //TODO only read values matching the query
-    auto db = QSharedPointer<Database>::create(Akonadi2::Store::storageLocation(), "dummyresource");
-    db->read("", [resultCallback, db](void *data, int size) {
+    auto storage = QSharedPointer<Storage>::create(Akonadi2::Store::storageLocation(), "dummyresource");
+    storage->read("", [resultCallback, storage](void *data, int size) {
         //TODO read second buffer as well
         auto eventBuffer = GetDummyEvent(data);
         auto event = QSharedPointer<DummyEventAdaptor>::create("dummyresource", "key", 0);
         event->buffer = eventBuffer;
-        event->db = db;
+        event->storage = storage;
         resultCallback(event);
     });
 }
diff --git a/dummyresource/facade.h b/dummyresource/facade.h
index 7a516de..310ef77 100644
--- a/dummyresource/facade.h
+++ b/dummyresource/facade.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "client/clientapi.h"
-#include "store/database.h"
+#include "common/storage.h"
 
 class ResourceAccess;
 
@@ -18,5 +18,5 @@ public:
 
 private:
     QSharedPointer<ResourceAccess> mResourceAccess;
-    QSharedPointer<Database> mDatabase;
+    QSharedPointer<Storage> mStorage;
 };
-- 
cgit v1.2.3