Refactored the query part of the entity reader into DataStoreQuery.

DataStoreQuery now encapsulates the low-level query that operates
directly on the storage. It no longer has access to the resource
buffers, and is instantiated by the type implementation, so we can
specialize the query alogorithm per type, but not per resource.

This will allow us to implement the threading queries for the mailtype.

1 files changed, 13 insertions, 1 deletions

diff --git a/common/entitybuffer.cpp b/common/entitybuffer.cpp
index 950bc46..32583cc 100644
--- a/common/entitybuffer.cpp
+++ b/common/entitybuffer.cpp
@@ -26,7 +26,7 @@ bool EntityBuffer::isValid() const
     return mEntity;
 }
 
-const Sink::Entity &EntityBuffer::entity()
+const Sink::Entity &EntityBuffer::entity() const
 {
     Q_ASSERT(mEntity);
     return *mEntity;
@@ -84,3 +84,15 @@ void EntityBuffer::assembleEntityBuffer(
     auto entity = Sink::CreateEntity(fbb, metadata, resource, local);
     Sink::FinishEntityBuffer(fbb, entity);
 }
+
+Sink::Operation EntityBuffer::operation() const
+{
+    const auto metadataBuffer = readBuffer<Sink::Metadata>(mEntity->metadata());
+    return metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation;
+}
+
+qint64 EntityBuffer::revision() const
+{
+    const auto metadataBuffer = readBuffer<Sink::Metadata>(mEntity->metadata());
+    return metadataBuffer ? metadataBuffer->revision() : -1;
+}