address review remarks

Author: Zoran Cvetkov

graph/src/data/store/mod.rs

@@ -3,7 +3,7 @@ use crate::{
     derive::CacheWeight,
     prelude::{lazy_static, q, r, s, CacheWeight, QueryExecutionError},
     runtime::gas::{Gas, GasSizeOf},
-    schema::{EntityKey, EntityType},
+    schema::{input::VID_FIELD, EntityKey, EntityType},
     util::intern::{self, AtomPool},
     util::intern::{Error as InternError, NullValue, Object},
 };
@@ -913,21 +913,21 @@ 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")
+        self.get(VID_FIELD)
             .expect("the vid is set")
             .as_int8()
             .expect("the vid is set to a valid value")
     }
 
     /// Sets the VID of the entity. The previous one is returned.
     pub fn set_vid(&mut self, value: i64) -> Result<Option<Value>, InternError> {
-        self.0.insert("vid", value.into())
+        self.0.insert(VID_FIELD, value.into())
     }
 
     /// Sets the VID if it's not already set. Should be used only for tests.
     #[cfg(debug_assertions)]
     pub fn set_vid_if_empty(&mut self) {
-        let vid = self.get("vid");
+        let vid = self.get(VID_FIELD);
         if vid.is_none() {
             let _ = self.set_vid(100).expect("the vid should be set");
         }

graph/src/schema/input/mod.rs

@@ -35,7 +35,7 @@ pub(crate) const POI_OBJECT: &str = "Poi$";
 const POI_DIGEST: &str = "digest";
 /// The name of the PoI attribute for storing the block time
 const POI_BLOCK_TIME: &str = "blockTime";
-const VID_FIELD: &str = "vid";
+pub(crate) const VID_FIELD: &str = "vid";
 
 pub mod kw {
     pub const ENTITY: &str = "entity";

graph/src/schema/mod.rs

@@ -21,7 +21,7 @@ pub mod ast;
 mod entity_key;
 mod entity_type;
 mod fulltext;
-mod input;
+pub(crate) mod input;
 
 pub use api::{is_introspection_field, APISchemaError, INTROSPECTION_QUERY_TYPE};
 

store/postgres/src/relational_queries.rs

@@ -38,7 +38,7 @@ use std::string::ToString;
 use crate::block_range::{BoundSide, EntityBlockRange};
 use crate::relational::{
     Column, ColumnType, Layout, SqlName, Table, BYTE_ARRAY_PREFIX_SIZE, PRIMARY_KEY_COLUMN,
-    STRING_PREFIX_SIZE,
+    STRING_PREFIX_SIZE, VID_COLUMN,
 };
 use crate::{
     block_range::{
@@ -539,11 +539,11 @@ impl EntityData {
                     // table column; those will be things like the
                     // block_range that `select *` pulls in but that we
                     // don't care about here
-                    if key == "vid" {
+                    if key == VID_COLUMN {
                         // VID is not in the input schema but we need it, so deserialize it too
                         match T::Value::from_column_value(&ColumnType::Int8, json) {
                             Ok(value) if value.is_null() => None,
-                            Ok(value) => Some(Ok((Word::from("vid"), value))),
+                            Ok(value) => Some(Ok((Word::from(VID_COLUMN), value))),
                             Err(e) => Some(Err(e)),
                         }
                     } else if let Some(column) = table.column(&SqlName::verbatim(key)) {