From 13f9565ff848a379655002bbfbd96704ff7aed3a Mon Sep 17 00:00:00 2001 From: Konstantin Knizhnik Date: Mon, 22 Nov 2021 19:22:59 +0300 Subject: [PATCH] Fix indentation --- pageserver/src/bin/pageserver.rs | 4 ++-- pageserver/src/buffered_repository.rs | 8 +++----- pageserver/src/lib.rs | 2 +- pageserver/src/toast_store.rs | 6 +++--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pageserver/src/bin/pageserver.rs b/pageserver/src/bin/pageserver.rs index 4020de04e9..be99a2d8bb 100644 --- a/pageserver/src/bin/pageserver.rs +++ b/pageserver/src/bin/pageserver.rs @@ -123,7 +123,7 @@ impl CfgFileParams { listen_http_addr: self.listen_http_addr.or(other.listen_http_addr), checkpoint_distance: self.checkpoint_distance.or(other.checkpoint_distance), checkpoint_period: self.checkpoint_period.or(other.checkpoint_period), - reconstruct_threshold: self.reconstruct_threshold.or(other.reconstruct_threshold), + reconstruct_threshold: self.reconstruct_threshold.or(other.reconstruct_threshold), gc_horizon: self.gc_horizon.or(other.gc_horizon), gc_period: self.gc_period.or(other.gc_period), pg_distrib_dir: self.pg_distrib_dir.or(other.pg_distrib_dir), @@ -244,7 +244,7 @@ impl CfgFileParams { listen_http_addr, checkpoint_distance, checkpoint_period, - reconstruct_threshold, + reconstruct_threshold, gc_horizon, gc_period, diff --git a/pageserver/src/buffered_repository.rs b/pageserver/src/buffered_repository.rs index 18fb437e95..b5c6babc6a 100644 --- a/pageserver/src/buffered_repository.rs +++ b/pageserver/src/buffered_repository.rs @@ -1897,7 +1897,7 @@ impl<'a> BufferedTimelineWriter<'a> { */ } if store.data.commit_lsn + self.tl.conf.checkpoint_distance < lsn { - store.data.commit(lsn)?; + store.data.commit(lsn)?; self.tl.disk_consistent_lsn.store(lsn); } Ok(()) @@ -2000,11 +2000,9 @@ impl<'a> TimelineWriter for BufferedTimelineWriter<'a> { /// fn checkpoint(&self) -> Result<()> { let mut store = self.tl.store.write().unwrap(); - let lsn = self.tl.get_last_record_lsn(); + let lsn = self.tl.get_last_record_lsn(); store.data.commit(lsn)?; - self.tl - .disk_consistent_lsn - .store(lsn); + self.tl.disk_consistent_lsn.store(lsn); Ok(()) } diff --git a/pageserver/src/lib.rs b/pageserver/src/lib.rs index da5045657f..518095c8f9 100644 --- a/pageserver/src/lib.rs +++ b/pageserver/src/lib.rs @@ -152,7 +152,7 @@ impl PageServerConf { daemonize: false, checkpoint_distance: defaults::DEFAULT_CHECKPOINT_DISTANCE, checkpoint_period: Duration::from_secs(10), - reconstruct_threshold: defaults::DEFAULT_RECONSTRUCT_THRESHOLD, + reconstruct_threshold: defaults::DEFAULT_RECONSTRUCT_THRESHOLD, gc_horizon: defaults::DEFAULT_GC_HORIZON, gc_period: Duration::from_secs(10), listen_pg_addr: defaults::DEFAULT_PG_LISTEN_ADDR.to_string(), diff --git a/pageserver/src/toast_store.rs b/pageserver/src/toast_store.rs index a18e714776..22b2715bc2 100644 --- a/pageserver/src/toast_store.rs +++ b/pageserver/src/toast_store.rs @@ -10,7 +10,7 @@ use yakv::storage::{Key, Storage, StorageConfig, StorageIterator, Value}; const TOAST_SEGMENT_SIZE: usize = 2 * 1024; const CACHE_SIZE: usize = 32 * 1024; // 256Mb -//const CACHE_SIZE: usize = 128 * 1024; // 1Gb + //const CACHE_SIZE: usize = 128 * 1024; // 1Gb /// /// Toast storage consistof two KV databases: one for storing main index @@ -128,7 +128,7 @@ impl ToastStore { &path.join("pageserver.db"), StorageConfig { cache_size: CACHE_SIZE, - nosync: false, + nosync: false, }, )?, commit_lsn: Lsn(0), @@ -174,7 +174,7 @@ impl ToastStore { pub fn commit(&mut self, commit_lsn: Lsn) -> Result<()> { let mut tx = self.db.start_transaction(); tx.commit()?; - self.commit_lsn = commit_lsn; + self.commit_lsn = commit_lsn; Ok(()) }