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

refactor: use only layer_desc for PersistentLayer::info

Browse Source
This commit is contained in:
Joonas Koivunen
2023-08-22 00:41:43 +03:00
parent ddc3c71f82
commit 008ec2dbdb
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,10 +377,6 @@ impl DeltaLayer {
.await
}
pub(crate) fn get_lsn_range(&self) -> Range<Lsn> {
self.layer_desc().lsn_range.clone()
}
pub(crate) fn local_path(&self) -> Option<PathBuf> {
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);

11
pageserver/src/tenant/storage_layer/image_layer.rs
View File

@@ -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<Lsn> {
self.layer_desc().lsn_range.clone()
}
pub(crate) fn local_path(&self) -> Option<PathBuf> {
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),
}