make vid entries internal to the entity

Author: zorancv

graph/src/data/store/mod.rs

@@ -740,7 +740,7 @@ lazy_static! {
 }
 
 /// An entity is represented as a map of attribute names to values.
-#[derive(Clone, CacheWeight, PartialEq, Eq, Serialize)]
+#[derive(Clone, CacheWeight, Eq, Serialize)]
 pub struct Entity(Object<Value>);
 
 impl<'a> IntoIterator for &'a Entity {
@@ -874,10 +874,16 @@ impl Entity {
     }
 
     pub fn get(&self, key: &str) -> Option<&Value> {
+        if key == VID_FIELD {
+            return None;
+        }
         self.0.get(key)
     }
 
     pub fn contains_key(&self, key: &str) -> bool {
+        if key == VID_FIELD {
+            return false;
+        }
         self.0.contains_key(key)
     }
 
@@ -919,7 +925,8 @@ impl Entity {
     /// Return the VID of this entity and if its missing or of a type different than
     /// i64 it panics.
     pub fn vid(&self) -> i64 {
-        self.get(VID_FIELD)
+        self.0
+            .get(VID_FIELD)
             .expect("the vid must be set")
             .as_int8()
             .expect("the vid must be set to a valid value")
@@ -1062,6 +1069,12 @@ impl Entity {
     }
 }
 
+impl PartialEq for Entity {
+    fn eq(&self, other: &Self) -> bool {
+        self.sorted_ref() == other.sorted_ref()
+    }
+}
+
 /// Convenience methods to modify individual attributes for tests.
 /// Production code should not use/need this.
 #[cfg(debug_assertions)]