Maintain the query state instead of using the offset.

Instead of using the offset to skip over old results requires
recalculating them, and resulted in some cases in results being added
multiple times to the model.
By just maintaining the state we can apply the offset directly to the
base-set, and maintain the state in reduction etc. which is necessary to
continue streaming results while making sure we don't report anything
twice.

1 files changed, 1 insertions, 2 deletions

diff --git a/common/queryrunner.h b/common/queryrunner.h
index f5c7ead..5308eac 100644
--- a/common/queryrunner.h
+++ b/common/queryrunner.h
@@ -98,11 +98,10 @@ private:
     QSharedPointer<Sink::ResourceAccessInterface> mResourceAccess;
     QSharedPointer<Sink::ResultProvider<typename DomainType::Ptr>> mResultProvider;
     ResultTransformation mResultTransformation;
-    QHash<QByteArray, qint64> mOffset;
+    QHash<QByteArray, DataStoreQuery::State::Ptr> mQueryState;
     int mBatchSize;
     QObject guard;
     Sink::Log::Context mLogCtx;
-    DataStoreQuery::State::Ptr mQueryState;
     bool mInitialQueryComplete = false;
     bool mQueryInProgress = false;
 };