From 81479b0218e740fd3e0a4f4e33cd6d4c7680d764 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Thu, 2 Sep 2021 14:22:26 +0300
Subject: [PATCH] Rename 'InMemoryLayer::img_layer' field.

DeltaLayer uses the name `predecessor` for the same thing. Use the
same name in InMemoryLayer. The 'img_layer' name was misleading, as
the predecessor layer is not necessarily an image layer. Currently,
the 'freeze' function always creates a new image layer, but it
wouldn't have to be that way. Also, when you create a new branch, at
the branch point the predecessor layer can be a delta layer on the
ancestor branch.
---
 pageserver/src/layered_repository/delta_layer.rs   |  2 +-
 .../src/layered_repository/inmemory_layer.rs       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

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<Arc<dyn Layer>>,
 
     inner: Mutex<DeltaLayerInner>,
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<InMemoryLayerInner>,
 
     /// Predecessor layer
-    img_layer: Option<Arc<dyn Layer>>,
+    predecessor: Option<Arc<dyn Layer>>,
 }
 
 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,
             )?;