From 008ec2dbdb17395cd7feb0cacf1f9bea437fc68e Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Tue, 22 Aug 2023 00:41:43 +0300 Subject: [PATCH] refactor: use only layer_desc for PersistentLayer::info --- pageserver/src/tenant/storage_layer/delta_layer.rs | 8 ++------ pageserver/src/tenant/storage_layer/image_layer.rs | 11 +++-------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs index 0e3333f057..ea0b47d4fa 100644 --- a/pageserver/src/tenant/storage_layer/delta_layer.rs +++ b/pageserver/src/tenant/storage_layer/delta_layer.rs @@ -377,10 +377,6 @@ impl DeltaLayer { .await } - pub(crate) fn get_lsn_range(&self) -> Range { - self.layer_desc().lsn_range.clone() - } - pub(crate) fn local_path(&self) -> Option { Some(self.path()) } @@ -392,8 +388,8 @@ impl DeltaLayer { } pub(crate) fn info(&self, reset: LayerAccessStatsReset) -> HistoricLayerInfo { - let layer_file_name = self.filename().file_name(); - let lsn_range = self.get_lsn_range(); + let layer_file_name = self.layer_desc().filename().file_name(); + let lsn_range = self.layer_desc().lsn_range.clone(); let access_stats = self.access_stats.as_api_model(reset); diff --git a/pageserver/src/tenant/storage_layer/image_layer.rs b/pageserver/src/tenant/storage_layer/image_layer.rs index b2d8bde8db..da5fabd83a 100644 --- a/pageserver/src/tenant/storage_layer/image_layer.rs +++ b/pageserver/src/tenant/storage_layer/image_layer.rs @@ -268,11 +268,6 @@ impl ImageLayer { .with_context(|| format!("read {}", self.path().display())) } - /// Boilerplate to implement the Layer trait, always use layer_desc for persistent layers. - pub(crate) fn get_lsn_range(&self) -> Range { - self.layer_desc().lsn_range.clone() - } - pub(crate) fn local_path(&self) -> Option { Some(self.path()) } @@ -284,13 +279,13 @@ impl ImageLayer { } pub(crate) fn info(&self, reset: LayerAccessStatsReset) -> HistoricLayerInfo { - let layer_file_name = self.filename().file_name(); - let lsn_range = self.get_lsn_range(); + let layer_file_name = self.layer_desc().filename().file_name(); + let lsn_start = self.layer_desc().image_layer_lsn(); HistoricLayerInfo::Image { layer_file_name, layer_file_size: self.desc.file_size, - lsn_start: lsn_range.start, + lsn_start, remote: false, access_stats: self.access_stats.as_api_model(reset), }