graph, store: Do not panic in Entity::set when given an uninterned key

Author: lutter

graph/src/components/store/entity_cache.rs

@@ -192,7 +192,8 @@ impl EntityCache {
             }
             None => {
                 let value = self.schema.id_value(&key)?;
-                entity.set("id", value);
+                // unwrap: our AtomPool always has an id in it
+                entity.set("id", value).unwrap();
             }
         }
 

graph/src/data/store/mod.rs

@@ -777,10 +777,12 @@ impl Entity {
     }
 
     /// Convenience method to save having to `.into()` the arguments.
-    pub fn set(&mut self, name: &str, value: impl Into<Value>) -> Option<Value> {
-        self.0
-            .insert(name, value.into())
-            .expect("key is in AtomPool")
+    pub fn set(
+        &mut self,
+        name: &str,
+        value: impl Into<Value>,
+    ) -> Result<Option<Value>, InternError> {
+        self.0.insert(name, value.into())
     }
 
     /// Merges an entity update `update` into this entity.
@@ -1036,7 +1038,9 @@ fn entity_validation() {
     }
 
     let mut thing = make_thing("t1");
-    thing.set("things", Value::from(vec!["thing1", "thing2"]));
+    thing
+        .set("things", Value::from(vec!["thing1", "thing2"]))
+        .unwrap();
     check(thing, "");
 
     let thing = make_thing("t2");
@@ -1057,15 +1061,17 @@ fn entity_validation() {
     );
 
     let mut thing = make_thing("t5");
-    thing.set("name", Value::Int(32));
+    thing.set("name", Value::Int(32)).unwrap();
     check(
         thing,
         "Entity Thing[t5]: the value `32` for field `name` must \
          have type String! but has type Int",
     );
 
     let mut thing = make_thing("t6");
-    thing.set("things", Value::List(vec!["thing1".into(), 17.into()]));
+    thing
+        .set("things", Value::List(vec!["thing1".into(), 17.into()]))
+        .unwrap();
     check(
         thing,
         "Entity Thing[t6]: field `things` is of type [Thing!]!, \
@@ -1078,7 +1084,7 @@ fn entity_validation() {
     check(thing, "");
 
     let mut thing = make_thing("t8");
-    thing.set("cruft", "wat");
+    thing.set("cruft", "wat").unwrap();
     check(
         thing,
         "Entity Thing[t8]: field `cruft` is derived and can not be set",

graph/src/schema/ast.rs

@@ -457,7 +457,9 @@ fn entity_validation() {
     }
 
     let mut thing = make_thing("t1");
-    thing.set("things", store::Value::from(vec!["thing1", "thing2"]));
+    thing
+        .set("things", store::Value::from(vec!["thing1", "thing2"]))
+        .unwrap();
     check(thing, "");
 
     let thing = make_thing("t2");
@@ -478,18 +480,20 @@ fn entity_validation() {
     );
 
     let mut thing = make_thing("t5");
-    thing.set("name", store::Value::Int(32));
+    thing.set("name", store::Value::Int(32)).unwrap();
     check(
         thing,
         "Entity Thing[t5]: the value `32` for field `name` must \
          have type String! but has type Int",
     );
 
     let mut thing = make_thing("t6");
-    thing.set(
-        "things",
-        store::Value::List(vec!["thing1".into(), 17.into()]),
-    );
+    thing
+        .set(
+            "things",
+            store::Value::List(vec!["thing1".into(), 17.into()]),
+        )
+        .unwrap();
     check(
         thing,
         "Entity Thing[t6]: field `things` is of type [Thing!]!, \
@@ -502,7 +506,7 @@ fn entity_validation() {
     check(thing, "");
 
     let mut thing = make_thing("t8");
-    thing.set("cruft", "wat");
+    thing.set("cruft", "wat").unwrap();
     check(
         thing,
         "Entity Thing[t8]: field `cruft` is derived and can not be set",

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

@@ -727,7 +727,7 @@ fn scoped_get() {
         assert_eq!(None, act1);
         // But if it gets updated, it becomes visible with either scope
         let mut wallet1 = wallet1;
-        wallet1.set("balance", 70);
+        wallet1.set("balance", 70).unwrap();
         cache.set(key1.clone(), wallet1.clone()).unwrap();
         let act1 = cache.get(&key1, GetScope::InBlock).unwrap();
         assert_eq!(Some(&wallet1), act1.as_ref());

store/test-store/tests/postgres/graft.rs

@@ -316,7 +316,7 @@ async fn check_graft(
     assert_eq!(Some(&Value::from("queensha@email.com")), shaq.get("email"));
 
     // Make our own entries for block 2
-    shaq.set("email", "shaq@gmail.com");
+    shaq.set("email", "shaq@gmail.com").unwrap();
     let op = EntityOperation::Set {
         key: EntityKey::data(USER.to_owned(), "3"),
         data: shaq,

store/test-store/tests/postgres/relational.rs

@@ -580,9 +580,9 @@ fn update() {
 
         // Update with overwrite
         let mut entity = SCALAR_ENTITY.clone();
-        entity.set("string", "updated");
+        entity.set("string", "updated").unwrap();
         entity.remove("strings");
-        entity.set("bool", Value::Null);
+        entity.set("bool", Value::Null).unwrap();
         let key = EntityKey::data("Scalar".to_owned(), entity.id().unwrap());
 
         let entity_type = EntityType::from("Scalar");
@@ -608,9 +608,9 @@ fn update_many() {
     run_test(|conn, layout| {
         let mut one = SCALAR_ENTITY.clone();
         let mut two = SCALAR_ENTITY.clone();
-        two.set("id", "two");
+        two.set("id", "two").unwrap();
         let mut three = SCALAR_ENTITY.clone();
-        three.set("id", "three");
+        three.set("id", "three").unwrap();
         insert_entity(
             conn,
             layout,
@@ -622,15 +622,15 @@ fn update_many() {
         assert_eq!(3, count_scalar_entities(conn, layout));
 
         // update with overwrite
-        one.set("string", "updated");
+        one.set("string", "updated").unwrap();
         one.remove("strings");
 
-        two.set("string", "updated too");
-        two.set("bool", false);
+        two.set("string", "updated too").unwrap();
+        two.set("bool", false).unwrap();
 
-        three.set("string", "updated in a different way");
+        three.set("string", "updated in a different way").unwrap();
         three.remove("strings");
-        three.set("color", "red");
+        three.set("color", "red").unwrap();
 
         // generate keys
         let entity_type = EntityType::from("Scalar");
@@ -708,7 +708,7 @@ fn serialize_bigdecimal() {
 
         for d in &["50", "50.00", "5000", "0.5000", "0.050", "0.5", "0.05"] {
             let d = BigDecimal::from_str(d).unwrap();
-            entity.set("bigDecimal", d);
+            entity.set("bigDecimal", d).unwrap();
 
             let key = EntityKey::data("Scalar".to_owned(), entity.id().unwrap().clone());
             let entity_type = EntityType::from("Scalar");
@@ -757,7 +757,7 @@ fn delete() {
     run_test(|conn, layout| {
         insert_entity(conn, layout, "Scalar", vec![SCALAR_ENTITY.clone()]);
         let mut two = SCALAR_ENTITY.clone();
-        two.set("id", "two");
+        two.set("id", "two").unwrap();
         insert_entity(conn, layout, "Scalar", vec![two]);
 
         // Delete where nothing is getting deleted
@@ -789,9 +789,9 @@ fn insert_many_and_delete_many() {
     run_test(|conn, layout| {
         let one = SCALAR_ENTITY.clone();
         let mut two = SCALAR_ENTITY.clone();
-        two.set("id", "two");
+        two.set("id", "two").unwrap();
         let mut three = SCALAR_ENTITY.clone();
-        three.set("id", "three");
+        three.set("id", "three").unwrap();
         insert_entity(conn, layout, "Scalar", vec![one, two, three]);
 
         // confidence test: there should be 3 scalar entities in store right now

store/test-store/tests/postgres/relational_bytes.rs

@@ -295,7 +295,7 @@ fn update() {
 
         // Update the entity
         let mut entity = BEEF_ENTITY.clone();
-        entity.set("name", "Moo");
+        entity.set("name", "Moo").unwrap();
         let key = EntityKey::data("Thing".to_owned(), entity.id().unwrap());
 
         let entity_id = entity.id().unwrap();
@@ -325,7 +325,7 @@ fn delete() {
 
         insert_entity(conn, layout, "Thing", BEEF_ENTITY.clone());
         let mut two = BEEF_ENTITY.clone();
-        two.set("id", TWO_ID);
+        two.set("id", TWO_ID).unwrap();
         insert_entity(conn, layout, "Thing", two);
 
         // Delete where nothing is getting deleted