From b6981d94fb5fb12024738b639f9e389dd04578da Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 22 Nov 2016 10:26:11 +0100
Subject: Process change replays as part of the synchronization queue

---
 common/synchronizer.cpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'common/synchronizer.cpp')

diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 10acefc..8010689 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -274,10 +274,14 @@ KAsync::Job<void> Synchronizer::processSyncQueue()
     auto job = KAsync::null<void>();
     while (!mSyncRequestQueue.isEmpty()) {
         auto request = mSyncRequestQueue.takeFirst();
-        job = job.then(synchronizeWithSource(request.query)).syncThen<void>([this] {
-            //Commit after every request, so implementations only have to commit more if they add a lot of data.
-            commit();
-        });
+        if (request.requestType == Synchronizer::SyncRequest::Synchronization) {
+            job = job.then(synchronizeWithSource(request.query)).syncThen<void>([this] {
+                //Commit after every request, so implementations only have to commit more if they add a lot of data.
+                commit();
+            });
+        } else {
+            job = replayNextRevision();
+        }
     }
     return job.then<void>([this](const KAsync::Error &error) {
         mSyncStore.clear();
@@ -311,6 +315,12 @@ Sink::Storage::DataStore::DataStore::Transaction &Synchronizer::syncTransaction(
     return mSyncTransaction;
 }
 
+void Synchronizer::revisionChanged()
+{
+    mSyncRequestQueue << Synchronizer::SyncRequest{Synchronizer::SyncRequest::ChangeReplay};
+    processSyncQueue().exec();
+}
+
 bool Synchronizer::canReplay(const QByteArray &type, const QByteArray &key, const QByteArray &value)
 {
     Sink::EntityBuffer buffer(value);
@@ -334,7 +344,6 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
     Q_ASSERT(!mSyncStore);
     Q_ASSERT(!mSyncTransaction);
     mEntityStore->startTransaction(Storage::DataStore::ReadOnly);
-    mSyncTransaction = mSyncStorage.createTransaction(Sink::Storage::DataStore::ReadWrite);
 
     const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation;
     const auto uid = Sink::Storage::DataStore::uidFromKey(key);
@@ -345,6 +354,9 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
         oldRemoteId = syncStore().resolveLocalId(type, uid);
         if (oldRemoteId.isEmpty()) {
             SinkWarning() << "Couldn't find the remote id for: " << type << uid;
+            mSyncStore.clear();
+            mSyncTransaction.abort();
+            mEntityStore->abortTransaction();
             return KAsync::error<void>(1, "Couldn't find the remote id.");
         }
     }
-- 
cgit v1.2.3