rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-18 13:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "got meaningful error:"

Browse Source 
This reverts commit c4ddc6abaf.
This commit is contained in:
Christian Schwarz
2023-12-11 17:21:29 +00:00
parent 0bcdd0ea7e
commit 41547582ab
2 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
repro-problem/src/main.rs
View File

@@ -4,8 +4,8 @@ mod virtual_file;
#[tokio::main]
async fn main() {
let file = VirtualFile::open(camino::Utf8Path::new("foo"))
.await
.unwrap();
file.read_exact_at(vec![0; 8], 0).await;
let file = VirtualFile::open(camino::Utf8Path::new("foo")).await.unwrap();
file.read_exact_at().await;
}

75
repro-problem/src/virtual_file.rs
View File

@@ -10,7 +10,7 @@
//! This is similar to PostgreSQL's virtual file descriptor facility in
//! src/backend/storage/file/fd.c
//!
// use crate::page_cache::PageWriteGuard;
use crate::page_cache::PageWriteGuard;
use camino::{Utf8Path, Utf8PathBuf};
use once_cell::sync::OnceCell;
use std::fs::{self, File};
@@ -574,47 +574,48 @@ impl VirtualFile {
// }
pub async fn read_exact_at(
&self,
buf: Vec<u8>,
write_guard: PageWriteGuard<'static>,
offset: u64,
) -> Result<Vec<u8>, Error> {
) -> Result<PageWriteGuard<'static>, Error> {
let write_guard: PageWriteGuard<'static> = write_guard;
let file_guard: FileGuard<'static> = self.lock_file().await?;
let system = tokio_epoll_uring::thread_local_system().await;
// struct PageWriteGuardBuf {
// buf: PageWriteGuard<'static>,
// init_up_to: usize,
// }
// unsafe impl tokio_epoll_uring::IoBuf for PageWriteGuardBuf {
// fn stable_ptr(&self) -> *const u8 {
// self.buf.as_ptr()
// }
// fn bytes_init(&self) -> usize {
// self.init_up_to
// }
// fn bytes_total(&self) -> usize {
// self.buf.len()
// }
// }
// unsafe impl tokio_epoll_uring::IoBufMut for PageWriteGuardBuf {
// fn stable_mut_ptr(&mut self) -> *mut u8 {
// self.buf.as_mut_ptr()
// }
struct PageWriteGuardBuf {
buf: PageWriteGuard<'static>,
init_up_to: usize,
}
unsafe impl tokio_epoll_uring::IoBuf for PageWriteGuardBuf {
fn stable_ptr(&self) -> *const u8 {
self.buf.as_ptr()
}
fn bytes_init(&self) -> usize {
self.init_up_to
}
fn bytes_total(&self) -> usize {
self.buf.len()
}
}
unsafe impl tokio_epoll_uring::IoBufMut for PageWriteGuardBuf {
fn stable_mut_ptr(&mut self) -> *mut u8 {
self.buf.as_mut_ptr()
}
// unsafe fn set_init(&mut self, pos: usize) {
// assert!(pos <= self.buf.len());
// self.init_up_to = pos;
// }
// }
// let buf = PageWriteGuardBuf {
// buf: write_guard,
// init_up_to: 0,
// };
let ((_, write_guard), res) = system.read(file_guard, offset, buf).await;
// let PageWriteGuardBuf {
// buf: write_guard,
// init_up_to,
// } = buf;
unsafe fn set_init(&mut self, pos: usize) {
assert!(pos <= self.buf.len());
self.init_up_to = pos;
}
}
let buf = PageWriteGuardBuf {
buf: write_guard,
init_up_to: 0,
};
let ((_, buf), res) = system.read(file_guard, offset, buf).await;
let PageWriteGuardBuf {
buf: write_guard,
init_up_to,
} = buf;
if let Ok(num_read) = res {
// assert!(init_up_to == num_read); // TODO need to deal with short reads here
assert!(init_up_to == num_read); // TODO need to deal with short reads here
}
res.map(|_| write_guard)
.map_err(|e| Error::new(ErrorKind::Other, e))