From fa0409673395a6d21c5644b2a787859b30a0184d Mon Sep 17 00:00:00 2001 From: Stas Kelvich Date: Wed, 4 Aug 2021 23:51:02 +0300 Subject: [PATCH] cargo fmt pass --- pageserver/src/basebackup.rs | 1 - pageserver/src/branches.rs | 1 - pageserver/src/page_service.rs | 8 ++++++-- pageserver/src/relish.rs | 14 +++----------- zenith_metrics/src/lib.rs | 4 ++-- zenith_metrics/src/wrappers.rs | 2 +- zenith_utils/src/http_endpoint.rs | 2 +- zenith_utils/src/postgres_backend.rs | 5 +---- 8 files changed, 14 insertions(+), 23 deletions(-) diff --git a/pageserver/src/basebackup.rs b/pageserver/src/basebackup.rs index 4f814b7b04..08eea4459a 100644 --- a/pageserver/src/basebackup.rs +++ b/pageserver/src/basebackup.rs @@ -50,7 +50,6 @@ impl<'a> Basebackup<'a> { } pub fn send_tarball(&mut self) -> anyhow::Result<()> { - // Create pgdata subdirs structure for dir in pg_constants::PGDATA_SUBDIRS.iter() { info!("send subdir {:?}", *dir); diff --git a/pageserver/src/branches.rs b/pageserver/src/branches.rs index a33597bb2d..34f8117a30 100644 --- a/pageserver/src/branches.rs +++ b/pageserver/src/branches.rs @@ -47,7 +47,6 @@ pub fn init_pageserver( workdir: &Path, create_tenant: Option<&str>, ) -> Result<()> { - env::set_current_dir(workdir)?; // Initialize logger diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index f804b843ba..356f7a5329 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -15,12 +15,12 @@ use bytes::{Buf, BufMut, Bytes, BytesMut}; use lazy_static::lazy_static; use log::*; use regex::Regex; -use zenith_metrics::{HistogramVec, register_histogram_vec}; use std::io::Write; use std::net::TcpListener; use std::str::FromStr; use std::thread; use std::{io, net::TcpStream}; +use zenith_metrics::{register_histogram_vec, HistogramVec}; use zenith_utils::postgres_backend::PostgresBackend; use zenith_utils::postgres_backend::{self, AuthType}; use zenith_utils::pq_proto::{ @@ -472,7 +472,11 @@ impl postgres_backend::Handler for PageServerHandler { let modification = Modification::des(&bytes)?; last_lsn = modification.lsn; - timeline.put_raw_data(modification.tag, modification.lsn, &modification.data)?; + timeline.put_raw_data( + modification.tag, + modification.lsn, + &modification.data, + )?; } FeMessage::CopyDone => { timeline.advance_last_valid_lsn(last_lsn); diff --git a/pageserver/src/relish.rs b/pageserver/src/relish.rs index 782388871b..7af086c35c 100644 --- a/pageserver/src/relish.rs +++ b/pageserver/src/relish.rs @@ -53,10 +53,7 @@ pub enum RelishTag { // relish. For example, pg_clog/0000, pg_clog/0001, and so forth. // // SLRU segments are divided into blocks, like relations. - Slru { - slru: SlruKind, - segno: u32, - }, + Slru { slru: SlruKind, segno: u32 }, // Miscellaneous other files that need to be included in the // tarball at compute node creation. These are non-blocky, and are @@ -76,17 +73,12 @@ pub enum RelishTag { // These files are always 512 bytes long (although we don't check // or care about that in the page server). // - FileNodeMap { - spcnode: Oid, - dbnode: Oid, - }, + FileNodeMap { spcnode: Oid, dbnode: Oid }, // // State files for prepared transactions (e.g pg_twophase/1234) // - TwoPhase { - xid: TransactionId, - }, + TwoPhase { xid: TransactionId }, // The control file, stored in global/pg_control ControlFile, diff --git a/zenith_metrics/src/lib.rs b/zenith_metrics/src/lib.rs index 0300010362..5f858d7029 100644 --- a/zenith_metrics/src/lib.rs +++ b/zenith_metrics/src/lib.rs @@ -3,14 +3,14 @@ //! Otherwise, we might not see all metrics registered via //! a default registry. pub use prometheus::gather; -pub use prometheus::{Encoder, TextEncoder}; -pub use prometheus::{linear_buckets, exponential_buckets}; +pub use prometheus::{exponential_buckets, linear_buckets}; pub use prometheus::{register_histogram, Histogram}; pub use prometheus::{register_histogram_vec, HistogramVec}; pub use prometheus::{register_int_counter, IntCounter}; pub use prometheus::{register_int_counter_vec, IntCounterVec}; pub use prometheus::{register_int_gauge, IntGauge}; pub use prometheus::{register_int_gauge_vec, IntGaugeVec}; +pub use prometheus::{Encoder, TextEncoder}; mod wrappers; pub use wrappers::{CountedReader, CountedWriter}; diff --git a/zenith_metrics/src/wrappers.rs b/zenith_metrics/src/wrappers.rs index bdadd5c209..88b9f88740 100644 --- a/zenith_metrics/src/wrappers.rs +++ b/zenith_metrics/src/wrappers.rs @@ -1,4 +1,4 @@ -use std::io::{Result, Read, Write}; +use std::io::{Read, Result, Write}; /// A wrapper for an object implementing [Read](std::io::Read) /// which allows a closure to observe the amount of bytes read. diff --git a/zenith_utils/src/http_endpoint.rs b/zenith_utils/src/http_endpoint.rs index 5d0f5d6283..c0dd9c8f0d 100644 --- a/zenith_utils/src/http_endpoint.rs +++ b/zenith_utils/src/http_endpoint.rs @@ -4,8 +4,8 @@ use hyper::{ Body, Request, Response, Server, }; use lazy_static::lazy_static; -use zenith_metrics::{Encoder, TextEncoder}; use zenith_metrics::{register_int_counter, IntCounter}; +use zenith_metrics::{Encoder, TextEncoder}; lazy_static! { static ref SERVE_METRICS_COUNT: IntCounter = register_int_counter!( diff --git a/zenith_utils/src/postgres_backend.rs b/zenith_utils/src/postgres_backend.rs index 62f3ecee62..ac9718e4f3 100644 --- a/zenith_utils/src/postgres_backend.rs +++ b/zenith_utils/src/postgres_backend.rs @@ -80,10 +80,7 @@ pub fn query_from_cstring(query_string: Bytes) -> Vec { } impl PostgresBackend { - pub fn new( - socket: TcpStream, - auth_type: AuthType, - ) -> io::Result { + pub fn new(socket: TcpStream, auth_type: AuthType) -> io::Result { let mut pb = PostgresBackend { stream_in: None, stream_out: socket,