try to remove optional vid fetch

Author: Zoran Cvetkov

graph/src/components/store/entity_cache.rs

@@ -461,7 +461,7 @@ impl EntityCache {
                     updates.remove_null_fields();
                     let data = Arc::new(updates);
                     self.current.insert(key.clone(), Some(data.cheap_clone()));
-                    let vid = data.vid_opt();
+                    let vid = data.vid();
                     Some(Insert {
                         key,
                         data,
@@ -478,7 +478,7 @@ impl EntityCache {
                     let data = Arc::new(data);
                     self.current.insert(key.clone(), Some(data.cheap_clone()));
                     if current != data {
-                        let vid = data.vid_opt();
+                        let vid = data.vid();
                         Some(Overwrite {
                             key,
                             data,

graph/src/data/store/mod.rs

@@ -920,14 +920,6 @@ impl Entity {
             .expect("the vid is set to a valid value")
     }
 
-    // TODO: try to remove it
-    pub fn vid_opt(&self) -> i64 {
-        self.get("vid")
-            .map(|vid| vid.as_int8())
-            .unwrap_or_default()
-            .unwrap_or_default()
-    }
-
     /// Merges an entity update `update` into this entity.
     ///
     /// If a key exists in both entities, the value from `update` is chosen.

store/test-store/tests/chain/ethereum/manifest.rs

@@ -272,7 +272,7 @@ specVersion: 0.0.2
             .unwrap();
 
         // Adds an example entity.
-        let thing = entity! { schema => id: "datthing" };
+        let thing = entity! { schema => id: "datthing", vid : 0i64 };
         test_store::insert_entities(
             &deployment,
             vec![(schema.entity_type("Thing").unwrap(), thing)],
@@ -372,7 +372,7 @@ specVersion: 0.0.2
             msg
         );
 
-        let thing = entity! { schema => id: "datthing" };
+        let thing = entity! { schema => id: "datthing", vid : 1i64 };
         test_store::insert_entities(
             &deployment,
             vec![(schema.entity_type("Thing").unwrap(), thing)],

store/test-store/tests/core/interfaces.rs

@@ -69,7 +69,7 @@ async fn one_interface_one_entity() {
                   type Animal implements Legged @entity { id: ID!, legs: Int }";
     let schema = InputSchema::raw(document, subgraph_id);
 
-    let entity = ("Animal", entity! { schema => id: "1", legs: 3 });
+    let entity = ("Animal", entity! { schema => id: "1", legs: 3, vid: 0i64 });
 
     // Collection query.
     let query = "query { leggeds(first: 100) { legs } }";
@@ -97,7 +97,7 @@ async fn one_interface_one_entity_typename() {
                   type Animal implements Legged @entity { id: ID!, legs: Int }";
     let schema = InputSchema::raw(document, subgraph_id);
 
-    let entity = ("Animal", entity! { schema => id: "1", legs: 3 });
+    let entity = ("Animal", entity! { schema => id: "1", legs: 3, vid: 0i64 });
 
     let query = "query { leggeds(first: 100) { __typename } }";
 
@@ -118,8 +118,11 @@ async fn one_interface_multiple_entities() {
                   ";
     let schema = InputSchema::raw(document, subgraph_id);
 
-    let animal = ("Animal", entity! { schema => id: "1", legs: 3 });
-    let furniture = ("Furniture", entity! { schema => id: "2", legs: 4 });
+    let animal = ("Animal", entity! { schema => id: "1", legs: 3, vid: 0i64 });
+    let furniture = (
+        "Furniture",
+        entity! { schema => id: "2", legs: 4, vid: 0i64 },
+    );
 
     let query = "query { leggeds(first: 100, orderBy: legs) { legs } }";
 
@@ -150,8 +153,8 @@ async fn reference_interface() {
 
     let query = "query { leggeds(first: 100) { leg { id } } }";
 
-    let leg = ("Leg", entity! { schema => id: "1" });
-    let animal = ("Animal", entity! { schema => id: "1", leg: 1 });
+    let leg = ("Leg", entity! { schema => id: "1", vid: 0i64 });
+    let animal = ("Animal", entity! { schema => id: "1", leg: 1, vid: 0i64 });
 
     let res = insert_and_query(subgraph_id, document, vec![leg, animal], query)
         .await
@@ -201,16 +204,16 @@ async fn reference_interface_derived() {
 
     let query = "query { events { id transaction { id } } }";
 
-    let buy = ("BuyEvent", entity! { schema => id: "buy" });
+    let buy = ("BuyEvent", entity! { schema => id: "buy", vid: 0i64 });
     let sell1 = ("SellEvent", entity! { schema => id: "sell1", vid: 0i64 });
     let sell2 = ("SellEvent", entity! { schema => id: "sell2", vid: 1i64 });
     let gift = (
         "GiftEvent",
-        entity! { schema => id: "gift", transaction: "txn" },
+        entity! { schema => id: "gift", transaction: "txn", vid: 0i64 },
     );
     let txn = (
         "Transaction",
-        entity! { schema => id: "txn", buyEvent: "buy", sellEvents: vec!["sell1", "sell2"] },
+        entity! { schema => id: "txn", buyEvent: "buy", sellEvents: vec!["sell1", "sell2"], vid: 0i64 },
     );
 
     let entities = vec![buy, sell1, sell2, gift, txn];
@@ -305,8 +308,11 @@ async fn conflicting_implementors_id() {
                   ";
     let schema = InputSchema::raw(document, subgraph_id);
 
-    let animal = ("Animal", entity! { schema => id: "1", legs: 3 });
-    let furniture = ("Furniture", entity! { schema => id: "1", legs: 3 });
+    let animal = ("Animal", entity! { schema => id: "1", legs: 3, vid: 0i64 });
+    let furniture = (
+        "Furniture",
+        entity! { schema => id: "1", legs: 3, vid: 0i64 },
+    );
 
     let query = "query { leggeds(first: 100) { legs } }";
 
@@ -334,8 +340,11 @@ async fn derived_interface_relationship() {
                   ";
     let schema = InputSchema::raw(document, subgraph_id);
 
-    let forest = ("Forest", entity! { schema => id: "1" });
-    let animal = ("Animal", entity! { schema => id: "1", forest: "1" });
+    let forest = ("Forest", entity! { schema => id: "1", vid: 0i64 });
+    let animal = (
+        "Animal",
+        entity! { schema => id: "1", forest: "1", vid: 0i64 },
+    );
 
     let query = "query { forests(first: 100) { dwellers(first: 100) { id } } }";
 
@@ -362,9 +371,12 @@ async fn two_interfaces() {
                   ";
     let schema = InputSchema::raw(document, subgraph_id);
 
-    let a = ("A", entity! { schema => id: "1", foo: "bla" });
-    let b = ("B", entity! { schema => id: "1", bar: 100 });
-    let ab = ("AB", entity! { schema => id: "2", foo: "ble", bar: 200 });
+    let a = ("A", entity! { schema => id: "1", foo: "bla", vid: 0i64 });
+    let b = ("B", entity! { schema => id: "1", bar: 100, vid: 0i64 });
+    let ab = (
+        "AB",
+        entity! { schema => id: "2", foo: "ble", bar: 200, vid: 0i64 },
+    );
 
     let query = "query {
                     ibars(first: 100, orderBy: bar) { bar }
@@ -390,7 +402,7 @@ async fn interface_non_inline_fragment() {
 
     let entity = (
         "Animal",
-        entity! { schema => id: "1", name: "cow", legs: 3 },
+        entity! { schema => id: "1", name: "cow", legs: 3, vid: 0i64 },
     );
 
     // Query only the fragment.
@@ -422,9 +434,12 @@ async fn interface_inline_fragment() {
 
     let animal = (
         "Animal",
-        entity! { schema => id: "1", name: "cow", legs: 4 },
+        entity! { schema => id: "1", name: "cow", legs: 4, vid: 0i64 },
+    );
+    let bird = (
+        "Bird",
+        entity! { schema => id: "2", airspeed: 24, legs: 2, vid: 0i64 },
     );
-    let bird = ("Bird", entity! { schema => id: "2", airspeed: 24, legs: 2 });
 
     let query =
         "query { leggeds(orderBy: legs) { ... on Animal { name } ...on Bird { airspeed } } }";
@@ -616,7 +631,7 @@ async fn fragments_dont_panic() {
         "Parent",
         entity! { schema => id: "p2", child: Value::Null, vid: 1i64 },
     );
-    let child = ("Child", entity! { schema => id:"c" });
+    let child = ("Child", entity! { schema => id:"c", vid: 2i64 });
 
     let res = insert_and_query(subgraph_id, document, vec![parent, parent2, child], query)
         .await
@@ -682,7 +697,7 @@ async fn fragments_dont_duplicate_data() {
         "Parent",
         entity! { schema => id: "b", children: Vec::<String>::new(), vid: 1i64 },
     );
-    let child = ("Child", entity! { schema => id:"c" });
+    let child = ("Child", entity! { schema => id:"c", vid: 2i64 });
 
     let res = insert_and_query(subgraph_id, document, vec![parent, parent2, child], query)
         .await
@@ -792,8 +807,11 @@ async fn fragments_merge_selections() {
         }
     ";
 
-    let parent = ("Parent", entity! { schema => id: "p", children: vec!["c"] });
-    let child = ("Child", entity! { schema => id: "c", foo: 1 });
+    let parent = (
+        "Parent",
+        entity! { schema => id: "p", children: vec!["c"], vid: 0i64 },
+    );
+    let child = ("Child", entity! { schema => id: "c", foo: 1, vid: 1i64 });
 
     let res = insert_and_query(subgraph_id, document, vec![parent, child], query)
         .await
@@ -849,8 +867,14 @@ async fn merge_fields_not_in_interface() {
                     }
             }";
 
-    let animal = ("Animal", entity! { schema => id: "cow", human: "fred" });
-    let human = ("Human", entity! { schema => id: "fred", animal: "cow" });
+    let animal = (
+        "Animal",
+        entity! { schema => id: "cow", human: "fred", vid: 0i64 },
+    );
+    let human = (
+        "Human",
+        entity! { schema => id: "fred", animal: "cow", vid: 0i64 },
+    );
 
     let res = insert_and_query(subgraph_id, document, vec![animal, human], query)
         .await
@@ -923,15 +947,15 @@ async fn nested_interface_fragments() {
                     }
             }";
 
-    let foo = ("Foo", entity! { schema => id: "foo" });
-    let one = ("One", entity! { schema => id: "1", foo1: "foo" });
+    let foo = ("Foo", entity! { schema => id: "foo", vid: 0i64 });
+    let one = ("One", entity! { schema => id: "1", foo1: "foo", vid: 0i64 });
     let two = (
         "Two",
-        entity! { schema => id: "2", foo1: "foo", foo2: "foo" },
+        entity! { schema => id: "2", foo1: "foo", foo2: "foo", vid: 0i64 },
     );
     let three = (
         "Three",
-        entity! { schema => id: "3", foo1: "foo", foo2: "foo", foo3: "foo" },
+        entity! { schema => id: "3", foo1: "foo", foo2: "foo", foo3: "foo", vid: 0i64 },
     );
 
     let res = insert_and_query(subgraph_id, document, vec![foo, one, two, three], query)
@@ -1004,9 +1028,9 @@ async fn nested_interface_fragments_overlapping() {
                     }
             }";
 
-    let foo = ("Foo", entity! { schema => id: "foo" });
-    let one = ("One", entity! { schema => id: "1", foo1: "foo" });
-    let two = ("Two", entity! { schema => id: "2", foo1: "foo" });
+    let foo = ("Foo", entity! { schema => id: "foo", vid: 0i64 });
+    let one = ("One", entity! { schema => id: "1", foo1: "foo", vid: 0i64 });
+    let two = ("Two", entity! { schema => id: "2", foo1: "foo", vid: 0i64 });
     let res = insert_and_query(subgraph_id, document, vec![foo, one, two], query)
         .await
         .unwrap();
@@ -1281,10 +1305,13 @@ async fn mixed_mutability() {
     let query = "query { events { id } }";
 
     let entities = vec![
-        ("Mutable", entity! { schema =>  id: "mut0", name: "mut0" }),
+        (
+            "Mutable",
+            entity! { schema =>  id: "mut0", name: "mut0", vid: 0i64 },
+        ),
         (
             "Immutable",
-            entity! { schema =>  id: "immo0", name: "immo0" },
+            entity! { schema =>  id: "immo0", name: "immo0", vid: 0i64 },
         ),
     ];
 
@@ -1335,9 +1362,15 @@ async fn derived_interface_bytes() {
     let query = "query { pools { trades { id } } }";
 
     let entities = vec![
-        ("Pool", entity! { schema =>  id: b("0xf001") }),
-        ("Sell", entity! { schema =>  id: b("0xc0"), pool: "0xf001"}),
-        ("Buy", entity! { schema =>  id: b("0xb0"), pool: "0xf001"}),
+        ("Pool", entity! { schema =>  id: b("0xf001"), vid: 0i64 }),
+        (
+            "Sell",
+            entity! { schema =>  id: b("0xc0"), pool: "0xf001", vid: 0i64},
+        ),
+        (
+            "Buy",
+            entity! { schema =>  id: b("0xb0"), pool: "0xf001", vid: 0i64},
+        ),
     ];
 
     let res = insert_and_query(subgraph_id, document, entities, query)

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

@@ -208,11 +208,11 @@ fn insert_modifications() {
     let store = Arc::new(store);
     let mut cache = EntityCache::new(store);
 
-    let mogwai_data = entity! { SCHEMA => id: "mogwai", name: "Mogwai" };
+    let mogwai_data = entity! { SCHEMA => id: "mogwai", name: "Mogwai", vid: 0i64 };
     let mogwai_key = make_band_key("mogwai");
     cache.set(mogwai_key.clone(), mogwai_data.clone()).unwrap();
 
-    let sigurros_data = entity! { SCHEMA => id: "sigurros", name: "Sigur Ros" };
+    let sigurros_data = entity! { SCHEMA => id: "sigurros", name: "Sigur Ros", vid: 0i64 };
     let sigurros_key = make_band_key("sigurros");
     cache
         .set(sigurros_key.clone(), sigurros_data.clone())
@@ -243,20 +243,21 @@ fn overwrite_modifications() {
     // every set operation as an overwrite.
     let store = {
         let entities = vec![
-            entity! { SCHEMA => id: "mogwai", name: "Mogwai" },
-            entity! { SCHEMA => id: "sigurros", name: "Sigur Ros" },
+            entity! { SCHEMA => id: "mogwai", name: "Mogwai", vid: 0i64 },
+            entity! { SCHEMA => id: "sigurros", name: "Sigur Ros", vid: 0i64 },
         ];
         MockStore::new(entity_version_map("Band", entities))
     };
 
     let store = Arc::new(store);
     let mut cache = EntityCache::new(store);
 
-    let mogwai_data = entity! { SCHEMA => id: "mogwai", name: "Mogwai", founded: 1995 };
+    let mogwai_data = entity! { SCHEMA => id: "mogwai", name: "Mogwai", founded: 1995, vid: 0i64 };
     let mogwai_key = make_band_key("mogwai");
     cache.set(mogwai_key.clone(), mogwai_data.clone()).unwrap();
 
-    let sigurros_data = entity! { SCHEMA => id: "sigurros", name: "Sigur Ros", founded: 1994 };
+    let sigurros_data =
+        entity! { SCHEMA => id: "sigurros", name: "Sigur Ros", founded: 1994, vid: 0i64 };
     let sigurros_key = make_band_key("sigurros");
     cache
         .set(sigurros_key.clone(), sigurros_data.clone())
@@ -277,8 +278,9 @@ fn consecutive_modifications() {
     // Pre-populate the store with data so that we can test setting a field to
     // `Value::Null`.
     let store = {
-        let entities =
-            vec![entity! { SCHEMA => id: "mogwai", name: "Mogwai", label: "Chemikal Underground" }];
+        let entities = vec![
+            entity! { SCHEMA => id: "mogwai", name: "Mogwai", label: "Chemikal Underground", vid: 0i64 },
+        ];
 
         MockStore::new(entity_version_map("Band", entities))
     };
@@ -304,7 +306,7 @@ fn consecutive_modifications() {
         sort_by_entity_key(result.unwrap().modifications),
         sort_by_entity_key(vec![EntityModification::overwrite(
             update_key,
-            entity! { SCHEMA => id: "mogwai", name: "Mogwai", founded: 1995 },
+            entity! { SCHEMA => id: "mogwai", name: "Mogwai", founded: 1995, vid: 0i64 },
             0,
             0
         )])

store/test-store/tests/graphql/query.rs

@@ -472,7 +472,7 @@ async fn insert_test_entities(
                 entity! { is => id: "m2", name: "Lisa", mainBand: "b1", bands: vec!["b1"], favoriteCount: 100, birthDate: timestamp.clone(), vid: 1i64 },
             ],
         ),
-        ("Publisher", vec![entity! { is => id: pub1 }]),
+        ("Publisher", vec![entity! { is => id: pub1, vid: 0i64 }]),
         (
             "Band",
             vec![
@@ -492,7 +492,7 @@ async fn insert_test_entities(
         (
             "User",
             vec![
-                entity! { is => id: "u1", name: "User 1", latestSongReview: "r3", latestBandReview: "r1", latestReview: "r3" },
+                entity! { is => id: "u1", name: "User 1", latestSongReview: "r3", latestBandReview: "r1", latestReview: "r3", vid: 0i64 },
             ],
         ),
         (
@@ -528,7 +528,7 @@ async fn insert_test_entities(
         (
             "AnonymousUser",
             vec![
-                entity! { is => id: "u3", name: "Anonymous 3",  latestSongReview: "r6", latestBandReview: "r5", latestReview: "r5" },
+                entity! { is => id: "u3", name: "Anonymous 3",  latestSongReview: "r6", latestBandReview: "r5", latestReview: "r5", vid: 0i64 },
             ],
         ),
         (
@@ -549,7 +549,9 @@ async fn insert_test_entities(
         ),
         (
             "Album",
-            vec![entity! { is => id: "rl1",   title: "Pop and Folk",    songs: vec![s[3], s[4]] }],
+            vec![
+                entity! { is => id: "rl1",   title: "Pop and Folk",    songs: vec![s[3], s[4]], vid: 0i64 },
+            ],
         ),
         (
             "Single",