rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-10-26 13:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt block_io/blob_io to virtual_file::Error

Browse Source
This commit is contained in:
John Spray
2023-10-02 15:38:08 +01:00
parent c60ffde0c8
commit 682f1df2ee
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pageserver/src/tenant/blob_io.rs
+4 -1
View File
@@ -234,7 +234,10 @@ impl BlobWriter<false> {
#[cfg(test)]
mod tests {
use super::*;
use crate::{context::DownloadBehavior, task_mgr::TaskKind, tenant::block_io::BlockReaderRef};
use crate::{
context::DownloadBehavior, task_mgr::TaskKind, tenant::block_io::BlockReaderRef,
virtual_file::Error,
};
use rand::{Rng, SeedableRng};
async fn round_trip_test<const BUFFERED: bool>(blobs: &[Vec<u8>]) -> Result<(), Error> {
pageserver/src/tenant/block_io.rs
+3 -2
View File
@@ -6,7 +6,7 @@ use super::ephemeral_file::EphemeralFile;
use super::storage_layer::delta_layer::{Adapter, DeltaLayerInner};
use crate::context::RequestContext;
use crate::page_cache::{self, PageReadGuard, ReadBufResult, PAGE_SZ};
use crate::virtual_file::VirtualFile;
use crate::virtual_file::{self, VirtualFile};
use bytes::Bytes;
use std::ops::{Deref, DerefMut};
@@ -96,7 +96,7 @@ impl<'a> BlockReaderRef<'a> {
#[cfg(test)]
TestDisk(r) => r.read_blk(blknum),
#[cfg(test)]
VirtualFile(r) => r.read_blk(blknum).await,
VirtualFile(r) => r.read_blk(blknum).await.map_err(virtual_file::Error::into),
}
}
}
@@ -174,6 +174,7 @@ impl FileBlockReader {
self.file
.read_exact_at(buf, blkno as u64 * PAGE_SZ as u64)
.await
.map_err(virtual_file::Error::into)
}
/// Read a block.
///