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

ptrmap functions should bubble completions

Browse Source
This commit is contained in:
pedrocarlo
2025-08-12 15:35:57 -03:00
committed by Jussi Saurio
parent b6e200dbed
commit c1975cdfa1
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/storage/pager.rs
View File

@@ -610,23 +610,18 @@ impl Pager {
ptrmap_pg_no
);
let (ptrmap_page, _c) = self.read_page(ptrmap_pg_no as usize)?;
let (ptrmap_page, c) = self.read_page(ptrmap_pg_no as usize)?;
self.ptrmap_get_state.replace(PtrMapGetState::Deserialize {
ptrmap_page,
offset_in_ptrmap_page,
});
Ok(IOResult::IO)
Ok(IOResult::IO(IOCompletions::Single(c)))
}
PtrMapGetState::Deserialize {
ptrmap_page,
offset_in_ptrmap_page,
} => {
if ptrmap_page.is_locked() {
return Ok(IOResult::IO);
}
if !ptrmap_page.is_loaded() {
return Ok(IOResult::IO);
}
turso_assert!(ptrmap_page.is_loaded(), "ptrmap_page should be loaded");
let ptrmap_page_inner = ptrmap_page.get();
let ptrmap_pg_no = ptrmap_page_inner.id;
@@ -714,17 +709,18 @@ impl Pager {
offset_in_ptrmap_page
);
let (ptrmap_page, _c) = self.read_page(ptrmap_pg_no as usize)?;
let (ptrmap_page, c) = self.read_page(ptrmap_pg_no as usize)?;
self.ptrmap_put_state.replace(PtrMapPutState::Deserialize {
ptrmap_page,
offset_in_ptrmap_page,
});
Ok(IOResult::IO)
Ok(IOResult::IO(IOCompletions::Single(c)))
}
PtrMapPutState::Deserialize {
ptrmap_page,
offset_in_ptrmap_page,
} => {
turso_assert!(ptrmap_page.is_loaded(), "page should be loaded");
let ptrmap_page_inner = ptrmap_page.get();
let ptrmap_pg_no = ptrmap_page_inner.id;
@@ -2218,7 +2214,7 @@ mod ptrmap_tests {
IOResult::Done(res) => {
return Ok(res);
}
IOResult::IO => pager.io.run_once().unwrap(),
IOResult::IO(io) => io.wait(pager.io.as_ref())?,
}
}
}