summaryrefslogtreecommitdiffstats
path: root/common/queryrunner.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2016-02-01 15:18:13 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2016-02-01 15:18:13 +0100
commit9809045a2a71cf509857a762fac62e81c25de856 (patch)
treeb74270913a41f9d9f3d243f7c8cc127dbe0e3c00 /common/queryrunner.cpp
parent4aa007e5cf59288e7d548ea3f613a10ac0a6057e (diff)
downloadsink-9809045a2a71cf509857a762fac62e81c25de856.tar.gz
sink-9809045a2a71cf509857a762fac62e81c25de856.zip
Centralized main database name
Diffstat (limited to 'common/queryrunner.cpp')
-rw-r--r--common/queryrunner.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 25d69b1..b49a3e0 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -129,7 +129,7 @@ static inline ResultSet fullScan(const Sink::Storage::Transaction &transaction,
129{ 129{
130 //TODO use a result set with an iterator, to read values on demand 130 //TODO use a result set with an iterator, to read values on demand
131 QVector<QByteArray> keys; 131 QVector<QByteArray> keys;
132 transaction.openDatabase(bufferType + ".main").scan(QByteArray(), [&](const QByteArray &key, const QByteArray &value) -> bool { 132 Storage::mainDatabase(transaction, bufferType).scan(QByteArray(), [&](const QByteArray &key, const QByteArray &value) -> bool {
133 //Skip internals 133 //Skip internals
134 if (Sink::Storage::isInternalKey(key)) { 134 if (Sink::Storage::isInternalKey(key)) {
135 return true; 135 return true;
@@ -319,7 +319,7 @@ qint64 QueryWorker<DomainType>::load(const Sink::Query &query, const std::functi
319 Warning() << "Error during query: " << error.store << error.message; 319 Warning() << "Error during query: " << error.store << error.message;
320 }); 320 });
321 auto transaction = storage.createTransaction(Sink::Storage::ReadOnly); 321 auto transaction = storage.createTransaction(Sink::Storage::ReadOnly);
322 auto db = transaction.openDatabase(mBufferType + ".main"); 322 auto db = Storage::mainDatabase(transaction, mBufferType);
323 323
324 QSet<QByteArray> remainingFilters; 324 QSet<QByteArray> remainingFilters;
325 auto resultSet = baseSetRetriever(transaction, remainingFilters); 325 auto resultSet = baseSetRetriever(transaction, remainingFilters);