rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-28 02:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug

Browse Source
This commit is contained in:
Bojan Serafimov
2022-06-09 11:10:06 -04:00
parent 7fca35e262
commit 5babab9461
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pageserver/src/import_datadir.rs
View File

@@ -165,7 +165,7 @@ fn import_relfile<R: Repository>(
spcoid: Oid,
dboid: Oid,
) -> anyhow::Result<()> {
let mut file = File::open(path)?;
let file = File::open(path)?;
let len = file.metadata().unwrap().len() as usize;
import_rel(modification, path, spcoid, dboid, file, len)
@@ -189,12 +189,10 @@ fn import_rel<R: Repository, Reader: Read>(
e
})?;
let mut file = File::open(path)?;
let mut buf: [u8; 8192] = [0u8; 8192];
let len = file.metadata().unwrap().len();
ensure!(len % pg_constants::BLCKSZ as u64 == 0);
let nblocks = len / pg_constants::BLCKSZ as u64;
ensure!(len % pg_constants::BLCKSZ as usize == 0);
let nblocks = len / pg_constants::BLCKSZ as usize;
if segno != 0 {
todo!();
@@ -210,7 +208,7 @@ fn import_rel<R: Repository, Reader: Read>(
let mut blknum: u32 = segno * (1024 * 1024 * 1024 / pg_constants::BLCKSZ as u32);
loop {
let r = file.read_exact(&mut buf);
let r = reader.read_exact(&mut buf);
match r {
Ok(_) => {
modification.put_rel_page_image(rel, blknum, Bytes::copy_from_slice(&buf))?;