serialize ingredients by index

Author: ibraheemdev

src/database.rs

@@ -156,7 +156,7 @@ pub fn current_revision<Db: ?Sized + Database>(db: &Db) -> Revision {
 mod persistence {
     use crate::plumbing::Ingredient;
     use crate::zalsa::Zalsa;
-    use crate::{Database, Runtime};
+    use crate::{Database, IngredientIndex, Runtime};
 
     use std::fmt;
 
@@ -205,21 +205,14 @@ mod persistence {
                 .filter(|ingredient| ingredient.should_serialize(zalsa))
                 .collect::<Vec<_>>();
 
-            ingredients.sort_by(|a, b| {
-                // Ensure structs are serialized before tracked functions, as deserializing a
-                // memo requires its input struct to have been deserialized.
-                //
-                // We also further sort by debug name, to maintain a consistent ordering across
-                // builds.
-                a.jar_kind()
-                    .cmp(&b.jar_kind())
-                    .then(a.debug_name().cmp(b.debug_name()))
-            });
+            // Ensure structs are serialized before tracked functions, as deserializing a
+            // memo requires its input struct to have been deserialized.
+            ingredients.sort_by_key(|ingredient| ingredient.jar_kind());
 
             let mut map = serializer.serialize_map(Some(ingredients.len()))?;
             for ingredient in ingredients {
                 map.serialize_entry(
-                    &ingredient.debug_name(),
+                    &ingredient.ingredient_index().as_u32(),
                     &SerializeIngredient(ingredient, zalsa),
                 )?;
             }
@@ -332,21 +325,17 @@ mod persistence {
         {
             let DeserializeIngredients(zalsa) = self;
 
-            while let Some(name) = access.next_key::<&str>()? {
-                // TODO: Serialize the ingredient index directly.
-                let ingredient = zalsa
-                    .ingredients()
-                    .find(|ingredient| ingredient.debug_name() == name)
-                    .unwrap();
+            while let Some(index) = access.next_key::<u32>()? {
+                let index = IngredientIndex::new(index);
 
                 // Remove the ingredient temporarily, to avoid holding an overlapping mutable borrow
                 // to the ingredient as well as the database.
-                let mut ingredient = zalsa.take_ingredient(ingredient.ingredient_index());
+                let mut ingredient = zalsa.take_ingredient(index);
 
                 // Deserialize the ingredient.
                 access.next_value_seed(DeserializeIngredient(&mut *ingredient, zalsa))?;
 
-                zalsa.replace_ingredient(ingredient.ingredient_index(), ingredient);
+                zalsa.replace_ingredient(index, ingredient);
             }
 
             Ok(())

src/zalsa.rs

@@ -208,7 +208,10 @@ impl Zalsa {
         let mut jars = jars;
 
         // Ensure structs are initialized before tracked functions.
-        jars.sort_by_key(|jar| jar.kind);
+        //
+        // We also further sort by debug name, to maintain a consistent ordering across
+        // builds.
+        jars.sort_by(|a, b| a.kind.cmp(&b.kind).then(a.type_name().cmp(b.type_name())));
 
         for jar in jars {
             zalsa.insert_jar(jar);
@@ -490,6 +493,7 @@ impl Zalsa {
 pub struct ErasedJar {
     kind: JarKind,
     type_id: fn() -> TypeId,
+    type_name: fn() -> &'static str,
     id_struct_type_id: fn() -> TypeId,
     create_ingredients: fn(&mut Zalsa, IngredientIndex) -> Vec<Box<dyn Ingredient>>,
 }
@@ -514,10 +518,15 @@ impl ErasedJar {
         Self {
             kind: I::KIND,
             type_id: TypeId::of::<I::Jar>,
+            type_name: std::any::type_name::<I::Jar>,
             create_ingredients: <I::Jar>::create_ingredients,
             id_struct_type_id: <I::Jar>::id_struct_type_id,
         }
     }
+
+    pub fn type_name(&self) -> &'static str {
+        (self.type_name)()
+    }
 }
 
 /// A salsa ingredient that can be registered in the database.

tests/persistence.rs

@@ -55,7 +55,7 @@ fn everything() {
             ]
           },
           "ingredients": {
-            "MyInput": {
+            "0": {
               "1": {
                 "durabilities": [
                   "Low"
@@ -104,7 +104,7 @@ fn everything() {
             ]
           },
           "ingredients": {
-            "MyInput": {
+            "0": {
               "1": {
                 "durabilities": [
                   "Low"
@@ -150,7 +150,7 @@ fn everything() {
                 ]
               }
             },
-            "MyInterned": {
+            "2": {
               "2049": {
                 "durability": "High",
                 "last_interned_at": 1,
@@ -159,7 +159,7 @@ fn everything() {
                 ]
               }
             },
-            "MyTracked": {
+            "3": {
               "3073": {
                 "durability": "Low",
                 "updated_at": 1,
@@ -169,7 +169,14 @@ fn everything() {
                 ]
               }
             },
-            "input_pair_to_string::interned_arguments": {
+            "6": {
+              "1025": {
+                "durability": "High",
+                "last_interned_at": 18446744073709551615,
+                "fields": null
+              }
+            },
+            "9": {
               "4097": {
                 "durability": "High",
                 "last_interned_at": 18446744073709551615,
@@ -185,38 +192,25 @@ fn everything() {
                 ]
               }
             },
-            "unit_to_interned::interned_arguments": {
-              "1025": {
-                "durability": "High",
-                "last_interned_at": 18446744073709551615,
-                "fields": null
-              }
-            },
-            "input_pair_to_string": {
-              "9:4097": {
-                "value": "aaa",
+            "5": {
+              "6:1025": {
+                "value": {
+                  "index": 2049,
+                  "generation": 0
+                },
                 "verified_at": 1,
                 "revisions": {
                   "changed_at": 1,
-                  "durability": "Low",
+                  "durability": "High",
                   "origin": {
                     "Derived": [
                       {
                         "key": {
                           "key_index": {
-                            "index": 3,
-                            "generation": 0
-                          },
-                          "ingredient_index": 1
-                        }
-                      },
-                      {
-                        "key": {
-                          "key_index": {
-                            "index": 4,
+                            "index": 2049,
                             "generation": 0
                           },
-                          "ingredient_index": 1
+                          "ingredient_index": 2
                         }
                       }
                     ]
@@ -226,7 +220,7 @@ fn everything() {
                 }
               }
             },
-            "input_to_tracked": {
+            "7": {
               "0:3": {
                 "value": {
                   "index": 3073,
@@ -279,25 +273,31 @@ fn everything() {
                 }
               }
             },
-            "unit_to_interned": {
-              "6:1025": {
-                "value": {
-                  "index": 2049,
-                  "generation": 0
-                },
+            "8": {
+              "9:4097": {
+                "value": "aaa",
                 "verified_at": 1,
                 "revisions": {
                   "changed_at": 1,
-                  "durability": "High",
+                  "durability": "Low",
                   "origin": {
                     "Derived": [
                       {
                         "key": {
                           "key_index": {
-                            "index": 2049,
+                            "index": 3,
                             "generation": 0
                           },
-                          "ingredient_index": 2
+                          "ingredient_index": 1
+                        }
+                      },
+                      {
+                        "key": {
+                          "key_index": {
+                            "index": 4,
+                            "generation": 0
+                          },
+                          "ingredient_index": 1
                         }
                       }
                     ]