From d23f414fe907fd382c387f9e6c627c217e68440f Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 17 May 2018 21:31:00 +0200 Subject: A lot less namespace typing. --- common/storage/entitystore.cpp | 56 +++++++++++++++++++++--------------------- common/storage/entitystore.h | 30 +++++++++++----------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp index 4560b13..6a71c39 100644 --- a/common/storage/entitystore.cpp +++ b/common/storage/entitystore.cpp @@ -107,7 +107,7 @@ public: bool exists() { - return Sink::Storage::DataStore(Sink::storageLocation(), resourceContext.instanceId(), DataStore::ReadOnly).exists(); + return DataStore(Sink::storageLocation(), resourceContext.instanceId(), DataStore::ReadOnly).exists(); } DataStore::Transaction &getTransaction() @@ -116,7 +116,7 @@ public: return transaction; } - Sink::Storage::DataStore store(Sink::storageLocation(), dbLayout(resourceContext.instanceId()), DataStore::ReadOnly); + DataStore store(Sink::storageLocation(), dbLayout(resourceContext.instanceId()), DataStore::ReadOnly); transaction = store.createTransaction(DataStore::ReadOnly); return transaction; } @@ -147,10 +147,10 @@ public: return index; } - ApplicationDomain::ApplicationDomainType createApplicationDomainType(const QByteArray &type, const QByteArray &uid, qint64 revision, const EntityBuffer &buffer) + ApplicationDomainType createApplicationDomainType(const QByteArray &type, const QByteArray &uid, qint64 revision, const EntityBuffer &buffer) { auto adaptor = resourceContext.adaptorFactory(type).createAdaptor(buffer.entity(), &typeIndex(type)); - return ApplicationDomain::ApplicationDomainType{resourceContext.instanceId(), uid, revision, adaptor}; + return ApplicationDomainType{resourceContext.instanceId(), uid, revision, adaptor}; } }; @@ -168,22 +168,22 @@ void EntityStore::initialize() //This is required to be able to set the database version only in the case where we create a new database. if (!Storage::DataStore::exists(Sink::storageLocation(), d->resourceContext.instanceId())) { //The first time we open the environment we always want it to be read/write. Otherwise subsequent tries to open a write transaction will fail. - startTransaction(Sink::Storage::DataStore::ReadWrite); + startTransaction(DataStore::ReadWrite); //Create the database with the correct version if it wasn't existing before SinkLogCtx(d->logCtx) << "Creating resource database."; Storage::DataStore::setDatabaseVersion(d->transaction, Sink::latestDatabaseVersion()); } else { //The first time we open the environment we always want it to be read/write. Otherwise subsequent tries to open a write transaction will fail. - startTransaction(Sink::Storage::DataStore::ReadWrite); + startTransaction(DataStore::ReadWrite); } commitTransaction(); } -void EntityStore::startTransaction(Sink::Storage::DataStore::AccessMode accessMode) +void EntityStore::startTransaction(DataStore::AccessMode accessMode) { SinkTraceCtx(d->logCtx) << "Starting transaction: " << accessMode; Q_ASSERT(!d->transaction); - d->transaction = Sink::Storage::DataStore(Sink::storageLocation(), dbLayout(d->resourceContext.instanceId()), accessMode).createTransaction(accessMode); + d->transaction = DataStore(Sink::storageLocation(), dbLayout(d->resourceContext.instanceId()), accessMode).createTransaction(accessMode); } void EntityStore::commitTransaction() @@ -211,7 +211,7 @@ bool EntityStore::hasTransaction() const return d->transaction; } -bool EntityStore::add(const QByteArray &type, ApplicationDomain::ApplicationDomainType entity, bool replayToSource) +bool EntityStore::add(const QByteArray &type, ApplicationDomainType entity, bool replayToSource) { if (entity.identifier().isEmpty()) { SinkWarningCtx(d->logCtx) << "Can't write entity with an empty identifier"; @@ -247,7 +247,7 @@ bool EntityStore::add(const QByteArray &type, ApplicationDomain::ApplicationDoma return true; } -ApplicationDomain::ApplicationDomainType EntityStore::applyDiff(const QByteArray &type, const ApplicationDomain::ApplicationDomainType ¤t, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions) const +ApplicationDomain::ApplicationDomainType EntityStore::applyDiff(const QByteArray &type, const ApplicationDomainType ¤t, const ApplicationDomainType &diff, const QByteArrayList &deletions) const { auto newEntity = *ApplicationDomainType::getInMemoryRepresentation(current, current.availableProperties()); @@ -271,7 +271,7 @@ ApplicationDomain::ApplicationDomainType EntityStore::applyDiff(const QByteArray return newEntity; } -bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions, bool replayToSource) +bool EntityStore::modify(const QByteArray &type, const ApplicationDomainType &diff, const QByteArrayList &deletions, bool replayToSource) { const auto current = readLatest(type, diff.identifier()); if (current.identifier().isEmpty()) { @@ -283,7 +283,7 @@ bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::Applic return modify(type, current, newEntity, replayToSource); } -bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType ¤t, ApplicationDomain::ApplicationDomainType newEntity, bool replayToSource) +bool EntityStore::modify(const QByteArray &type, const ApplicationDomainType ¤t, ApplicationDomainType newEntity, bool replayToSource) { SinkTraceCtx(d->logCtx) << "Modified entity: " << newEntity; @@ -321,7 +321,7 @@ bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::Applic return true; } -bool EntityStore::remove(const QByteArray &type, const Sink::ApplicationDomain::ApplicationDomainType ¤t, bool replayToSource) +bool EntityStore::remove(const QByteArray &type, const ApplicationDomainType ¤t, bool replayToSource) { const auto uid = current.identifier(); if (!exists(type, uid)) { @@ -398,7 +398,7 @@ bool EntityStore::cleanupRevisions(qint64 revision) Q_ASSERT(d->exists()); bool implicitTransaction = false; if (!d->transaction) { - startTransaction(Sink::Storage::DataStore::ReadWrite); + startTransaction(DataStore::ReadWrite); Q_ASSERT(d->transaction); implicitTransaction = true; } @@ -492,7 +492,7 @@ void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, cons [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Error during query: " << error.message << uid; }); } -void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback) +void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback) { readLatest(type, uid, [&](const QByteArray &uid, const EntityBuffer &buffer) { //TODO cache max revision for the duration of the transaction. @@ -500,7 +500,7 @@ void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, cons }); } -void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback) +void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback) { readLatest(type, uid, [&](const QByteArray &uid, const EntityBuffer &buffer) { //TODO cache max revision for the duration of the transaction. @@ -510,8 +510,8 @@ void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, cons ApplicationDomain::ApplicationDomainType EntityStore::readLatest(const QByteArray &type, const QByteArray &uid) { - ApplicationDomain::ApplicationDomainType dt; - readLatest(type, uid, [&](const ApplicationDomain::ApplicationDomainType &entity) { + ApplicationDomainType dt; + readLatest(type, uid, [&](const ApplicationDomainType &entity) { dt = *ApplicationDomainType::getInMemoryRepresentation(entity, entity.availableProperties()); }); return dt; @@ -528,7 +528,7 @@ void EntityStore::readEntity(const QByteArray &type, const QByteArray &key, cons [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Error during query: " << error.message << key; }); } -void EntityStore::readEntity(const QByteArray &type, const QByteArray &uid, const std::function callback) +void EntityStore::readEntity(const QByteArray &type, const QByteArray &uid, const std::function callback) { readEntity(type, uid, [&](const QByteArray &uid, const EntityBuffer &buffer) { callback(d->createApplicationDomainType(type, uid, DataStore::maxRevision(d->getTransaction()), buffer)); @@ -537,15 +537,15 @@ void EntityStore::readEntity(const QByteArray &type, const QByteArray &uid, cons ApplicationDomain::ApplicationDomainType EntityStore::readEntity(const QByteArray &type, const QByteArray &uid) { - ApplicationDomain::ApplicationDomainType dt; - readEntity(type, uid, [&](const ApplicationDomain::ApplicationDomainType &entity) { + ApplicationDomainType dt; + readEntity(type, uid, [&](const ApplicationDomainType &entity) { dt = *ApplicationDomainType::getInMemoryRepresentation(entity, entity.availableProperties()); }); return dt; } -void EntityStore::readAll(const QByteArray &type, const std::function &callback) +void EntityStore::readAll(const QByteArray &type, const std::function &callback) { readAllUids(type, [&] (const QByteArray &uid) { readLatest(type, uid, callback); @@ -580,17 +580,17 @@ void EntityStore::readPrevious(const QByteArray &type, const QByteArray &uid, qi qint64 latestRevision = 0; db.scan(uid, [&latestRevision, revision](const QByteArray &key, const QByteArray &) -> bool { - const auto foundRevision = Sink::Storage::DataStore::revisionFromKey(key); + const auto foundRevision = DataStore::revisionFromKey(key); if (foundRevision < revision && foundRevision > latestRevision) { latestRevision = foundRevision; } return true; }, - [&](const Sink::Storage::DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to read current value from storage: " << error.message; }, true); - readEntity(type, Sink::Storage::DataStore::assembleKey(uid, latestRevision), callback); + [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to read current value from storage: " << error.message; }, true); + readEntity(type, DataStore::assembleKey(uid, latestRevision), callback); } -void EntityStore::readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision, const std::function callback) +void EntityStore::readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision, const std::function callback) { readPrevious(type, uid, revision, [&](const QByteArray &uid, const EntityBuffer &buffer) { callback(d->createApplicationDomainType(type, uid, DataStore::maxRevision(d->getTransaction()), buffer)); @@ -599,8 +599,8 @@ void EntityStore::readPrevious(const QByteArray &type, const QByteArray &uid, qi ApplicationDomain::ApplicationDomainType EntityStore::readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision) { - ApplicationDomain::ApplicationDomainType dt; - readPrevious(type, uid, revision, [&](const ApplicationDomain::ApplicationDomainType &entity) { + ApplicationDomainType dt; + readPrevious(type, uid, revision, [&](const ApplicationDomainType &entity) { dt = *ApplicationDomainType::getInMemoryRepresentation(entity, entity.availableProperties()); }); return dt; diff --git a/common/storage/entitystore.h b/common/storage/entitystore.h index c89c095..d79a0b5 100644 --- a/common/storage/entitystore.h +++ b/common/storage/entitystore.h @@ -44,12 +44,12 @@ public: void initialize(); //Only the pipeline may call the following functions outside of tests - bool add(const QByteArray &type, ApplicationDomain::ApplicationDomainType newEntity, bool replayToSource); - bool modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions, bool replayToSource); - bool modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType ¤t, ApplicationDomain::ApplicationDomainType newEntity, bool replayToSource); - bool remove(const QByteArray &type, const ApplicationDomain::ApplicationDomainType ¤t, bool replayToSource); + bool add(const QByteArray &type, ApplicationDomainType newEntity, bool replayToSource); + bool modify(const QByteArray &type, const ApplicationDomainType &diff, const QByteArrayList &deletions, bool replayToSource); + bool modify(const QByteArray &type, const ApplicationDomainType ¤t, ApplicationDomainType newEntity, bool replayToSource); + bool remove(const QByteArray &type, const ApplicationDomainType ¤t, bool replayToSource); bool cleanupRevisions(qint64 revision); - ApplicationDomain::ApplicationDomainType applyDiff(const QByteArray &type, const ApplicationDomain::ApplicationDomainType ¤t, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions) const; + ApplicationDomainType applyDiff(const QByteArray &type, const ApplicationDomainType ¤t, const ApplicationDomainType &diff, const QByteArrayList &deletions) const; void startTransaction(Sink::Storage::DataStore::AccessMode); void commitTransaction(); @@ -68,12 +68,12 @@ public: ///Returns the uid and buffer. Note that the memory only remains valid until the next operation or transaction end. void readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback); ///Returns an entity. Note that the memory only remains valid until the next operation or transaction end. - void readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback); + void readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback); ///Returns an entity and operation. Note that the memory only remains valid until the next operation or transaction end. - void readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback); + void readLatest(const QByteArray &type, const QByteArray &uid, const std::function callback); ///Returns a copy - ApplicationDomain::ApplicationDomainType readLatest(const QByteArray &type, const QByteArray &uid); + ApplicationDomainType readLatest(const QByteArray &type, const QByteArray &uid); template T readLatest(const QByteArray &uid) { @@ -83,9 +83,9 @@ public: ///Returns the uid and buffer. Note that the memory only remains valid until the next operation or transaction end. void readEntity(const QByteArray &type, const QByteArray &uid, const std::function callback); ///Returns an entity. Note that the memory only remains valid until the next operation or transaction end. - void readEntity(const QByteArray &type, const QByteArray &uid, const std::function callback); + void readEntity(const QByteArray &type, const QByteArray &uid, const std::function callback); ///Returns a copy - ApplicationDomain::ApplicationDomainType readEntity(const QByteArray &type, const QByteArray &key); + ApplicationDomainType readEntity(const QByteArray &type, const QByteArray &key); template T readEntity(const QByteArray &key) { @@ -94,9 +94,9 @@ public: void readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision, const std::function callback); - void readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision, const std::function callback); + void readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision, const std::function callback); ///Returns a copy - ApplicationDomain::ApplicationDomainType readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision); + ApplicationDomainType readPrevious(const QByteArray &type, const QByteArray &uid, qint64 revision); template T readPrevious(const QByteArray &uid, qint64 revision) { @@ -105,11 +105,11 @@ public: void readAllUids(const QByteArray &type, const std::function callback); - void readAll(const QByteArray &type, const std::function &callback); + void readAll(const QByteArray &type, const std::function &callback); template void readAll(const std::function &callback) { - return readAll(ApplicationDomain::getTypeName(), [&](const ApplicationDomain::ApplicationDomainType &entity) { + return readAll(ApplicationDomain::getTypeName(), [&](const ApplicationDomainType &entity) { callback(T(entity)); }); } @@ -131,7 +131,7 @@ private: * Remove any old revisions of the same entity up until @param revision */ void cleanupEntityRevisionsUntil(qint64 revision); - void copyBlobs(ApplicationDomain::ApplicationDomainType &entity, qint64 newRevision); + void copyBlobs(ApplicationDomainType &entity, qint64 newRevision); class Private; const QSharedPointer d; }; -- cgit v1.2.3