From b2ad8f785e801a35cadf254d827f56d648be510c Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 22 Dec 2016 18:22:39 +0100 Subject: Introduced Log::Context To have hierarchical debug output we have to pass around something at run-time, there is no reasonable alternative. Log::Context provides the identifier to do just that and largely replaces the debug component idea. --- common/datastorequery.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'common/datastorequery.cpp') diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp index de2d124..2a2f3f5 100644 --- a/common/datastorequery.cpp +++ b/common/datastorequery.cpp @@ -303,7 +303,7 @@ public: }; DataStoreQuery::DataStoreQuery(const Sink::QueryBase &query, const QByteArray &type, EntityStore &store) - : mQuery(query), mType(type), mStore(store) + : mQuery(query), mType(type), mStore(store), mLogCtx(store.logContext().subContext("datastorequery")) { setupQuery(); } @@ -417,7 +417,7 @@ void DataStoreQuery::setupQuery() for (const auto &k : baseFilters.keys()) { const auto comparator = baseFilters.value(k); if (comparator.value.canConvert()) { - SinkTrace() << "Executing subquery for property: " << k; + SinkTraceCtx(mLogCtx) << "Executing subquery for property: " << k; const auto result = executeSubquery(comparator.value.value()); baseFilters.insert(k, Query::Comparator(QVariant::fromValue(result), Query::Comparator::In)); } @@ -485,20 +485,20 @@ QVector DataStoreQuery::loadIncrementalResultSet(qint64 baseRevision mStore.readRevisions(baseRevision, mType, [&](const QByteArray &key) { changedKeys << key; }); - SinkTrace() << "Finished reading incremental result set:" << *revisionCounter; + SinkTraceCtx(mLogCtx) << "Finished reading incremental result set:" << *revisionCounter; return changedKeys; } ResultSet DataStoreQuery::update(qint64 baseRevision) { - SinkTrace() << "Executing query update"; + SinkTraceCtx(mLogCtx) << "Executing query update"; auto incrementalResultSet = loadIncrementalResultSet(baseRevision); - SinkTrace() << "Changed: " << incrementalResultSet; + SinkTraceCtx(mLogCtx) << "Changed: " << incrementalResultSet; mSource->add(incrementalResultSet); ResultSet::ValueGenerator generator = [this](const ResultSet::Callback &callback) -> bool { if (mCollector->next([this, callback](const ResultSet::Result &result) { - SinkTrace() << "Got incremental result: " << result.entity.identifier() << result.operation; + SinkTraceCtx(mLogCtx) << "Got incremental result: " << result.entity.identifier() << result.operation; callback(result); })) { @@ -512,12 +512,12 @@ ResultSet DataStoreQuery::update(qint64 baseRevision) ResultSet DataStoreQuery::execute() { - SinkTrace() << "Executing query"; + SinkTraceCtx(mLogCtx) << "Executing query"; ResultSet::ValueGenerator generator = [this](const ResultSet::Callback &callback) -> bool { if (mCollector->next([this, callback](const ResultSet::Result &result) { if (result.operation != Sink::Operation_Removal) { - SinkTrace() << "Got initial result: " << result.entity.identifier() << result.operation; + SinkTraceCtx(mLogCtx) << "Got initial result: " << result.entity.identifier() << result.operation; callback(ResultSet::Result{result.entity, Sink::Operation_Creation, result.aggregateValues}); } })) -- cgit v1.2.3