rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-14 17:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup: deserialize shenanigans

Browse Source
This commit is contained in:
Vlad Lazar
2024-09-12 20:00:06 +01:00
parent 2923fd2a5b
commit b2cb10590e
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pageserver/src/tenant/storage_layer.rs
View File

@@ -16,7 +16,7 @@ use crate::context::{AccessStatsBehavior, RequestContext};
use crate::repository::{Value, ValueBytes};
use crate::walrecord::NeonWalRecord;
use bytes::Bytes;
use pageserver_api::key::Key;
use pageserver_api::key::{Key, DBDIR_KEY};
use pageserver_api::keyspace::{KeySpace, KeySpaceRandomAccum};
use std::cmp::Ordering;
use std::collections::hash_map::Entry;
@@ -102,6 +102,7 @@ impl VectoredValueReconstructState {
}
pub(crate) async fn convert(
_key: Key,
from: VectoredValueReconstructState,
) -> Result<ValueReconstructState, PageReconstructError> {
let mut to = ValueReconstructState::default();
@@ -110,23 +111,16 @@ pub(crate) async fn convert(
match fut.await {
Ok(res) => match res {
Ok(bytes) => {
let is_image = ValueBytes::is_image(&bytes).map_err(|err| {
PageReconstructError::Other(anyhow::anyhow!(
"Failed to check image discriminator: {err:?}"
))
})?;
let value = Value::des(&bytes)
.map_err(|err| PageReconstructError::Other(err.into()))?;
if is_image {
to.img = Some((lsn, bytes));
} else {
let value = Value::des(&bytes)
.map_err(|err| PageReconstructError::Other(err.into()))?;
if let Value::WalRecord(rec) = value {
match value {
Value::WalRecord(rec) => {
to.records.push((lsn, rec));
} else {
return Err(PageReconstructError::Other(anyhow::anyhow!(
"Deserialized to image"
)));
},
Value::Image(img) => {
assert!(to.img.is_none());
to.img = Some((lsn, img));
}
}
}

2
pageserver/src/tenant/timeline.rs
View File

@@ -1145,7 +1145,7 @@ impl Timeline {
ValueReconstructSituation::Complete
));
let converted = match convert(state).await {
let converted = match convert(key, state).await {
Ok(ok) => ok,
Err(err) => {
return (key, Err(err));