fix cfg(test) and provide again VirtualFile::read_at, used only in cf…

…g(test)
neondatabase · Dec 12, 2023 · 69158a3 · 69158a3
1 parent 0ca94f5
commit 69158a3
Show file tree

Hide file tree

Showing 5 changed files with 184 additions and 141 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pageserver/Cargo.toml b/pageserver/Cargo.toml
@@ -83,7 +83,6 @@ enum-map.workspace = true
 enumset.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
-# WIP PR: https://github.com/neondatabase/tokio-epoll-uring/pull/25
 #tokio-epoll-uring = { path = "../../tokio-epoll-uring/tokio-epoll-uring" }
 tokio-epoll-uring = { git = "https://github.com/neondatabase/tokio-epoll-uring.git" , branch = "main" }
 

diff --git a/pageserver/src/tenant/block_io.rs b/pageserver/src/tenant/block_io.rs
@@ -39,6 +39,8 @@ pub enum BlockLease<'a> {
     EphemeralFileMutableTail(&'a [u8; PAGE_SZ]),
     #[cfg(test)]
     Arc(std::sync::Arc<[u8; PAGE_SZ]>),
+    #[cfg(test)]
+    Vec(Vec<u8>),
 }
 
 impl From<PageReadGuard<'static>> for BlockLease<'static> {
@@ -63,6 +65,13 @@ impl<'a> Deref for BlockLease<'a> {
             BlockLease::EphemeralFileMutableTail(v) => v,
             #[cfg(test)]
             BlockLease::Arc(v) => v.deref(),
+            #[cfg(test)]
+            BlockLease::Vec(v) => {
+                let v: &Vec<u8> = v;
+                assert_eq!(v.len(), PAGE_SZ, "caller must ensure that v has PAGE_SZ");
+                // Safety: see above assertion.
+                unsafe { &*(v.as_ptr() as *const [u8; PAGE_SZ]) }
+            }
         }
     }
 }
@@ -176,7 +185,7 @@ impl FileBlockReader {
     ) -> Result<PageWriteGuard<'static>, std::io::Error> {
         assert!(buf.len() == PAGE_SZ);
         self.file
-            .read_exact_at(buf, blkno as u64 * PAGE_SZ as u64)
+            .read_exact_at_page(buf, blkno as u64 * PAGE_SZ as u64)
             .await
     }
     /// Read a block.

diff --git a/pageserver/src/tenant/ephemeral_file.rs b/pageserver/src/tenant/ephemeral_file.rs
@@ -91,7 +91,7 @@ impl EphemeralFile {
                 page_cache::ReadBufResult::NotFound(write_guard) => {
                     let write_guard = self
                         .file
-                        .read_exact_at(write_guard, blknum as u64 * PAGE_SZ as u64)
+                        .read_exact_at_page(write_guard, blknum as u64 * PAGE_SZ as u64)
                         .await?;
                     let read_guard = write_guard.mark_valid();
                     return Ok(BlockLease::PageReadGuard(read_guard));