add vid to the result struct in order to sort it afterwards

Author: Zoran Cvetkov

graph/src/blockchain/block_stream.rs

@@ -438,6 +438,7 @@ pub struct EntityWithType {
     pub entity_op: EntitySubgraphOperation,
     pub entity_type: EntityType,
     pub entity: Entity,
+    pub vid: i64,
 }
 
 async fn get_entities_for_range(

store/postgres/src/relational.rs

@@ -550,10 +550,12 @@ impl Layout {
             let block = ede.block_number;
             let entity_type = e.entity_type(&self.input_schema);
             let entity = e.deserialize_with_layout::<Entity>(self, None)?;
+            let vid = ede.vid;
             let ewt = EntityWithType {
                 entity_op,
                 entity_type,
                 entity,
+                vid,
             };
             Ok((ewt, block))
         };
@@ -609,6 +611,12 @@ impl Layout {
                 }
             };
         }
+
+        // sort the elements in each blocks bucket by vid
+        for (_, vec) in &mut entities {
+            vec.sort_by(|a, b| a.vid.cmp(&b.vid));
+        }
+
         Ok(entities)
     }
 

store/postgres/src/relational_queries.rs

@@ -568,6 +568,8 @@ pub struct EntityDataExt {
     pub block_number: i32,
     #[diesel(sql_type = Text)]
     pub id: String,
+    #[diesel(sql_type = BigInt)]
+    pub vid: i64,
 }
 
 impl Ord for EntityDataExt {
@@ -2068,7 +2070,7 @@ impl<'a> QueryFragment<Pg> for FindRangeQuery<'a> {
                 } else {
                     self.mut_range.compare_column(&mut out)
                 }
-                out.push_sql("as block_number, id\n");
+                out.push_sql("as block_number, id, vid\n");
                 out.push_sql("  from ");
                 out.push_sql(table.qualified_name.as_str());
                 out.push_sql(" e\n  where");