Use Key API in ResultSet

Summary:
Depends on D14099

Notes:

- Tests pass without many modifications outside of resultset.cpp/.h
- `mGenerator` doesn't seem to be used?

Benchmarks
=========

Run benchmarks:

| Develop                            | D14099                             | This patch                         |
| ---------------------------------- | ---------------------------------- | ---------------------------------- |
| Current Rss usage [kb]: 40700      | Current Rss usage [kb]: 38564      | Current Rss usage [kb]: 39112      |
| Peak Rss usage [kb]: 40700         | Peak Rss usage [kb]: 38564         | Peak Rss usage [kb]: 39112         |
| Rss growth [kb]: 15920             | Rss growth [kb]: 13352             | Rss growth [kb]: 13432             |
| Rss growth per entity [byte]: 3260 | Rss growth per entity [byte]: 2734 | Rss growth per entity [byte]: 2750 |
| Rss without db [kb]: 29736         | Rss without db [kb]: 29248         | Rss without db [kb]: 30100         |
| Percentage peak rss error: 0       | Percentage peak rss error: 0       | Percentage peak rss error: 0       |
| On disk [kb]: 10788                | On disk [kb]: 9140                 | On disk [kb]: 8836                 |
| Buffer size total [kb]: 898        | Buffer size total [kb]: 898        | Buffer size total [kb]: 898        |
| Write amplification: 12.0075       | Write amplification: 10.1732       | Write amplification: 9.83485       |

Test Disk Usage:

| Develop                             | D14099                              | This patch                          |
| ----------------------------------- | ----------------------------------- | ----------------------------------- |
| Free pages: 412                     | Free pages: 309                     | Free pages: 312                     |
| Total pages: 760                    | Total pages: 599                    | Total pages: 603                    |
| Used size: 1425408                  | Used size: 1187840                  | Used size: 1191936                  |
| Calculated key + value size: 856932 | Calculated key + value size: 702866 | Calculated key + value size: 702866 |
| Calculated total db sizes: 970752   | Calculated total db sizes: 954368   | Calculated total db sizes: 933888   |
| Main store on disk: 3112960         | Main store on disk: 2453504         | Main store on disk: 2469888         |
| Total on disk: 3293184              | Total on disk: 2633728              | Total on disk: 2650112              |
| Used size amplification: 1.66339    | Used size amplification: 1.68999    | Used size amplification: 1.69582    |
| Write amplification: 3.63268        | Write amplification: 3.49071        | Write amplification: 3.51402        |

Reviewers: cmollekopf

Reviewed By: cmollekopf

Tags: #sink

Differential Revision: https://phabricator.kde.org/D14289

1 files changed, 3 insertions, 3 deletions

diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp
index aa315c6..52243da 100644
--- a/common/datastorequery.cpp
+++ b/common/datastorequery.cpp
@@ -271,7 +271,7 @@ public:
 
     struct ReductionResult {
         Identifier selection;
-        QVector<QByteArray> aggregateIds;
+        QVector<Identifier> aggregateIds;
         QMap<QByteArray, QVariant> aggregateValues;
     };
 
@@ -284,14 +284,14 @@ public:
         for (auto &aggregator : mAggregators) {
             aggregator.reset();
         }
-        QVector<QByteArray> reducedAndFilteredResults;
+        QVector<Identifier> reducedAndFilteredResults;
         for (const auto &r : results) {
             readEntity(r, [&, this](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation operation) {
                 //We need to apply all property filters that we have until the reduction, because the index lookup was unfiltered.
                 if (!matchesFilter(entity)) {
                     return;
                 }
-                reducedAndFilteredResults << r.toDisplayByteArray();
+                reducedAndFilteredResults << r;
                 Q_ASSERT(operation != Sink::Operation_Removal);
                 for (auto &aggregator : mAggregators) {
                     if (!aggregator.property.isEmpty()) {