proper return type

Author: Zoran Cvetkov

graph/src/components/store/mod.rs

@@ -1043,7 +1043,7 @@ impl ReadStore for EmptyStore {
         &self,
         _entity_type: &EntityType,
         _block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         Ok(BTreeMap::new())
     }
 

graph/src/components/store/traits.rs

@@ -233,7 +233,7 @@ pub trait ReadStore: Send + Sync + 'static {
         &self,
         entity_type: &EntityType,
         block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError>;
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError>;
 
     /// Reverse lookup
     fn get_derived(
@@ -261,7 +261,7 @@ impl<T: ?Sized + ReadStore> ReadStore for Arc<T> {
         &self,
         entity_type: &EntityType,
         block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         (**self).get_range(entity_type, block_range)
     }
 

store/postgres/src/deployment_store.rs

@@ -1061,7 +1061,7 @@ impl DeploymentStore {
         site: Arc<Site>,
         entity_type: &EntityType,
         block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         let mut conn = self.get_conn()?;
         let layout = self.layout(&mut conn, site)?;
         layout.find_range(&mut conn, entity_type, block_range)

store/postgres/src/relational.rs

@@ -520,17 +520,22 @@ impl Layout {
         conn: &mut PgConnection,
         entity_type: &EntityType,
         block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         let table = self.table_for_entity(entity_type)?;
-        let mut entities: BTreeMap<BlockNumber, Entity> = BTreeMap::new();
+        let mut entities: BTreeMap<BlockNumber, Vec<Entity>> = BTreeMap::new();
         if let Some(vec) = FindRangeQuery::new(table.as_ref(), block_range)
             .get_results::<EntityData>(conn)
             .optional()?
         {
             for e in vec {
                 let block = e.clone().deserialize_block_number::<Entity>()?;
                 let en = e.deserialize_with_layout::<Entity>(self, None)?;
-                entities.insert(block, en);
+                match entities.get_mut(&block) {
+                    Some(vec) => vec.push(en),
+                    None => {
+                        let _ = entities.insert(block, vec![en]);
+                    }
+                };
             }
         }
         Ok(entities)

store/postgres/src/writable.rs

@@ -356,7 +356,7 @@ impl SyncStore {
         &self,
         entity_type: &EntityType,
         block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         retry::forever(&self.logger, "get_range", || {
             self.writable
                 .get_range(self.site.cheap_clone(), entity_type, block_range.clone())
@@ -1232,7 +1232,7 @@ impl Queue {
         &self,
         entity_type: &EntityType,
         block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         // TODO: implemet read from the queue
         self.store.get_range(entity_type, block_range)
     }
@@ -1453,7 +1453,7 @@ impl Writer {
         &self,
         entity_type: &EntityType,
         block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         match self {
             Writer::Sync(store) => store.get_range(entity_type, block_range),
             Writer::Async { queue, .. } => queue.get_range(entity_type, block_range),
@@ -1592,7 +1592,7 @@ impl ReadStore for WritableStore {
         &self,
         entity_type: &EntityType,
         block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         self.writer.get_range(entity_type, block_range)
     }
 

store/test-store/tests/graph/entity_cache.rs

@@ -71,7 +71,7 @@ impl ReadStore for MockStore {
         &self,
         _entity_type: &EntityType,
         _block_range: Range<u32>,
-    ) -> Result<BTreeMap<BlockNumber, Entity>, StoreError> {
+    ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         todo!()
     }