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

finish_read_page() never fails, so it does not need to return Result

Browse Source
This commit is contained in:
Jussi Saurio
2025-08-19 15:39:58 +03:00
parent 687e593361
commit 33eb730ef8
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/storage/sqlite3_ondisk.rs
View File

@@ -884,16 +884,14 @@ pub fn begin_read_page(
if bytes_read == 0 {
buf = Arc::new(Buffer::new_temporary(0));
}
if finish_read_page(page_idx, buf, page.clone()).is_err() {
page.set_error();
}
finish_read_page(page_idx, buf, page.clone());
});
let c = Completion::new_read(buf, complete);
db_file.read_page(page_idx, c)
}
#[instrument(skip_all, level = Level::INFO)]
pub fn finish_read_page(page_idx: usize, buffer_ref: Arc<Buffer>, page: PageRef) -> Result<()> {
pub fn finish_read_page(page_idx: usize, buffer_ref: Arc<Buffer>, page: PageRef) {
tracing::trace!(page_idx);
let pos = if page_idx == DatabaseHeader::PAGE_ID {
DatabaseHeader::SIZE
@@ -906,7 +904,6 @@ pub fn finish_read_page(page_idx: usize, buffer_ref: Arc<Buffer>, page: PageRef)
page.clear_locked();
page.set_loaded();
}
Ok(())
}
#[instrument(skip_all, level = Level::DEBUG)]

2
core/storage/wal.rs
View File

@@ -919,7 +919,7 @@ impl Wal for WalFile {
"read({bytes_read}) less than expected({buf_len}): frame_id={frame_id}"
);
let frame = frame.clone();
finish_read_page(page.get().id, buf, frame).unwrap();
finish_read_page(page.get().id, buf, frame);
});
begin_read_wal_frame(
&self.get_shared().file,