From 2fb6164bf8a254ae1ff7094ed0a666b1f733dbdb Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Thu, 5 Jun 2025 17:22:11 +0200 Subject: [PATCH] Misc build fixes --- libs/neonart/src/allocator/block.rs | 1 + pageserver/pagebench/src/cmd/getpage_latest_lsn.rs | 8 -------- pgxn/neon/communicator/src/worker_process/main_loop.rs | 6 +++--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/libs/neonart/src/allocator/block.rs b/libs/neonart/src/allocator/block.rs index 550967b14d..5aa7d45188 100644 --- a/libs/neonart/src/allocator/block.rs +++ b/libs/neonart/src/allocator/block.rs @@ -62,6 +62,7 @@ impl<'t> BlockAllocator<'t> { .cast() } + #[allow(clippy::mut_from_ref)] pub(crate) fn alloc_block(&self) -> &mut [MaybeUninit] { // FIXME: handle OOM let blkno = self.alloc_block_internal(); diff --git a/pageserver/pagebench/src/cmd/getpage_latest_lsn.rs b/pageserver/pagebench/src/cmd/getpage_latest_lsn.rs index d1e308710e..eebf618fce 100644 --- a/pageserver/pagebench/src/cmd/getpage_latest_lsn.rs +++ b/pageserver/pagebench/src/cmd/getpage_latest_lsn.rs @@ -10,8 +10,6 @@ use anyhow::Context; use async_trait::async_trait; use bytes::Bytes; use camino::Utf8PathBuf; -use futures::StreamExt; -use futures::stream::FuturesOrdered; use pageserver_api::key::Key; use pageserver_api::keyspace::KeySpaceAccum; use pageserver_api::models::{PagestreamGetPageRequest, PagestreamRequest}; @@ -24,7 +22,6 @@ use tokio_util::sync::CancellationToken; use tracing::info; use utils::id::TenantTimelineId; use utils::lsn::Lsn; -use utils::shard::ShardIndex; use axum::Router; use axum::body::Body; @@ -109,9 +106,6 @@ pub(crate) struct Args { #[clap(long, default_value = "1")] batch_size: NonZeroUsize, - #[clap(long)] - only_relnode: Option, - targets: Option>, #[clap(long, default_value = "100")] @@ -407,7 +401,6 @@ async fn main_impl( let rps_period = args .per_client_rate .map(|rps_limit| Duration::from_secs_f64(1.0 / (rps_limit as f64))); - let new_metrics = client_metrics.clone(); let make_worker: &dyn Fn(WorkerId) -> Pin>> = &|worker_id| { let ss = shared_state.clone(); @@ -421,7 +414,6 @@ async fn main_impl( rand::distributions::weighted::WeightedIndex::new(ranges.iter().map(|v| v.len())) .unwrap(); - let new_value = new_metrics.clone(); Box::pin(async move { let client: Box = match args.protocol { Protocol::Libpq => Box::new( diff --git a/pgxn/neon/communicator/src/worker_process/main_loop.rs b/pgxn/neon/communicator/src/worker_process/main_loop.rs index 9f36bf9fd5..91f0af4c6c 100644 --- a/pgxn/neon/communicator/src/worker_process/main_loop.rs +++ b/pgxn/neon/communicator/src/worker_process/main_loop.rs @@ -252,7 +252,7 @@ impl<'t> CommunicatorWorkerProcessStruct<'t> { match self .pageserver_client - .process_check_rel_exists_request(&page_api::CheckRelExistsRequest { + .process_check_rel_exists_request(page_api::CheckRelExistsRequest { read_lsn: self.request_lsns(not_modified_since), rel, }) @@ -286,7 +286,7 @@ impl<'t> CommunicatorWorkerProcessStruct<'t> { let read_lsn = self.request_lsns(not_modified_since); match self .pageserver_client - .process_get_rel_size_request(&page_api::GetRelSizeRequest { + .process_get_rel_size_request(page_api::GetRelSizeRequest { read_lsn, rel: rel.clone(), }) @@ -339,7 +339,7 @@ impl<'t> CommunicatorWorkerProcessStruct<'t> { match self .pageserver_client - .process_get_dbsize_request(&page_api::GetDbSizeRequest { + .process_get_dbsize_request(page_api::GetDbSizeRequest { read_lsn: self.request_lsns(not_modified_since), db_oid: req.db_oid, })