store: Do not require that FromEntityData is Default

Author: lutter

store/postgres/src/relational_queries.rs

@@ -269,15 +269,23 @@ impl ForeignKeyClauses for Column {
     }
 }
 
-pub trait FromEntityData: Default {
+pub trait FromEntityData {
     type Value: FromColumnValue;
 
+    fn new_entity(typename: String) -> Self;
+
     fn insert_entity_data(&mut self, key: String, v: Self::Value);
 }
 
 impl FromEntityData for Entity {
     type Value = graph::prelude::Value;
 
+    fn new_entity(typename: String) -> Self {
+        let mut entity = Entity::new();
+        entity.insert("__typename".to_string(), Self::Value::String(typename));
+        entity
+    }
+
     fn insert_entity_data(&mut self, key: String, v: Self::Value) {
         self.insert(key, v);
     }
@@ -286,6 +294,12 @@ impl FromEntityData for Entity {
 impl FromEntityData for BTreeMap<String, r::Value> {
     type Value = r::Value;
 
+    fn new_entity(typename: String) -> Self {
+        let mut map = BTreeMap::new();
+        map.insert("__typename".to_string(), Self::Value::from_string(typename));
+        map
+    }
+
     fn insert_entity_data(&mut self, key: String, v: Self::Value) {
         self.insert(key, v);
     }
@@ -481,11 +495,7 @@ impl EntityData {
         use serde_json::Value as j;
         match self.data {
             j::Object(map) => {
-                let mut out = T::default();
-                out.insert_entity_data(
-                    "__typename".to_owned(),
-                    T::Value::from_string(entity_type.into_string()),
-                );
+                let mut out = T::new_entity(entity_type.into_string());
                 for (key, json) in map {
                     // Simply ignore keys that do not have an underlying table
                     // column; those will be things like the block_range that

store/postgres/src/writable.rs

@@ -382,7 +382,7 @@ impl WritableStoreTrait for WritableAgent {
         self.store.supports_proof_of_indexing().await
     }
 
-    fn get(&self, key: &EntityKey) -> Result<Option<EntityVersion>, StoreError> {
+    fn get(&self, key: &EntityKey) -> Result<Option<Entity>, StoreError> {
         self.store.get(key)
     }
 
@@ -394,7 +394,7 @@ impl WritableStoreTrait for WritableAgent {
         stopwatch: StopwatchMetrics,
         data_sources: Vec<StoredDynamicDataSource>,
         deterministic_errors: Vec<SubgraphError>,
-    ) -> Result<Vec<(EntityKey, Vid)>, StoreError> {
+    ) -> Result<(), StoreError> {
         self.store.transact_block_operations(
             block_ptr_to,
             firehose_cursor,
@@ -408,7 +408,7 @@ impl WritableStoreTrait for WritableAgent {
     fn get_many(
         &self,
         ids_for_type: BTreeMap<&EntityType, Vec<&str>>,
-    ) -> Result<BTreeMap<EntityType, Vec<EntityVersion>>, StoreError> {
+    ) -> Result<BTreeMap<EntityType, Vec<Entity>>, StoreError> {
         self.store.get_many(ids_for_type)
     }
 
@@ -432,4 +432,12 @@ impl WritableStoreTrait for WritableAgent {
     fn shard(&self) -> &str {
         self.store.shard()
     }
+
+    async fn health(&self, id: &DeploymentHash) -> Result<schema::SubgraphHealth, StoreError> {
+        self.store.health(id).await
+    }
+
+    fn input_schema(&self) -> Arc<Schema> {
+        self.store.input_schema()
+    }
 }