From 2dd35b1fbe2bd4eca09e0e774a9e29279db752ab Mon Sep 17 00:00:00 2001 From: Konstantin Knizhnik Date: Wed, 27 Oct 2021 19:37:50 +0300 Subject: [PATCH] Fix indentation --- pageserver/src/buffered_repository.rs | 20 +++++++++++--------- pageserver/src/repository.rs | 8 ++++---- pageserver/src/restore_local_repo.rs | 2 +- pageserver/src/toast_store.rs | 26 +++++++++++++------------- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/pageserver/src/buffered_repository.rs b/pageserver/src/buffered_repository.rs index a6ae3ac130..01b56d5e17 100644 --- a/pageserver/src/buffered_repository.rs +++ b/pageserver/src/buffered_repository.rs @@ -1486,15 +1486,17 @@ impl<'a> TimelineWriter for BufferedTimelineWriter<'a> { Ok(()) } - /// - /// Complete all delayed commits and advance disk_consistent_lsn - /// - fn checkpoint(&self) -> Result<()> { - let store = self.tl.store.write().unwrap(); - store.data.checkpoint()?; - self.tl.disk_consistent_lsn.store(self.tl.get_last_record_lsn()); - Ok(()) - } + /// + /// Complete all delayed commits and advance disk_consistent_lsn + /// + fn checkpoint(&self) -> Result<()> { + let store = self.tl.store.write().unwrap(); + store.data.checkpoint()?; + self.tl + .disk_consistent_lsn + .store(self.tl.get_last_record_lsn()); + Ok(()) + } /// /// Remember the (end of) last valid WAL record remembered in the timeline. diff --git a/pageserver/src/repository.rs b/pageserver/src/repository.rs index 65122d9075..ee4608156d 100644 --- a/pageserver/src/repository.rs +++ b/pageserver/src/repository.rs @@ -180,10 +180,10 @@ pub trait TimelineWriter: Deref { /// Previous last record LSN is stored alongside the latest and can be read. fn advance_last_record_lsn(&self, lsn: Lsn); - /// - /// Complete all delayed commits and advance disk_consistent_lsn - /// - fn checkpoint(&self) -> Result<()>; + /// + /// Complete all delayed commits and advance disk_consistent_lsn + /// + fn checkpoint(&self) -> Result<()>; } #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] diff --git a/pageserver/src/restore_local_repo.rs b/pageserver/src/restore_local_repo.rs index 7481bbf08f..a57a6e6cc4 100644 --- a/pageserver/src/restore_local_repo.rs +++ b/pageserver/src/restore_local_repo.rs @@ -139,7 +139,7 @@ pub fn import_timeline_from_postgres_datadir( lsn, &mut pg_control.checkPointCopy.clone(), )?; - writer.checkpoint()?; + writer.checkpoint()?; Ok(()) } diff --git a/pageserver/src/toast_store.rs b/pageserver/src/toast_store.rs index eb4aa8da0f..074a15fb13 100644 --- a/pageserver/src/toast_store.rs +++ b/pageserver/src/toast_store.rs @@ -3,9 +3,9 @@ use lz4_flex; use serde::{Deserialize, Serialize}; use std::ops::RangeBounds; use std::path::Path; +use tracing::*; use yakv::storage::{Key, Storage, StorageIterator, Value}; use zenith_utils::bin_ser::BeSer; -use tracing::*; const TOAST_SEGMENT_SIZE: usize = 2 * 1024; const CHECKPOINT_INTERVAL: u64 = 1u64 * 1024 * 1024 * 1024; @@ -165,13 +165,13 @@ impl ToastStore { Ok(()) } - pub fn checkpoint(&self) -> Result<()> { - let mut main_tx = self.main.start_transaction(); - let mut toast_tx = self.toast.start_transaction(); - toast_tx.commit()?; - main_tx.commit()?; - Ok(()) - } + pub fn checkpoint(&self) -> Result<()> { + let mut main_tx = self.main.start_transaction(); + let mut toast_tx = self.toast.start_transaction(); + toast_tx.commit()?; + main_tx.commit()?; + Ok(()) + } pub fn get(&self, key: &[u8]) -> Result> { self.main @@ -268,9 +268,9 @@ impl ToastStore { } impl Drop for ToastStore { - fn drop(&mut self) { - info!("Storage closed"); - // FIXME-KK: better call close() explicitly - self.close().unwrap(); - } + fn drop(&mut self) { + info!("Storage closed"); + // FIXME-KK: better call close() explicitly + self.close().unwrap(); + } }