generate POI VIDs too

Author: Zoran Cvetkov

graph/src/components/store/entity_cache.rs

@@ -17,6 +17,10 @@ use super::{BlockNumber, DerivedEntityQuery, LoadRelatedRequest, StoreError};
 
 pub type EntityLfuCache = LfuCache<EntityKey, Option<Arc<Entity>>>;
 
+// Number of VIDs that are reserved ourside of the generated ones here.
+// Currently only 1 for POIs is used, but lets reserve a few more.
+const RESERVED_VIDS: u32 = 100;
+
 /// The scope in which the `EntityCache` should perform a `get` operation
 pub enum GetScope {
     /// Get from all previously stored entities in the store
@@ -136,7 +140,7 @@ impl EntityCache {
             schema: store.input_schema(),
             store,
             seq: 0,
-            vid_seq: 0,
+            vid_seq: RESERVED_VIDS,
         }
     }
 
@@ -157,7 +161,7 @@ impl EntityCache {
             schema: store.input_schema(),
             store,
             seq: 0,
-            vid_seq: 0,
+            vid_seq: RESERVED_VIDS,
         }
     }
 

graph/src/data/store/mod.rs

@@ -927,7 +927,7 @@ impl Entity {
     #[cfg(debug_assertions)]
     pub fn vid_or_default(&self) -> i64 {
         self.get("vid")
-            .unwrap_or(&Value::Int8(0))
+            .unwrap_or(&Value::Int8(100))
             .as_int8()
             .expect("the vid is set to a valid value")
     }

runtime/test/src/test.rs

@@ -552,8 +552,8 @@ async fn test_ipfs_map(api_version: Version, json_error_msg: &str) {
     let subgraph_id = "ipfsMap";
 
     // Try it with two valid objects
-    let (str1, thing1) = make_thing("one", "eins", 0);
-    let (str2, thing2) = make_thing("two", "zwei", 0);
+    let (str1, thing1) = make_thing("one", "eins", 100);
+    let (str2, thing2) = make_thing("two", "zwei", 100);
     let ops = run_ipfs_map(
         ipfs.clone(),
         subgraph_id,

store/postgres/src/relational/ddl.rs

@@ -116,7 +116,7 @@ impl Table {
             Ok(cols)
         }
 
-        let vid_type = if self.object.is_poi() || !self.object.is_object_type() {
+        let vid_type = if !self.object.is_object_type() {
             "bigserial"
         } else {
             "bigint"

store/postgres/src/relational_queries.rs

@@ -2541,8 +2541,6 @@ impl<'a> QueryFragment<Pg> for InsertQuery<'a> {
         let out = &mut out;
         out.unsafe_to_cache_prepared();
 
-        let not_poi = !self.table.object.is_poi();
-
         // Construct a query
         //   insert into schema.table(column, ...)
         //   values
@@ -2568,9 +2566,7 @@ impl<'a> QueryFragment<Pg> for InsertQuery<'a> {
             out.push_sql(CAUSALITY_REGION_COLUMN);
         };
 
-        if not_poi {
-            out.push_sql(", vid");
-        }
+        out.push_sql(", vid");
         out.push_sql(") values\n");
 
         for (i, row) in self.rows.iter().enumerate() {
@@ -2588,10 +2584,8 @@ impl<'a> QueryFragment<Pg> for InsertQuery<'a> {
                 out.push_sql(", ");
                 out.push_bind_param::<Integer, _>(&row.causality_region)?;
             };
-            if not_poi {
-                out.push_sql(", ");
-                out.push_bind_param::<BigInt, _>(&row.vid)?;
-            }
+            out.push_sql(", ");
+            out.push_bind_param::<BigInt, _>(&row.vid)?;
             out.push_sql(")");
         }
 
@@ -5089,8 +5083,6 @@ impl<'a> QueryFragment<Pg> for CopyEntityBatchQuery<'a> {
     fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Pg>) -> QueryResult<()> {
         out.unsafe_to_cache_prepared();
 
-        let not_poi = !self.dst.object.is_poi();
-
         // Construct a query
         //   insert into {dst}({columns})
         //   select {columns} from {src}
@@ -5111,9 +5103,7 @@ impl<'a> QueryFragment<Pg> for CopyEntityBatchQuery<'a> {
             out.push_sql(", ");
             out.push_sql(CAUSALITY_REGION_COLUMN);
         };
-        if not_poi {
-            out.push_sql(", vid");
-        }
+        out.push_sql(", vid");
 
         out.push_sql(")\nselect ");
         for column in &self.columns {
@@ -5179,9 +5169,7 @@ impl<'a> QueryFragment<Pg> for CopyEntityBatchQuery<'a> {
                 ));
             }
         }
-        if not_poi {
-            out.push_sql(", vid");
-        }
+        out.push_sql(", vid");
 
         out.push_sql(" from ");
         out.push_sql(self.src.qualified_name.as_str());

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

@@ -223,8 +223,8 @@ fn insert_modifications() {
     assert_eq!(
         sort_by_entity_key(result.unwrap().modifications),
         sort_by_entity_key(vec![
-            EntityModification::insert(mogwai_key, mogwai_data, 0, 0),
-            EntityModification::insert(sigurros_key, sigurros_data, 0, 1)
+            EntityModification::insert(mogwai_key, mogwai_data, 0, 100),
+            EntityModification::insert(sigurros_key, sigurros_data, 0, 101)
         ])
     );
 }
@@ -269,8 +269,8 @@ fn overwrite_modifications() {
     assert_eq!(
         sort_by_entity_key(result.unwrap().modifications),
         sort_by_entity_key(vec![
-            EntityModification::overwrite(mogwai_key, mogwai_data, 0, 0),
-            EntityModification::overwrite(sigurros_key, sigurros_data, 0, 1)
+            EntityModification::overwrite(mogwai_key, mogwai_data, 0, 100),
+            EntityModification::overwrite(sigurros_key, sigurros_data, 0, 101)
         ])
     );
 }
@@ -309,7 +309,7 @@ fn consecutive_modifications() {
             update_key,
             entity! { SCHEMA => id: "mogwai", name: "Mogwai", founded: 1995 },
             0,
-            0
+            100
         )])
     );
 }