From 237b9ae4113e7a9f489632296941becb71afdb45 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sun, 16 Oct 2016 14:55:20 +0200 Subject: Refactor how the storage is used. This is the initial refactoring to improve how we deal with the storage. It does a couple of things: * Rename Sink::Storage to Sink::Storage::DataStore to free up the Sink::Storage namespace * Introduce a Sink::ResourceContext to have a single object that can be passed around containing everything that is necessary to operate on a resource. This is a lot better than the multiple separate parameters that we used to pass around all over the place, while still allowing for dependency injection for tests. * Tie storage access together using the new EntityStore that directly works with ApplicationDomainTypes. This gives us a central place where main storage, indexes and buffer adaptors are tied together, which will also give us a place to implement external indexes, such as a fulltextindex using xapian. * Use ApplicationDomainTypes as the default way to pass around entities. Instead of using various ways to pass around entities (buffers, buffer adaptors, ApplicationDomainTypes), only use a single way. The old approach was confusing, and was only done as: * optimization; really shouldn't be necessary and otherwise I'm sure we can find better ways to optimize ApplicationDomainType itself. * a way to account for entities that have multiple buffers, a concept that I no longer deem relevant. While this commit does the bulk of the work to get there, the following commits will refactor more stuff to get things back to normal. --- common/index.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'common/index.cpp') diff --git a/common/index.cpp b/common/index.cpp index beed45c..c864e77 100644 --- a/common/index.cpp +++ b/common/index.cpp @@ -4,15 +4,15 @@ SINK_DEBUG_AREA("index") -Index::Index(const QString &storageRoot, const QString &name, Sink::Storage::AccessMode mode) - : mTransaction(Sink::Storage(storageRoot, name, mode).createTransaction(mode)), - mDb(mTransaction.openDatabase(name.toLatin1(), std::function(), true)), +Index::Index(const QString &storageRoot, const QString &name, Sink::Storage::DataStore::AccessMode mode) + : mTransaction(Sink::Storage::DataStore(storageRoot, name, mode).createTransaction(mode)), + mDb(mTransaction.openDatabase(name.toLatin1(), std::function(), true)), mName(name) { } -Index::Index(const QByteArray &name, Sink::Storage::Transaction &transaction) - : mDb(transaction.openDatabase(name, std::function(), true)), mName(name) +Index::Index(const QByteArray &name, Sink::Storage::DataStore::Transaction &transaction) + : mDb(transaction.openDatabase(name, std::function(), true)), mName(name) { } @@ -33,7 +33,7 @@ void Index::lookup(const QByteArray &key, const std::function