diff options
Diffstat (limited to 'common/datastorequery.cpp')
-rw-r--r-- | common/datastorequery.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp index 0ba62eb..92b2789 100644 --- a/common/datastorequery.cpp +++ b/common/datastorequery.cpp | |||
@@ -271,7 +271,7 @@ public: | |||
271 | 271 | ||
272 | struct ReductionResult { | 272 | struct ReductionResult { |
273 | Identifier selection; | 273 | Identifier selection; |
274 | QVector<QByteArray> aggregateIds; | 274 | QVector<Identifier> aggregateIds; |
275 | QMap<QByteArray, QVariant> aggregateValues; | 275 | QMap<QByteArray, QVariant> aggregateValues; |
276 | }; | 276 | }; |
277 | 277 | ||
@@ -284,14 +284,14 @@ public: | |||
284 | for (auto &aggregator : mAggregators) { | 284 | for (auto &aggregator : mAggregators) { |
285 | aggregator.reset(); | 285 | aggregator.reset(); |
286 | } | 286 | } |
287 | QVector<QByteArray> reducedAndFilteredResults; | 287 | QVector<Identifier> reducedAndFilteredResults; |
288 | for (const auto &r : results) { | 288 | for (const auto &r : results) { |
289 | readEntity(r, [&, this](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation operation) { | 289 | readEntity(r, [&, this](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation operation) { |
290 | //We need to apply all property filters that we have until the reduction, because the index lookup was unfiltered. | 290 | //We need to apply all property filters that we have until the reduction, because the index lookup was unfiltered. |
291 | if (!matchesFilter(entity)) { | 291 | if (!matchesFilter(entity)) { |
292 | return; | 292 | return; |
293 | } | 293 | } |
294 | reducedAndFilteredResults << r.toDisplayByteArray(); | 294 | reducedAndFilteredResults << r; |
295 | Q_ASSERT(operation != Sink::Operation_Removal); | 295 | Q_ASSERT(operation != Sink::Operation_Removal); |
296 | for (auto &aggregator : mAggregators) { | 296 | for (auto &aggregator : mAggregators) { |
297 | if (!aggregator.property.isEmpty()) { | 297 | if (!aggregator.property.isEmpty()) { |