From e90be06d46c8438a76de59ae479bd9d9a939e6c8 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 23 Jun 2025 18:16:30 +0300 Subject: [PATCH] silence a few compiler warnings about unnecessary 'mut's and 'use's --- compute_tools/src/compute.rs | 1 - pageserver/client_grpc/src/lib.rs | 5 ----- pageserver/client_grpc/src/request_tracker.rs | 10 +++++----- pageserver/pagebench/src/cmd/getpage_latest_lsn.rs | 3 --- pgxn/neon/communicator/src/worker_process/main_loop.rs | 2 +- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/compute_tools/src/compute.rs b/compute_tools/src/compute.rs index 417039cad4..93233233c6 100644 --- a/compute_tools/src/compute.rs +++ b/compute_tools/src/compute.rs @@ -30,7 +30,6 @@ use std::sync::atomic::{AtomicU32, Ordering}; use std::sync::{Arc, Condvar, Mutex, RwLock}; use std::time::{Duration, Instant}; use std::{env, fs}; -use tokio::io::AsyncReadExt; use tokio::spawn; use tokio_util::io::StreamReader; use tracing::{Instrument, debug, error, info, instrument, warn}; diff --git a/pageserver/client_grpc/src/lib.rs b/pageserver/client_grpc/src/lib.rs index e709068beb..cde5753fc2 100644 --- a/pageserver/client_grpc/src/lib.rs +++ b/pageserver/client_grpc/src/lib.rs @@ -25,11 +25,6 @@ pub mod request_tracker; use tonic::transport::Channel; use metrics::{IntCounterVec, core::Collector}; -use crate::client_cache::{PooledItemFactory}; - -use tokio::sync::mpsc; -use async_trait::async_trait; - #[derive(Error, Debug)] pub enum PageserverClientError { diff --git a/pageserver/client_grpc/src/request_tracker.rs b/pageserver/client_grpc/src/request_tracker.rs index 118c455537..f7d2558849 100644 --- a/pageserver/client_grpc/src/request_tracker.rs +++ b/pageserver/client_grpc/src/request_tracker.rs @@ -15,7 +15,7 @@ use tonic::{transport::{Channel}, Request}; use crate::ClientCacheOptions; use crate::PageserverClientAggregateMetrics; use tokio::sync::Mutex; -use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::atomic::AtomicU64; use utils::shard::ShardIndex; @@ -313,7 +313,7 @@ impl RequestTracker { req: GetPageRequest, ) -> Result { loop { - let mut request = req.clone(); + let request = req.clone(); // Increment cur_id //let request_id = self.cur_id.fetch_add(1, Ordering::SeqCst) + 1; let request_id = request.request_id; @@ -531,7 +531,7 @@ impl ShardedRequestTracker { ) -> Result { let shard_index = ShardIndex::unsharded(); let inner = self.inner.lock().await; - let mut tracker: RequestTracker; + let tracker: RequestTracker; if let Some(t) = inner.trackers.get(&shard_index) { tracker = t.clone(); } else { @@ -552,7 +552,7 @@ impl ShardedRequestTracker { ) -> Result { let shard_index = ShardIndex::unsharded(); let inner = self.inner.lock().await; - let mut tracker: RequestTracker; + let tracker: RequestTracker; if let Some(t) = inner.trackers.get(&shard_index) { tracker = t.clone(); } else { @@ -573,7 +573,7 @@ impl ShardedRequestTracker { ) -> Result { let shard_index = ShardIndex::unsharded(); let inner = self.inner.lock().await; - let mut tracker: RequestTracker; + let tracker: RequestTracker; if let Some(t) = inner.trackers.get(&shard_index) { tracker = t.clone(); } else { diff --git a/pageserver/pagebench/src/cmd/getpage_latest_lsn.rs b/pageserver/pagebench/src/cmd/getpage_latest_lsn.rs index b0d164a85e..db9f6a7592 100644 --- a/pageserver/pagebench/src/cmd/getpage_latest_lsn.rs +++ b/pageserver/pagebench/src/cmd/getpage_latest_lsn.rs @@ -5,7 +5,6 @@ use std::pin::Pin; use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::{Arc, Mutex}; use std::time::{Duration, Instant}; -use std::io::Error; use anyhow::Context; use async_trait::async_trait; @@ -27,8 +26,6 @@ use utils::id::TenantTimelineId; use utils::lsn::Lsn; use utils::shard::ShardIndex; -use tonic::transport::Channel; - use axum::Router; use axum::body::Body; use axum::extract::State; diff --git a/pgxn/neon/communicator/src/worker_process/main_loop.rs b/pgxn/neon/communicator/src/worker_process/main_loop.rs index e190193ae5..45b5635682 100644 --- a/pgxn/neon/communicator/src/worker_process/main_loop.rs +++ b/pgxn/neon/communicator/src/worker_process/main_loop.rs @@ -98,7 +98,7 @@ pub(super) async fn init( .integrated_cache_init_struct .worker_process_init(last_lsn, file_cache); - let mut request_tracker = ShardedRequestTracker::new(); + let request_tracker = ShardedRequestTracker::new(); request_tracker.update_shard_map(shard_map, None, tenant_id,