summaryrefslogtreecommitdiffstats
path: root/common/pipeline.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-07-03 14:02:27 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-07-03 14:02:27 +0200
commit55fe06979ceebe67553135b43aa47e70d931304b (patch)
tree16b10a744879cc1872d6c07624b59ae64469ddbf /common/pipeline.cpp
parent56fae95f49a1ca8ca614bd9f89b0ea5f872765e9 (diff)
parent288946f1694c2abe1d2c5800c87339d1e8780e4b (diff)
downloadsink-55fe06979ceebe67553135b43aa47e70d931304b.tar.gz
sink-55fe06979ceebe67553135b43aa47e70d931304b.zip
Merge branch 'develop'
Diffstat (limited to 'common/pipeline.cpp')
-rw-r--r--common/pipeline.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index f5cf995..f29c7db 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -283,6 +283,8 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
283 case Preprocessor::DropModification: 283 case Preprocessor::DropModification:
284 SinkTraceCtx(d->logCtx) << "Dropping modification"; 284 SinkTraceCtx(d->logCtx) << "Dropping modification";
285 return KAsync::error<qint64>(0); 285 return KAsync::error<qint64>(0);
286 case Preprocessor::NoAction:
287 case Preprocessor::DeleteEntity:
286 default: 288 default:
287 break; 289 break;
288 } 290 }
@@ -301,8 +303,8 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
301 SinkTraceCtx(d->logCtx) << "Move of " << current.identifier() << "was successfull"; 303 SinkTraceCtx(d->logCtx) << "Move of " << current.identifier() << "was successfull";
302 if (isMove) { 304 if (isMove) {
303 flatbuffers::FlatBufferBuilder fbb; 305 flatbuffers::FlatBufferBuilder fbb;
304 auto entityId = fbb.CreateString(current.identifier()); 306 auto entityId = fbb.CreateString(current.identifier().toStdString());
305 auto type = fbb.CreateString(bufferType); 307 auto type = fbb.CreateString(bufferType.toStdString());
306 auto location = Sink::Commands::CreateDeleteEntity(fbb, current.revision(), entityId, type, true); 308 auto location = Sink::Commands::CreateDeleteEntity(fbb, current.revision(), entityId, type, true);
307 Sink::Commands::FinishDeleteEntityBuffer(fbb, location); 309 Sink::Commands::FinishDeleteEntityBuffer(fbb, location);
308 const auto data = BufferUtils::extractBuffer(fbb); 310 const auto data = BufferUtils::extractBuffer(fbb);
@@ -448,8 +450,8 @@ void Preprocessor::createEntity(const Sink::ApplicationDomain::ApplicationDomain
448 const auto entityBuffer = BufferUtils::extractBuffer(entityFbb); 450 const auto entityBuffer = BufferUtils::extractBuffer(entityFbb);
449 451
450 flatbuffers::FlatBufferBuilder fbb; 452 flatbuffers::FlatBufferBuilder fbb;
451 auto entityId = fbb.CreateString(entity.identifier()); 453 auto entityId = fbb.CreateString(entity.identifier().toStdString());
452 auto type = fbb.CreateString(typeName); 454 auto type = fbb.CreateString(typeName.toStdString());
453 auto delta = Sink::EntityBuffer::appendAsVector(fbb, entityBuffer.constData(), entityBuffer.size()); 455 auto delta = Sink::EntityBuffer::appendAsVector(fbb, entityBuffer.constData(), entityBuffer.size());
454 auto location = Sink::Commands::CreateCreateEntity(fbb, entityId, type, delta); 456 auto location = Sink::Commands::CreateCreateEntity(fbb, entityId, type, delta);
455 Sink::Commands::FinishCreateEntityBuffer(fbb, location); 457 Sink::Commands::FinishCreateEntityBuffer(fbb, location);