From cc3fed3668a80616ec78bc872e21b7ac06bcde38 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 9 Apr 2015 15:21:06 +0200 Subject: Renamed Akonadi::Domain to Akonadi::ApplicationDomain Because it's really the application domain and not the akonadi domain. --- dummyresource/domainadaptor.cpp | 25 +++++++++++-------------- dummyresource/domainadaptor.h | 6 +++--- dummyresource/facade.cpp | 29 +++++++++++++++-------------- dummyresource/facade.h | 14 +++++++------- dummyresource/resourcefactory.cpp | 2 +- 5 files changed, 37 insertions(+), 39 deletions(-) (limited to 'dummyresource') diff --git a/dummyresource/domainadaptor.cpp b/dummyresource/domainadaptor.cpp index 865a4c0..b133614 100644 --- a/dummyresource/domainadaptor.cpp +++ b/dummyresource/domainadaptor.cpp @@ -14,11 +14,8 @@ using namespace DummyCalendar; using namespace flatbuffers; -using namespace DummyCalendar; -using namespace flatbuffers; - //This will become a generic implementation that simply takes the resource buffer and local buffer pointer -class DummyEventAdaptor : public Akonadi2::Domain::BufferAdaptor +class DummyEventAdaptor : public Akonadi2::ApplicationDomain::BufferAdaptor { public: DummyEventAdaptor() @@ -55,10 +52,10 @@ public: return props; } - Akonadi2::Domain::Buffer::Event const *mLocalBuffer; + Akonadi2::ApplicationDomain::Buffer::Event const *mLocalBuffer; DummyEvent const *mResourceBuffer; - QSharedPointer > mLocalMapper; + QSharedPointer > mLocalMapper; QSharedPointer > mResourceMapper; }; @@ -73,14 +70,14 @@ DummyEventAdaptorFactory::DummyEventAdaptorFactory() } return QVariant(); }); - mLocalMapper = QSharedPointer >::create(); - mLocalMapper->mReadAccessors.insert("summary", [](Akonadi2::Domain::Buffer::Event const *buffer) -> QVariant { + mLocalMapper = QSharedPointer >::create(); + mLocalMapper->mReadAccessors.insert("summary", [](Akonadi2::ApplicationDomain::Buffer::Event const *buffer) -> QVariant { if (buffer->summary()) { return QString::fromStdString(buffer->summary()->c_str()); } return QVariant(); }); - mLocalMapper->mReadAccessors.insert("uid", [](Akonadi2::Domain::Buffer::Event const *buffer) -> QVariant { + mLocalMapper->mReadAccessors.insert("uid", [](Akonadi2::ApplicationDomain::Buffer::Event const *buffer) -> QVariant { if (buffer->uid()) { return QString::fromStdString(buffer->uid()->c_str()); } @@ -90,10 +87,10 @@ DummyEventAdaptorFactory::DummyEventAdaptorFactory() } //TODO pass EntityBuffer instead? -QSharedPointer DummyEventAdaptorFactory::createAdaptor(const Akonadi2::Entity &entity) +QSharedPointer DummyEventAdaptorFactory::createAdaptor(const Akonadi2::Entity &entity) { const auto resourceBuffer = Akonadi2::EntityBuffer::readBuffer(entity.resource()); - const auto localBuffer = Akonadi2::EntityBuffer::readBuffer(entity.local()); + const auto localBuffer = Akonadi2::EntityBuffer::readBuffer(entity.local()); // const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer(entity.metadata()); auto adaptor = QSharedPointer::create(); @@ -104,7 +101,7 @@ QSharedPointer DummyEventAdaptorFactory::create return adaptor; } -void DummyEventAdaptorFactory::createBuffer(const Akonadi2::Domain::Event &event, flatbuffers::FlatBufferBuilder &fbb) +void DummyEventAdaptorFactory::createBuffer(const Akonadi2::ApplicationDomain::Event &event, flatbuffers::FlatBufferBuilder &fbb) { flatbuffers::FlatBufferBuilder eventFbb; eventFbb.Clear(); @@ -119,10 +116,10 @@ void DummyEventAdaptorFactory::createBuffer(const Akonadi2::Domain::Event &event flatbuffers::FlatBufferBuilder localFbb; { auto uid = localFbb.CreateString(event.getProperty("uid").toString().toStdString()); - auto localBuilder = Akonadi2::Domain::Buffer::EventBuilder(localFbb); + auto localBuilder = Akonadi2::ApplicationDomain::Buffer::EventBuilder(localFbb); localBuilder.add_uid(uid); auto location = localBuilder.Finish(); - Akonadi2::Domain::Buffer::FinishEventBuffer(localFbb, location); + Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(localFbb, location); } Akonadi2::EntityBuffer::assembleEntityBuffer(fbb, 0, 0, eventFbb.GetBufferPointer(), eventFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize()); diff --git a/dummyresource/domainadaptor.h b/dummyresource/domainadaptor.h index a2fb8a9..143121a 100644 --- a/dummyresource/domainadaptor.h +++ b/dummyresource/domainadaptor.h @@ -5,11 +5,11 @@ #include "dummycalendar_generated.h" #include "entity_generated.h" -class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory +class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory { public: DummyEventAdaptorFactory(); virtual ~DummyEventAdaptorFactory() {}; - virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity); - virtual void createBuffer(const Akonadi2::Domain::Event &event, flatbuffers::FlatBufferBuilder &fbb); + virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity); + virtual void createBuffer(const Akonadi2::ApplicationDomain::Event &event, flatbuffers::FlatBufferBuilder &fbb); }; diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp index 7c64675..980833f 100644 --- a/dummyresource/facade.cpp +++ b/dummyresource/facade.cpp @@ -38,7 +38,7 @@ using namespace flatbuffers; DummyResourceFacade::DummyResourceFacade() - : Akonadi2::GenericFacade("org.kde.dummy"), + : Akonadi2::GenericFacade("org.kde.dummy"), mFactory(new DummyEventAdaptorFactory) { } @@ -47,30 +47,30 @@ DummyResourceFacade::~DummyResourceFacade() { } -Async::Job DummyResourceFacade::create(const Akonadi2::Domain::Event &domainObject) +Async::Job DummyResourceFacade::create(const Akonadi2::ApplicationDomain::Event &domainObject) { flatbuffers::FlatBufferBuilder entityFbb; mFactory->createBuffer(domainObject, entityFbb); return sendCreateCommand("event", QByteArray::fromRawData(reinterpret_cast(entityFbb.GetBufferPointer()), entityFbb.GetSize())); } -Async::Job DummyResourceFacade::modify(const Akonadi2::Domain::Event &domainObject) +Async::Job DummyResourceFacade::modify(const Akonadi2::ApplicationDomain::Event &domainObject) { //Create message buffer and send to resource return Async::null(); } -Async::Job DummyResourceFacade::remove(const Akonadi2::Domain::Event &domainObject) +Async::Job DummyResourceFacade::remove(const Akonadi2::ApplicationDomain::Event &domainObject) { //Create message buffer and send to resource return Async::null(); } -static std::function prepareQuery(const Akonadi2::Query &query) +static std::function prepareQuery(const Akonadi2::Query &query) { //Compose some functions to make query matching fast. //This way we can process the query once, and convert all values into something that can be compared quickly - std::function preparedQuery; + std::function preparedQuery; if (!query.ids.isEmpty()) { //Match by id //TODO: for id's a direct lookup would be way faster @@ -81,7 +81,7 @@ static std::functionuid() && (QByteArray::fromRawData(local->uid()->c_str(), local->uid()->size()) == uid)) { return true; } @@ -99,14 +99,14 @@ static std::function storage, const QByteArray &key, const std::function &resultCallback, std::function preparedQuery) +void DummyResourceFacade::readValue(QSharedPointer storage, const QByteArray &key, const std::function &resultCallback, std::function preparedQuery) { storage->scan(key, [=](void *keyValue, int keySize, void *dataValue, int dataSize) -> bool { @@ -119,7 +119,7 @@ void DummyResourceFacade::readValue(QSharedPointer storage, c Akonadi2::EntityBuffer buffer(dataValue, dataSize); const auto resourceBuffer = Akonadi2::EntityBuffer::readBuffer(buffer.entity().resource()); - const auto localBuffer = Akonadi2::EntityBuffer::readBuffer(buffer.entity().local()); + const auto localBuffer = Akonadi2::EntityBuffer::readBuffer(buffer.entity().local()); const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer(buffer.entity().metadata()); if (!resourceBuffer || !metadataBuffer) { @@ -135,8 +135,8 @@ void DummyResourceFacade::readValue(QSharedPointer storage, c //Not i.e. for tags that are stored as flags in each entity of an imap store. auto adaptor = mFactory->createAdaptor(buffer.entity()); //TODO only copy requested properties - auto memoryAdaptor = QSharedPointer::create(*adaptor); - auto event = QSharedPointer::create("org.kde.dummy", QByteArray::fromRawData(static_cast(keyValue), keySize), revision, memoryAdaptor); + auto memoryAdaptor = QSharedPointer::create(*adaptor); + auto event = QSharedPointer::create("org.kde.dummy", QByteArray::fromRawData(static_cast(keyValue), keySize), revision, memoryAdaptor); resultCallback(event); } return true; @@ -146,7 +146,7 @@ void DummyResourceFacade::readValue(QSharedPointer storage, c }); } -Async::Job DummyResourceFacade::load(const Akonadi2::Query &query, const std::function &resultCallback) +Async::Job DummyResourceFacade::load(const Akonadi2::Query &query, const std::function &resultCallback) { return synchronizeResource(query.syncOnDemand, query.processAll).then([=](Async::Future &future) { //Now that the sync is complete we can execute the query @@ -154,6 +154,7 @@ Async::Job DummyResourceFacade::load(const Akonadi2::Query &query, const s auto storage = QSharedPointer::create(Akonadi2::Store::storageLocation(), "org.kde.dummy"); + //Index lookups QVector keys; if (query.propertyFilter.contains("uid")) { static Index uidIndex(Akonadi2::Store::storageLocation(), "org.kde.dummy.index.uid", Akonadi2::Storage::ReadOnly); diff --git a/dummyresource/facade.h b/dummyresource/facade.h index 195c50f..7bef2cc 100644 --- a/dummyresource/facade.h +++ b/dummyresource/facade.h @@ -29,17 +29,17 @@ #include "dummycalendar_generated.h" #include "common/domainadaptor.h" -class DummyResourceFacade : public Akonadi2::GenericFacade +class DummyResourceFacade : public Akonadi2::GenericFacade { public: DummyResourceFacade(); virtual ~DummyResourceFacade(); - virtual Async::Job create(const Akonadi2::Domain::Event &domainObject); - virtual Async::Job modify(const Akonadi2::Domain::Event &domainObject); - virtual Async::Job remove(const Akonadi2::Domain::Event &domainObject); - virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback); + virtual Async::Job create(const Akonadi2::ApplicationDomain::Event &domainObject); + virtual Async::Job modify(const Akonadi2::ApplicationDomain::Event &domainObject); + virtual Async::Job remove(const Akonadi2::ApplicationDomain::Event &domainObject); + virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback); private: - void readValue(QSharedPointer storage, const QByteArray &key, const std::function &resultCallback, std::function); - QSharedPointer > mFactory; + void readValue(QSharedPointer storage, const QByteArray &key, const std::function &resultCallback, std::function); + QSharedPointer > mFactory; }; diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp index ea37466..04413c2 100644 --- a/dummyresource/resourcefactory.cpp +++ b/dummyresource/resourcefactory.cpp @@ -416,7 +416,7 @@ Akonadi2::Resource *DummyResourceFactory::createResource() void DummyResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory) { - factory.registerFacade(PLUGIN_NAME); + factory.registerFacade(PLUGIN_NAME); } #include "resourcefactory.moc" -- cgit v1.2.3