cleanup

Author: Zoran Cvetkov

graph/src/components/store/entity_cache.rs

@@ -459,16 +459,16 @@ impl EntityCache {
                 // Entity was created
                 (None, EntityOp::Update(mut updates))
                 | (None, EntityOp::Overwrite(mut updates)) => {
+                    let vid = updates.vid;
                     updates.e.remove_null_fields();
-                    let data = Arc::new(updates);
-                    self.current
-                        .insert(key.clone(), Some(data.e.clone().into()));
+                    let data = Arc::new(updates.e.clone());
+                    self.current.insert(key.clone(), Some(data.cheap_clone()));
                     Some(Insert {
                         key,
-                        data: data.e.clone().into(),
+                        data,
                         block,
                         end: None,
-                        vid: data.vid,
+                        vid,
                     })
                 }
                 // Entity may have been changed
@@ -493,16 +493,16 @@ impl EntityCache {
                 }
                 // Entity was removed and then updated, so it will be overwritten
                 (Some(current), EntityOp::Overwrite(data)) => {
-                    let data = Arc::new(data);
-                    self.current
-                        .insert(key.clone(), Some(data.e.clone().into()));
-                    if current != data.e.clone().into() {
+                    let vid = data.vid;
+                    let data = Arc::new(data.e.clone());
+                    self.current.insert(key.clone(), Some(data.cheap_clone()));
+                    if current != data {
                         Some(Overwrite {
                             key,
-                            data: data.e.clone().into(),
+                            data,
                             block,
                             end: None,
-                            vid: data.vid,
+                            vid,
                         })
                     } else {
                         None

graph/src/schema/input/mod.rs

@@ -1489,9 +1489,9 @@ impl InputSchema {
 
     pub fn has_field_with_name(&self, entity_type: &EntityType, field: &str) -> bool {
         // TODO: check if it is needed
-        if field == VID {
-            return true;
-        }
+        // if field == VID {
+        //     return true;
+        // }
         let field = self.inner.pool.lookup(field);
 
         match field {

store/postgres/src/relational_queries.rs

@@ -16,7 +16,7 @@ use graph::components::store::write::{EntityWrite, RowGroup, WriteChunk};
 use graph::components::store::{Child as StoreChild, DerivedEntityQuery};
 use graph::data::store::{EntityV, Id, IdType, NULL};
 use graph::data::store::{IdList, IdRef, QueryObject};
-use graph::data::subgraph::schema::POI_TABLE;
+// use graph::data::subgraph::schema::POI_TABLE;
 use graph::data::value::{Object, Word};
 use graph::data_source::CausalityRegion;
 use graph::prelude::{
@@ -2241,7 +2241,8 @@ impl<'a> QueryFragment<Pg> for InsertQuery<'a> {
         let out = &mut out;
         out.unsafe_to_cache_prepared();
 
-        let not_poi = self.table.name.as_str() != POI_TABLE;
+        // let not_poi = self.table.name.as_str() != POI_TABLE;
+        let not_poi = !self.table.object.is_poi();
 
         // Construct a query
         //   insert into schema.table(column, ...)
@@ -4691,7 +4692,8 @@ 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.name.as_str() != POI_TABLE;
+        // let not_poi = self.dst.name.as_str() != POI_TABLE;
+        let not_poi = !self.dst.object.is_poi();
 
         // Construct a query
         //   insert into {dst}({columns})