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

remove ability to have 'static DeltaEntry

Browse Source
This commit is contained in:
Joonas Koivunen
2023-08-24 14:29:37 +03:00
parent e5d00b6c2a
commit e2443a0147
2 changed files with 3 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ use crate::config::PageServerConf;
use crate::context::{AccessStatsBehavior, RequestContext};
use crate::repository::Key;
use crate::task_mgr::TaskKind;
use crate::tenant::storage_layer::delta_layer::Ref;
use crate::walrecord::NeonWalRecord;
use anyhow::Context;
use anyhow::Result;
@@ -1239,10 +1238,11 @@ impl ResidentLayer {
self.into()
}
/// Loads all keys stored in the layer. Returns key, lsn and value size.
pub(crate) async fn load_keys(
&self,
ctx: &RequestContext,
) -> anyhow::Result<Vec<DeltaEntry<Ref<&'_ delta_layer::DeltaLayerInner>>>> {
) -> anyhow::Result<Vec<DeltaEntry<'_>>> {
use LayerKind::*;
match self.downloaded.get().await? {
@@ -1254,11 +1254,7 @@ impl ResidentLayer {
// this is valid because the DownloadedLayer::kind is a OnceCell, not a
// Mutex<OnceCell>, so we cannot go and deinitialize the value with OnceCell::take
// while it's being held.
let resident = Ref(d);
delta_layer::DeltaLayerInner::load_keys(&resident)
.await
.context("Layer index is corrupted")
d.load_keys().await.context("Layer index is corrupted")
}
Image(_) => anyhow::bail!("cannot load_keys on a image layer"),
}
@@ -1374,44 +1370,6 @@ impl DownloadedLayer {
Image(i) => i.get_value_reconstruct_data(key, reconstruct_data).await,
}
}
/// Loads all keys stored in the layer. Returns key, lsn and value size.
pub(crate) async fn load_keys(
&self,
) -> anyhow::Result<Vec<DeltaEntry<Ref<&'_ delta_layer::DeltaLayerInner>>>> {
use LayerKind::*;
match self.get().await? {
Delta(d) => {
let resident = Ref(d);
delta_layer::DeltaLayerInner::load_keys(&resident)
.await
.context("Layer index is corrupted")
}
Image(_) => anyhow::bail!("cannot load_keys on a image layer"),
}
}
}
#[derive(Clone)]
pub(crate) struct ResidentDeltaLayer(Arc<DownloadedLayer>);
impl AsRef<delta_layer::DeltaLayerInner> for ResidentDeltaLayer {
fn as_ref(&self) -> &delta_layer::DeltaLayerInner {
use LayerKind::*;
let kind = self
.0
.kind
.get()
.expect("ResidentDeltaLayer must not be created before the delta is init");
match kind {
Ok(Delta(ref d)) => d,
Err(_) => unreachable!("ResidentDeltaLayer must not be created for failed loads"),
_ => unreachable!("checked before creating ResidentDeltaLayer"),
}
}
}
/// Wrapper around an actual layer implementation.

15
pageserver/src/tenant/storage_layer/delta_layer.rs
View File

@@ -307,7 +307,6 @@ impl DeltaLayer {
let desc = match dump_blob(val).await {
Ok(desc) => desc,
Err(err) => {
let err: anyhow::Error = err;
format!("ERROR: {err}")
}
};
@@ -407,20 +406,6 @@ impl DeltaLayer {
fn path(&self) -> PathBuf {
self.path.clone()
}
/// Loads all keys stored in the layer. Returns key, lsn, value size and value reference.
///
/// The value can be obtained via the [`ValueRef::load`] function.
#[allow(dead_code)] // for now, until I know if this can be done with borrows and
// ResidentDeltaLayer
pub(crate) async fn load_keys(&self, ctx: &RequestContext) -> Result<Vec<DeltaEntry<'_>>> {
let inner = self
.load(LayerAccessKind::KeyIter, ctx)
.await
.context("load delta layer keys")?;
DeltaLayerInner::load_keys(inner)
.await
.context("Layer index is corrupted")
}
}
/// A builder object for constructing a new delta layer.