summaryrefslogtreecommitdiffstats
path: root/tests/hawd/dataset.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2016-10-16 14:55:20 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2016-10-21 09:02:21 +0200
commit237b9ae4113e7a9f489632296941becb71afdb45 (patch)
tree01cde58f495944f01cad9d282391d4efd2897141 /tests/hawd/dataset.cpp
parent95d11bf0be98a4e3c08502fe23417b800233ce14 (diff)
downloadsink-237b9ae4113e7a9f489632296941becb71afdb45.tar.gz
sink-237b9ae4113e7a9f489632296941becb71afdb45.zip
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.
Diffstat (limited to 'tests/hawd/dataset.cpp')
-rw-r--r--tests/hawd/dataset.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/hawd/dataset.cpp b/tests/hawd/dataset.cpp
index c023f31..fb2d7e6 100644
--- a/tests/hawd/dataset.cpp
+++ b/tests/hawd/dataset.cpp
@@ -215,7 +215,7 @@ QString Dataset::Row::toString(const QStringList &cols, int standardCols, const
215 215
216Dataset::Dataset(const QString &name, const State &state) 216Dataset::Dataset(const QString &name, const State &state)
217 : m_definition(state.datasetDefinition(name)), 217 : m_definition(state.datasetDefinition(name)),
218 m_storage(state.resultsPath(), name, Sink::Storage::ReadWrite), 218 m_storage(state.resultsPath(), name, Sink::Storage::DataStore::ReadWrite),
219 m_transaction(m_storage.createTransaction()), 219 m_transaction(m_storage.createTransaction()),
220 m_commitHash(state.commitHash()) 220 m_commitHash(state.commitHash())
221{ 221{
@@ -270,13 +270,13 @@ void Dataset::eachRow(const std::function<void(const Row &row)> &resultHandler)
270 resultHandler(row); 270 resultHandler(row);
271 return true; 271 return true;
272 }, 272 },
273 Sink::Storage::basicErrorHandler()); 273 Sink::Storage::DataStore::basicErrorHandler());
274} 274}
275 275
276Dataset::Row Dataset::row(qint64 key) 276Dataset::Row Dataset::row(qint64 key)
277{ 277{
278 if (key < 1) { 278 if (key < 1) {
279 Row row(*this, Sink::Storage::maxRevision(m_transaction)); 279 Row row(*this, Sink::Storage::DataStore::maxRevision(m_transaction));
280 row.setCommitHash(m_commitHash); 280 row.setCommitHash(m_commitHash);
281 return row; 281 return row;
282 } 282 }
@@ -287,7 +287,7 @@ Dataset::Row Dataset::row(qint64 key)
287 row.fromBinary(value); 287 row.fromBinary(value);
288 return true; 288 return true;
289 }, 289 },
290 Sink::Storage::basicErrorHandler() 290 Sink::Storage::DataStore::basicErrorHandler()
291 ); 291 );
292 return row; 292 return row;
293} 293}