diff --git a/pageserver/src/layered_repository/delta_layer.rs b/pageserver/src/layered_repository/delta_layer.rs index 06a241f65f..1ce2c0d593 100644 --- a/pageserver/src/layered_repository/delta_layer.rs +++ b/pageserver/src/layered_repository/delta_layer.rs @@ -109,7 +109,7 @@ pub struct DeltaLayer { dropped: bool, - /// Base layer preceding this layer. + /// Predecessor layer predecessor: Option>, inner: Mutex, diff --git a/pageserver/src/layered_repository/inmemory_layer.rs b/pageserver/src/layered_repository/inmemory_layer.rs index 15e0fdcdcb..c41d60b14f 100644 --- a/pageserver/src/layered_repository/inmemory_layer.rs +++ b/pageserver/src/layered_repository/inmemory_layer.rs @@ -42,7 +42,7 @@ pub struct InMemoryLayer { inner: Mutex, /// Predecessor layer - img_layer: Option>, + predecessor: Option>, } pub struct InMemoryLayerInner { @@ -169,9 +169,9 @@ impl Layer for InMemoryLayer { // Use the base image, if needed if let Some(need_lsn) = need_base_image_lsn { - if let Some(img_layer) = &self.img_layer { + if let Some(predecessor) = &self.predecessor { need_base_image_lsn = - img_layer.get_page_reconstruct_data(blknum, need_lsn, reconstruct_data)?; + predecessor.get_page_reconstruct_data(blknum, need_lsn, reconstruct_data)?; } else { bail!( "no base img found for {} at blk {} at LSN {}", @@ -225,7 +225,7 @@ impl Layer for InMemoryLayer { } fn is_incremental(&self) -> bool { - self.img_layer.is_some() + self.predecessor.is_some() } /// debugging function to print out the contents of the layer @@ -290,7 +290,7 @@ impl InMemoryLayer { page_versions: BTreeMap::new(), segsizes: BTreeMap::new(), }), - img_layer: None, + predecessor: None, }) } @@ -431,7 +431,7 @@ impl InMemoryLayer { page_versions: BTreeMap::new(), segsizes: segsizes, }), - img_layer: Some(src), + predecessor: Some(src), }) } @@ -525,7 +525,7 @@ impl InMemoryLayer { self.start_lsn, end_lsn, dropped, - self.img_layer.clone(), + self.predecessor.clone(), before_page_versions, before_segsizes, )?;