Resolve remoteIds during sync

Remote id's need to be resolved while syncing any references.
This is done by the synchronizer by consulting the rid to entity id
mapping. If the referenced entity doesn't exist yet we create a local
id anyways, that we then need to pick up once the actual entity arrives.

5 files changed, 24 insertions, 2 deletions

diff --git a/common/commands/createentity.fbs b/common/commands/createentity.fbs
index 23eeff9..a5bc95c 100644
--- a/common/commands/createentity.fbs
+++ b/common/commands/createentity.fbs
@@ -1,6 +1,7 @@
 namespace Akonadi2.Commands;
 
 table CreateEntity {
+    entityId: string;
     domainType: string;
     delta: [ubyte];
 }
diff --git a/common/index.cpp b/common/index.cpp
index 2fc0fe3..f4de93c 100644
--- a/common/index.cpp
+++ b/common/index.cpp
@@ -38,3 +38,16 @@ void Index::lookup(const QByteArray &key, const std::function<void(const QByteAr
     );
 }
 
+QByteArray Index::lookup(const QByteArray &key)
+{
+    QByteArray result;
+    lookup(key,
+    [&result](const QByteArray &value) {
+        result = value;
+    },
+    [](const Index::Error &error) {
+        qDebug() << "Error while retrieving value" << error.message;
+    });
+    return result;
+}
+
diff --git a/common/index.h b/common/index.h
index 0ca32af..6b06d26 100644
--- a/common/index.h
+++ b/common/index.h
@@ -33,6 +33,7 @@ public:
 
     void lookup(const QByteArray &key, const std::function<void(const QByteArray &value)> &resultHandler,
                                        const std::function<void(const Error &error)> &errorHandler);
+    QByteArray lookup(const QByteArray &key);
 
 private:
     Q_DISABLE_COPY(Index);
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 0ce478b..16d8329 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -150,7 +150,14 @@ KAsync::Job<qint64> Pipeline::newEntity(void const *command, size_t size)
         return KAsync::error<qint64>(0);
     }
 
-    const auto key = QUuid::createUuid().toString().toUtf8();
+    QByteArray key;
+    if (createEntity->entityId()) {
+        key = QByteArray(reinterpret_cast<char const*>(createEntity->entityId()->Data()), createEntity->entityId()->size());
+    }
+    if (key.isEmpty()) {
+        key = QUuid::createUuid().toString().toUtf8();
+    }
+    Q_ASSERT(!key.isEmpty());
     const qint64 newRevision = Akonadi2::Storage::maxRevision(d->transaction) + 1;
 
     //Add metadata buffer
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index be25533..8988032 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -296,7 +296,7 @@ KAsync::Job<void> ResourceAccess::sendCreateCommand(const QByteArray &resourceBu
     //This is the resource buffer type and not the domain type
     auto type = fbb.CreateString(resourceBufferType.constData());
     auto delta = Akonadi2::EntityBuffer::appendAsVector(fbb, buffer.constData(), buffer.size());
-    auto location = Akonadi2::Commands::CreateCreateEntity(fbb, type, delta);
+    auto location = Akonadi2::Commands::CreateCreateEntity(fbb, 0, type, delta);
     Akonadi2::Commands::FinishCreateEntityBuffer(fbb, location);
     open();
     return sendCommand(Akonadi2::Commands::CreateEntityCommand, fbb);