From 33eb730ef84d58b50c865530130c2aecaf47381d Mon Sep 17 00:00:00 2001 From: Jussi Saurio Date: Tue, 19 Aug 2025 15:39:58 +0300 Subject: [PATCH] finish_read_page() never fails, so it does not need to return Result --- core/storage/sqlite3_ondisk.rs | 7 ++----- core/storage/wal.rs | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/storage/sqlite3_ondisk.rs b/core/storage/sqlite3_ondisk.rs index d792da47d..e5a54437c 100644 --- a/core/storage/sqlite3_ondisk.rs +++ b/core/storage/sqlite3_ondisk.rs @@ -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, page: PageRef) -> Result<()> { +pub fn finish_read_page(page_idx: usize, buffer_ref: Arc, 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, page: PageRef) page.clear_locked(); page.set_loaded(); } - Ok(()) } #[instrument(skip_all, level = Level::DEBUG)] diff --git a/core/storage/wal.rs b/core/storage/wal.rs index ea532fb0d..a8e5bb36b 100644 --- a/core/storage/wal.rs +++ b/core/storage/wal.rs @@ -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,