aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-23 17:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in page cache during balancing

Browse Source
This commit is contained in:
PThorpe92
2025-09-02 09:32:35 -04:00
parent 8f7e43b32b
commit cfadc4f579
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/storage/page_cache.rs
View File

@@ -111,15 +111,29 @@ impl DumbLruPageCache {
) -> Result<(), CacheError> {
trace!("insert(key={:?})", key);
// Check first if page already exists in cache
if !ignore_exists {
if let Some(existing_page_ref) = self.get(&key)? {
assert!(
Arc::ptr_eq(&value, &existing_page_ref),
"Attempted to insert different page with same key: {key:?}"
);
return Err(CacheError::KeyExists);
let existing_ptr = self.map.borrow().get(&key).copied();
if let Some(ptr) = existing_ptr {
if !ignore_exists {
if let Some(existing_page_ref) = self.get(&key)? {
assert!(
Arc::ptr_eq(&value, &existing_page_ref),
"Attempted to insert different page with same key: {key:?}"
);
return Err(CacheError::KeyExists);
}
} else {
// ignore_exists is called when the existing entry needs to be updated in place
unsafe {
let entry = ptr.as_ptr();
(*entry).page = value;
}
self.unlink(ptr);
self.touch(ptr);
return Ok(());
}
}
// Key doesn't exist, proceed with new entry
self.make_room_for(1)?;
let entry = Box::new(PageCacheEntry {
key,
@@ -130,7 +144,6 @@ impl DumbLruPageCache {
let ptr_raw = Box::into_raw(entry);
let ptr = unsafe { NonNull::new_unchecked(ptr_raw) };
self.touch(ptr);
self.map.borrow_mut().insert(key, ptr);
Ok(())
}