From 664fb0fbfd21a25d1f86938a186f6ec9cea6d882 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 29 Dec 2015 10:01:42 +0100
Subject: Mark commands with whether they need to be replayed

This way we don't have to try to figure out whether a change is coming
from the source already.
---
 common/commands/createentity.fbs | 1 +
 common/commands/deleteentity.fbs | 1 +
 common/commands/modifyentity.fbs | 1 +
 common/metadata.fbs              | 3 +--
 common/pipeline.cpp              | 9 ++++++---
 5 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'common')

diff --git a/common/commands/createentity.fbs b/common/commands/createentity.fbs
index a5bc95c..5358dea 100644
--- a/common/commands/createentity.fbs
+++ b/common/commands/createentity.fbs
@@ -4,6 +4,7 @@ table CreateEntity {
     entityId: string;
     domainType: string;
     delta: [ubyte];
+    replayToSource: bool = true;
 }
 
 root_type CreateEntity;
diff --git a/common/commands/deleteentity.fbs b/common/commands/deleteentity.fbs
index 4f32b54..9f865be 100644
--- a/common/commands/deleteentity.fbs
+++ b/common/commands/deleteentity.fbs
@@ -4,6 +4,7 @@ table DeleteEntity {
     revision: ulong;
     entityId: string;
     domainType: string;
+    replayToSource: bool = true;
 }
 
 root_type DeleteEntity;
diff --git a/common/commands/modifyentity.fbs b/common/commands/modifyentity.fbs
index a59eb9b..03b543f 100644
--- a/common/commands/modifyentity.fbs
+++ b/common/commands/modifyentity.fbs
@@ -6,6 +6,7 @@ table ModifyEntity {
     deletions: [string]; //A list of deleted properties
     domainType: string;
     delta: [ubyte]; //Contains an entity buffer with all changed properties set
+    replayToSource: bool = true;
 }
 
 root_type ModifyEntity;
diff --git a/common/metadata.fbs b/common/metadata.fbs
index 1455238..0a709fe 100644
--- a/common/metadata.fbs
+++ b/common/metadata.fbs
@@ -4,8 +4,7 @@ enum Operation : byte { Creation = 1, Modification, Removal }
 
 table Metadata {
     revision: ulong;
-    processed: bool = true;
-    processingProgress: [string];
+    replayToSource: bool = true;
     operation: Operation = Modification;
 }
 
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index f8b1fb1..06d8114 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -142,6 +142,7 @@ KAsync::Job<qint64> Pipeline::newEntity(void const *command, size_t size)
     }
     auto createEntity = Akonadi2::Commands::GetCreateEntity(command);
 
+    const bool replayToSource = createEntity->replayToSource();
     const QByteArray bufferType = QByteArray(reinterpret_cast<char const*>(createEntity->domainType()->Data()), createEntity->domainType()->size());
     {
         flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(createEntity->delta()->Data()), createEntity->delta()->size());
@@ -175,8 +176,8 @@ KAsync::Job<qint64> Pipeline::newEntity(void const *command, size_t size)
     flatbuffers::FlatBufferBuilder metadataFbb;
     auto metadataBuilder = Akonadi2::MetadataBuilder(metadataFbb);
     metadataBuilder.add_revision(newRevision);
-    metadataBuilder.add_processed(false);
     metadataBuilder.add_operation(Akonadi2::Operation_Creation);
+    metadataBuilder.add_replayToSource(replayToSource);
     auto metadataBuffer = metadataBuilder.Finish();
     Akonadi2::FinishMetadataBuffer(metadataFbb, metadataBuffer);
 
@@ -224,6 +225,7 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
     Q_ASSERT(modifyEntity);
 
     const qint64 baseRevision = modifyEntity->revision();
+    const bool replayToSource = modifyEntity->replayToSource();
     //TODO rename modifyEntity->domainType to bufferType
     const QByteArray bufferType = QByteArray(reinterpret_cast<char const*>(modifyEntity->domainType()->Data()), modifyEntity->domainType()->size());
     const QByteArray key = QByteArray(reinterpret_cast<char const*>(modifyEntity->entityId()->Data()), modifyEntity->entityId()->size());
@@ -291,8 +293,8 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
     flatbuffers::FlatBufferBuilder metadataFbb;
     auto metadataBuilder = Akonadi2::MetadataBuilder(metadataFbb);
     metadataBuilder.add_revision(newRevision);
-    metadataBuilder.add_processed(false);
     metadataBuilder.add_operation(Akonadi2::Operation_Modification);
+    metadataBuilder.add_replayToSource(replayToSource);
     auto metadataBuffer = metadataBuilder.Finish();
     Akonadi2::FinishMetadataBuffer(metadataFbb, metadataBuffer);
 
@@ -329,6 +331,7 @@ KAsync::Job<qint64> Pipeline::deletedEntity(void const *command, size_t size)
     }
     auto deleteEntity = Akonadi2::Commands::GetDeleteEntity(command);
 
+    const bool replayToSource = deleteEntity->replayToSource();
     const QByteArray bufferType = QByteArray(reinterpret_cast<char const*>(deleteEntity->domainType()->Data()), deleteEntity->domainType()->size());
     const QByteArray key = QByteArray(reinterpret_cast<char const*>(deleteEntity->entityId()->Data()), deleteEntity->entityId()->size());
 
@@ -366,8 +369,8 @@ KAsync::Job<qint64> Pipeline::deletedEntity(void const *command, size_t size)
     flatbuffers::FlatBufferBuilder metadataFbb;
     auto metadataBuilder = Akonadi2::MetadataBuilder(metadataFbb);
     metadataBuilder.add_revision(newRevision);
-    metadataBuilder.add_processed(false);
     metadataBuilder.add_operation(Akonadi2::Operation_Removal);
+    metadataBuilder.add_replayToSource(replayToSource);
     auto metadataBuffer = metadataBuilder.Finish();
     Akonadi2::FinishMetadataBuffer(metadataFbb, metadataBuffer);
 
-- 
cgit v1.2.3