Fix bugs in the merge with origin/main, to make it compile

This commit is contained in:
Heikki Linnakangas
2022-05-10 16:08:59 +03:00
parent 73b6a6e3c3
commit 224c2146d4

View File

@@ -392,7 +392,7 @@ impl Layer for DeltaLayer {
// A subroutine to dump a single blob
let mut dump_blob = |blob_ref: BlobRef| -> anyhow::Result<String> {
let buf = cursor.read_blob(pos).with_context(|| {
let buf = cursor.read_blob(blob_ref.pos()).with_context(|| {
format!(
"Failed to read blob from virtual file {}",
file.file.path.display()
@@ -422,7 +422,7 @@ impl Layer for DeltaLayer {
format!(" img {} bytes", img.len())
}
Value::WalRecord(rec) => {
let wal_desc = walrecord::describe_wal_record(&rec);
let wal_desc = walrecord::describe_wal_record(&rec)?;
format!(
" rec {} bytes will_init: {} {}",
buf.len(),