support get_mut not same key

darkrpc · Apr 26, 2024 · b102399 · b102399
1 parent 0892e67
commit b102399
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/sync/map_btree.rs b/src/sync/map_btree.rs
@@ -176,14 +176,15 @@ impl<K: Eq + Hash, V> SyncBtreeMap<K, V>
             m.insert(k.clone(), g);
         }
         let g = m.get(k).unwrap();
-        drop(get_mut_lock);
         let m = unsafe { &mut *self.dirty.get() };
-        Some(BtreeMapRefMut {
+        let v = BtreeMapRefMut {
             k: unsafe { std::mem::transmute(&k) },
             m: self,
             _g: g.lock(),
             value: m.get_mut(k)?,
-        })
+        };
+        drop(get_mut_lock);
+        Some(v)
     }
 
     #[inline]

diff --git a/src/sync/map_hash.rs b/src/sync/map_hash.rs
@@ -173,16 +173,17 @@ impl<K, V> SyncHashMap<K, V>
             m.insert(k.clone(), g);
         }
         let g = m.get(k).unwrap();
-        drop(get_mut_lock);
-        Some(HashMapRefMut {
+        let v = HashMapRefMut {
             k: unsafe { std::mem::transmute(&k) },
             m: self,
             _g: g.lock(),
             value: {
                 let m = unsafe { &mut *self.dirty.get() };
                 m.get_mut(k)?
             },
-        })
+        };
+        drop(get_mut_lock);
+        Some(v)
     }
 
     #[inline]