From c9c40171cdb15d4ba0c10e8b74d88fe4736bd331 Mon Sep 17 00:00:00 2001 From: Alex Chi Z Date: Thu, 29 Jun 2023 11:29:41 -0400 Subject: [PATCH] fix layer map Signed-off-by: Alex Chi Z --- pageserver/src/tenant/layer_cache.rs | 5 ++--- .../tenant/layer_map/historic_layer_coverage.rs | 14 +------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/pageserver/src/tenant/layer_cache.rs b/pageserver/src/tenant/layer_cache.rs index 1df56c21ce..6f6712b0c8 100644 --- a/pageserver/src/tenant/layer_cache.rs +++ b/pageserver/src/tenant/layer_cache.rs @@ -115,9 +115,8 @@ impl LayerCache { ) -> Result<()> { let mut guard = self.mapping.lock().unwrap(); - use super::layer_map::LayerKey; - let key = LayerKey::from(&*expected); - let other = LayerKey::from(&*new); + let key: PersistentLayerKey = expected.layer_desc().key(); + let other = new.layer_desc().key(); let expected_l0 = LayerMap::is_l0(expected.layer_desc()); let new_l0 = LayerMap::is_l0(new.layer_desc()); diff --git a/pageserver/src/tenant/layer_map/historic_layer_coverage.rs b/pageserver/src/tenant/layer_map/historic_layer_coverage.rs index ad463b4f23..bc8cdf27ca 100644 --- a/pageserver/src/tenant/layer_map/historic_layer_coverage.rs +++ b/pageserver/src/tenant/layer_map/historic_layer_coverage.rs @@ -43,18 +43,6 @@ impl Ord for LayerKey { } } -impl<'a, L: crate::tenant::storage_layer::Layer + ?Sized> From<&'a L> for LayerKey { - fn from(layer: &'a L) -> Self { - let kr = layer.get_key_range(); - let lr = layer.get_lsn_range(); - LayerKey { - key: kr.start.to_i128()..kr.end.to_i128(), - lsn: lr.start.0..lr.end.0, - is_image: !layer.is_incremental(), - } - } -} - impl From<&PersistentLayerDesc> for LayerKey { fn from(layer: &PersistentLayerDesc) -> Self { let kr = layer.get_key_range(); @@ -62,7 +50,7 @@ impl From<&PersistentLayerDesc> for LayerKey { LayerKey { key: kr.start.to_i128()..kr.end.to_i128(), lsn: lr.start.0..lr.end.0, - is_image: !layer.is_incremental(), + is_image: !layer.is_delta, } } }