Avoid redundant read/write of allocation/claims HAMT root when unchan…

…ged (#1030)
filecoin-project · Jan 18, 2023 · e28bc90 · e28bc90
1 parent a600986
commit e28bc90
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/actors/verifreg/src/lib.rs b/actors/verifreg/src/lib.rs
@@ -696,8 +696,8 @@ impl Actor {
 
         // Save new allocations and updated claims.
         let ids = rt.transaction(|st: &mut State, rt| {
-            let ids = st.insert_allocations(rt.store(), client, new_allocs.into_iter())?;
-            st.put_claims(rt.store(), updated_claims.into_iter())?;
+            let ids = st.insert_allocations(rt.store(), client, new_allocs)?;
+            st.put_claims(rt.store(), updated_claims)?;
             Ok(ids)
         })?;
 

diff --git a/actors/verifreg/src/state.rs b/actors/verifreg/src/state.rs
@@ -144,15 +144,15 @@ impl State {
 
     /// Inserts a batch of allocations under a single client address.
     /// The allocations are assigned sequential IDs starting from the next available.
-    pub fn insert_allocations<BS: Blockstore, I>(
+    pub fn insert_allocations<BS: Blockstore>(
         &mut self,
         store: &BS,
         client: ActorID,
-        new_allocs: I,
-    ) -> Result<Vec<AllocationID>, ActorError>
-    where
-        I: Iterator<Item = Allocation>,
-    {
+        new_allocs: Vec<Allocation>,
+    ) -> Result<Vec<AllocationID>, ActorError> {
+        if new_allocs.is_empty() {
+            return Ok(vec![]);
+        }
         let mut allocs = self.load_allocs(store)?;
         // These local variables allow the id-associating map closure to move the allocations
         // from the iterator rather than clone, without moving self.
@@ -162,7 +162,7 @@ impl State {
         allocs
             .put_many(
                 client,
-                new_allocs.map(move |a| {
+                new_allocs.into_iter().map(move |a| {
                     let id = first_id + *count_ref;
                     *count_ref += 1;
                     (id, a)
@@ -198,12 +198,16 @@ impl State {
         Ok(())
     }
 
-    pub fn put_claims<BS: Blockstore, I>(&mut self, store: &BS, claims: I) -> Result<(), ActorError>
-    where
-        I: Iterator<Item = (ClaimID, Claim)>,
-    {
+    pub fn put_claims<BS: Blockstore>(
+        &mut self,
+        store: &BS,
+        claims: Vec<(ClaimID, Claim)>,
+    ) -> Result<(), ActorError> {
+        if claims.is_empty() {
+            return Ok(());
+        }
         let mut st_claims = self.load_claims(store)?;
-        for (id, claim) in claims {
+        for (id, claim) in claims.into_iter() {
             st_claims
                 .put(claim.provider, id, claim)
                 .context_code(ExitCode::USR_ILLEGAL_STATE, "failed to put claim")?;