From 047a05efb2d599d8af0d493718f1feeff1ccac72 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Mon, 16 Aug 2021 15:48:59 +0300
Subject: [PATCH] Minor formatting and comment fixes.

---
 pageserver/src/basebackup.rs        | 4 +++-
 pageserver/src/object_repository.rs | 8 +++-----
 pageserver/src/walredo.rs           | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pageserver/src/basebackup.rs b/pageserver/src/basebackup.rs
index a133f7c68b..434b6af79f 100644
--- a/pageserver/src/basebackup.rs
+++ b/pageserver/src/basebackup.rs
@@ -179,7 +179,9 @@ impl<'a> Basebackup<'a> {
     // Extract twophase state files
     //
     fn add_twophase_file(&mut self, xid: TransactionId) -> anyhow::Result<()> {
-        if let Ok(img) =  self.timeline.get_page_at_lsn_nowait(RelishTag::TwoPhase { xid }, 0, self.lsn)
+        if let Ok(img) =
+            self.timeline
+                .get_page_at_lsn_nowait(RelishTag::TwoPhase { xid }, 0, self.lsn)
         {
             let mut buf = BytesMut::new();
             buf.extend_from_slice(&img[..]);
diff --git a/pageserver/src/object_repository.rs b/pageserver/src/object_repository.rs
index 31b8c40d4e..b5bcdd490d 100644
--- a/pageserver/src/object_repository.rs
+++ b/pageserver/src/object_repository.rs
@@ -299,15 +299,13 @@ impl Timeline for ObjectTimeline {
         // move this check out of the funciton.
         //
         match rel {
-            RelishTag::Slru { .. } |
-            RelishTag::TwoPhase{ .. } =>
-            {
+            RelishTag::Slru { .. } | RelishTag::TwoPhase { .. } => {
                 if !self.get_rel_exists(rel, req_lsn).unwrap_or(false) {
                     trace!("{:?} at {} doesn't exist", rel, req_lsn);
                     return Err(anyhow!("non-rel relish doesn't exist"));
                 }
-            },
-            _ => ()
+            }
+            _ => (),
         };
 
         const ZERO_PAGE: [u8; 8192] = [0u8; 8192];
diff --git a/pageserver/src/walredo.rs b/pageserver/src/walredo.rs
index 9e77fb8df4..3d6a1d4e0c 100644
--- a/pageserver/src/walredo.rs
+++ b/pageserver/src/walredo.rs
@@ -197,12 +197,10 @@ fn mx_offset_to_member_offset(xid: MultiXactId) -> usize {
 }
 
 impl PostgresRedoManager {
-
     ///
     /// Create a new PostgresRedoManager.
     ///
     pub fn new(conf: &'static PageServerConf, tenantid: ZTenantId) -> PostgresRedoManager {
-
         // We block on waiting for requests on the walredo request channel, but
         // use async I/O to communicate with the child process. Initialize the
         // runtime for the async part.
@@ -244,6 +242,8 @@ impl PostgresRedoManager {
             let buf_tag = BufferTag { rel, blknum };
             apply_result = process.apply_wal_records(buf_tag, base_img, records).await;
         } else {
+            // Non-relational WAL records are handled here, with custom code that has the
+            // same effects as the corresponding Postgres WAL redo function.
             const ZERO_PAGE: [u8; 8192] = [0u8; 8192];
             let mut page = BytesMut::new();
             if let Some(fpi) = base_img {
@@ -378,7 +378,7 @@ impl PostgresRedoManager {
                         panic!();
                     }
                 } else if xlogrec.xl_rmid == pg_constants::RM_RELMAP_ID {
-                    // Ralation map file has size 512 bytes
+                    // Relation map file has size 512 bytes
                     page.clear();
                     page.extend_from_slice(&buf[12..]); // skip xl_relmap_update
                     assert!(page.len() == 512); // size of pg_filenode.map