Added the flush command.

Instead of trying to actually flush queues, we send a special command
through the same queues as the other commands and can thus guarantee
that the respective commands have been processed without blocking
anything.

1 files changed, 16 insertions, 5 deletions

diff --git a/common/synchronizer.h b/common/synchronizer.h
index 4d5bdd5..99d4877 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -45,6 +45,7 @@ public:
 
     void setup(const std::function<void(int commandId, const QByteArray &data)> &enqueueCommandCallback, MessageQueue &messageQueue);
     KAsync::Job<void> synchronize(const Sink::QueryBase &query);
+    void flush(int commandId, const QByteArray &flushId);
 
     //Read only access to main storage
     Storage::EntityStore &store();
@@ -57,6 +58,9 @@ public:
 
     bool allChangesReplayed() Q_DECL_OVERRIDE;
 
+signals:
+    void notify(Notification);
+
 public slots:
     virtual void revisionChanged() Q_DECL_OVERRIDE;
 
@@ -115,23 +119,30 @@ protected:
     struct SyncRequest {
         enum RequestType {
             Synchronization,
-            ChangeReplay
+            ChangeReplay,
+            Flush
         };
 
         SyncRequest(const Sink::QueryBase &q)
-            : flushQueue(false),
-            requestType(Synchronization),
+            : requestType(Synchronization),
             query(q)
         {
         }
 
         SyncRequest(RequestType type)
-            : flushQueue(false),
+            : requestType(type)
+        {
+        }
+
+        SyncRequest(RequestType type, int flushType_, const QByteArray &flushId_)
+            : flushType(flushType_),
+            flushId(flushId_),
             requestType(type)
         {
         }
 
-        bool flushQueue;
+        int flushType = 0;
+        QByteArray flushId;
         RequestType requestType;
         Sink::QueryBase query;
     };