diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-08-23 23:57:09 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-08-23 23:57:09 +0200 |
commit | 9c3d000e11d3b1fc6c6c205fe9e7ea26c11092c6 (patch) | |
tree | 7cf47fd2334487a0e4f2bfef73c8e09e165dc4cc /common/pipeline.cpp | |
parent | ae0255bf8eb913004082278af27d69047503ea71 (diff) | |
download | sink-9c3d000e11d3b1fc6c6c205fe9e7ea26c11092c6.tar.gz sink-9c3d000e11d3b1fc6c6c205fe9e7ea26c11092c6.zip |
Removed convenience API
Diffstat (limited to 'common/pipeline.cpp')
-rw-r--r-- | common/pipeline.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/pipeline.cpp b/common/pipeline.cpp index c5e36ee..8ef6187 100644 --- a/common/pipeline.cpp +++ b/common/pipeline.cpp | |||
@@ -165,7 +165,7 @@ KAsync::Job<void> Pipeline::newEntity(void const *command, size_t size) | |||
165 | flatbuffers::FlatBufferBuilder fbb; | 165 | flatbuffers::FlatBufferBuilder fbb; |
166 | EntityBuffer::assembleEntityBuffer(fbb, metadataFbb.GetBufferPointer(), metadataFbb.GetSize(), entity->resource()->Data(), entity->resource()->size(), entity->local()->Data(), entity->local()->size()); | 166 | EntityBuffer::assembleEntityBuffer(fbb, metadataFbb.GetBufferPointer(), metadataFbb.GetSize(), entity->resource()->Data(), entity->resource()->size(), entity->local()->Data(), entity->local()->size()); |
167 | 167 | ||
168 | d->transaction.write(key, QByteArray::fromRawData(reinterpret_cast<char const *>(fbb.GetBufferPointer()), fbb.GetSize())); | 168 | d->transaction.openDatabase().write(key, QByteArray::fromRawData(reinterpret_cast<char const *>(fbb.GetBufferPointer()), fbb.GetSize())); |
169 | Akonadi2::Storage::setMaxRevision(d->transaction, newRevision); | 169 | Akonadi2::Storage::setMaxRevision(d->transaction, newRevision); |
170 | Log() << "Pipeline: wrote entity: " << key << newRevision; | 170 | Log() << "Pipeline: wrote entity: " << key << newRevision; |
171 | 171 | ||
@@ -220,7 +220,7 @@ KAsync::Job<void> Pipeline::modifiedEntity(void const *command, size_t size) | |||
220 | auto diff = adaptorFactory->createAdaptor(*diffEntity); | 220 | auto diff = adaptorFactory->createAdaptor(*diffEntity); |
221 | 221 | ||
222 | QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor> current; | 222 | QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor> current; |
223 | storage().createTransaction(Akonadi2::Storage::ReadOnly).scan(key, [¤t, adaptorFactory](const QByteArray &key, const QByteArray &data) -> bool { | 223 | storage().createTransaction(Akonadi2::Storage::ReadOnly).openDatabase().scan(key, [¤t, adaptorFactory](const QByteArray &key, const QByteArray &data) -> bool { |
224 | Akonadi2::EntityBuffer buffer(const_cast<const char *>(data.data()), data.size()); | 224 | Akonadi2::EntityBuffer buffer(const_cast<const char *>(data.data()), data.size()); |
225 | if (!buffer.isValid()) { | 225 | if (!buffer.isValid()) { |
226 | Warning() << "Read invalid buffer from disk"; | 226 | Warning() << "Read invalid buffer from disk"; |
@@ -265,7 +265,7 @@ KAsync::Job<void> Pipeline::modifiedEntity(void const *command, size_t size) | |||
265 | adaptorFactory->createBuffer(*newObject, fbb, metadataFbb.GetBufferPointer(), metadataFbb.GetSize()); | 265 | adaptorFactory->createBuffer(*newObject, fbb, metadataFbb.GetBufferPointer(), metadataFbb.GetSize()); |
266 | 266 | ||
267 | //TODO don't overwrite the old entry, but instead store a new revision | 267 | //TODO don't overwrite the old entry, but instead store a new revision |
268 | d->transaction.write(key, QByteArray::fromRawData(reinterpret_cast<char const *>(fbb.GetBufferPointer()), fbb.GetSize())); | 268 | d->transaction.openDatabase().write(key, QByteArray::fromRawData(reinterpret_cast<char const *>(fbb.GetBufferPointer()), fbb.GetSize())); |
269 | Akonadi2::Storage::setMaxRevision(d->transaction, newRevision); | 269 | Akonadi2::Storage::setMaxRevision(d->transaction, newRevision); |
270 | 270 | ||
271 | return KAsync::start<void>([this, key, entityType, newRevision](KAsync::Future<void> &future) { | 271 | return KAsync::start<void>([this, key, entityType, newRevision](KAsync::Future<void> &future) { |
@@ -296,7 +296,7 @@ KAsync::Job<void> Pipeline::deletedEntity(void const *command, size_t size) | |||
296 | const QByteArray key = QByteArray(reinterpret_cast<char const*>(deleteEntity->entityId()->Data()), deleteEntity->entityId()->size()); | 296 | const QByteArray key = QByteArray(reinterpret_cast<char const*>(deleteEntity->entityId()->Data()), deleteEntity->entityId()->size()); |
297 | 297 | ||
298 | //TODO instead of deleting the entry, a new revision should be created that marks the entity as deleted | 298 | //TODO instead of deleting the entry, a new revision should be created that marks the entity as deleted |
299 | d->transaction.remove(key); | 299 | d->transaction.openDatabase().remove(key); |
300 | Akonadi2::Storage::setMaxRevision(d->transaction, newRevision); | 300 | Akonadi2::Storage::setMaxRevision(d->transaction, newRevision); |
301 | Log() << "Pipeline: deleted entity: "<< newRevision; | 301 | Log() << "Pipeline: deleted entity: "<< newRevision; |
302 | 302 | ||