rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-04 20:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lints

Browse Source
This commit is contained in:
Erik Grinaker
2025-07-23 08:17:06 +02:00
parent c9758dc46b
commit f55ccd2c17
5 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/neon-shmem/benches/hmap_resize.rs
View File

@@ -188,14 +188,14 @@ fn real_benchs(c: &mut Criterion) {
let key: FileCacheKey = rng.random();
let val = FileCacheEntry::dummy();
let entry = writer.entry(key);
std::hint::black_box(match entry {
match entry {
Entry::Occupied(mut e) => {
e.insert(val);
std::hint::black_box(e.insert(val));
}
Entry::Vacant(e) => {
_ = e.insert(val).unwrap();
let _ = std::hint::black_box(e.insert(val).unwrap());
}
})
}
}
},
BatchSize::SmallInput,
@@ -220,12 +220,12 @@ fn real_benchs(c: &mut Criterion) {
let ideal_filled = 100_000_000;
let mut writer = hashbrown::raw::RawTable::new();
let mut rng = rand::rng();
let hasher = rustc_hash::FxBuildHasher::default();
let hasher = rustc_hash::FxBuildHasher;
unsafe {
writer
.resize(
size,
|(k, _)| hasher.hash_one(&k),
|(k, _)| hasher.hash_one(k),
hashbrown::raw::Fallibility::Infallible,
)
.unwrap();
@@ -234,7 +234,7 @@ fn real_benchs(c: &mut Criterion) {
let key: FileCacheKey = rng.random();
let val = FileCacheEntry::dummy();
writer.insert(hasher.hash_one(&key), (key, val), |(k, _)| {
hasher.hash_one(&k)
hasher.hash_one(k)
});
}
b.iter(|| unsafe {
@@ -282,12 +282,12 @@ fn real_benchs(c: &mut Criterion) {
let size = 125_000_000;
let mut writer = hashbrown::raw::RawTable::new();
let mut rng = rand::rng();
let hasher = rustc_hash::FxBuildHasher::default();
let hasher = rustc_hash::FxBuildHasher;
unsafe {
writer
.resize(
size,
|(k, _)| hasher.hash_one(&k),
|(k, _)| hasher.hash_one(k),
hashbrown::raw::Fallibility::Infallible,
)
.unwrap();
@@ -296,7 +296,7 @@ fn real_benchs(c: &mut Criterion) {
let key: FileCacheKey = rng.random();
let val = FileCacheEntry::dummy();
writer.insert(hasher.hash_one(&key), (key, val), |(k, _)| {
hasher.hash_one(&k)
hasher.hash_one(k)
});
}
b.iter(|| unsafe {

17
pgxn/neon/communicator/src/backend_interface.rs
View File

@@ -27,10 +27,7 @@ pub extern "C" fn rcommunicator_backend_init(
my_proc_number: i32,
) -> &'static mut CommunicatorBackendStruct<'static> {
if my_proc_number < 0 {
panic!(
"cannot attach to communicator shared memory with procnumber {}",
my_proc_number,
);
panic!("cannot attach to communicator shared memory with procnumber {my_proc_number}");
}
let integrated_cache = Box::leak(Box::new(cis.integrated_cache_init_struct.backend_init()));
@@ -155,10 +152,7 @@ pub extern "C" fn bcomm_get_request_slot_status(
// leave a slot in this state, so if it sees that,
// something's gone wrong and it's not clear what to do
// with it.
panic!(
"unexpected Filling state in request slot {}",
request_slot_idx
);
panic!("unexpected Filling state in request slot {request_slot_idx}");
}
NeonIORequestSlotState::Submitted => true,
NeonIORequestSlotState::Processing => true,
@@ -214,15 +208,18 @@ pub struct FileCacheIterator {
}
/// Iterate over LFC contents
#[allow(clippy::missing_safety_doc)]
#[unsafe(no_mangle)]
pub extern "C" fn bcomm_cache_iterate_begin(
pub unsafe extern "C" fn bcomm_cache_iterate_begin(
_bs: &mut CommunicatorBackendStruct,
iter: *mut FileCacheIterator,
) {
unsafe { (*iter).next_bucket = 0 };
}
#[allow(clippy::missing_safety_doc)]
#[unsafe(no_mangle)]
pub extern "C" fn bcomm_cache_iterate_next(
pub unsafe extern "C" fn bcomm_cache_iterate_next(
bs: &mut CommunicatorBackendStruct,
iter: *mut FileCacheIterator,
) -> bool {

2
pgxn/neon/communicator/src/worker_process/callbacks.rs
View File

@@ -19,7 +19,7 @@ unsafe extern "C" {
// package, but the code coverage build still builds these and tries to link with the
// external C code.)
#[cfg(test)]
unsafe fn notify_proc_unsafe(procno: std::ffi::c_int) {
unsafe fn notify_proc_unsafe(_procno: std::ffi::c_int) {
panic!("not usable in unit tests");
}
#[cfg(test)]

32
pgxn/neon/communicator/src/worker_process/main_loop.rs
View File

@@ -10,7 +10,7 @@ use crate::global_allocator::MyAllocatorCollector;
use crate::init::CommunicatorInitStruct;
use crate::integrated_cache::{CacheResult, IntegratedCacheWriteAccess};
use crate::neon_request::{CGetPageVRequest, CPrefetchVRequest};
use crate::neon_request::{NeonIORequest, NeonIOResult, INVALID_BLOCK_NUMBER};
use crate::neon_request::{INVALID_BLOCK_NUMBER, NeonIORequest, NeonIOResult};
use crate::worker_process::in_progress_ios::{RequestInProgressKey, RequestInProgressTable};
use crate::worker_process::lfc_metrics::LfcMetricsCollector;
use pageserver_client_grpc::{PageserverClient, ShardSpec, ShardStripeSize};
@@ -89,8 +89,9 @@ impl RequestTypeLabelGroup {
}
/// Launch the communicator process's Rust subsystems
#[allow(clippy::too_many_arguments)]
pub(super) fn init(
cis: Box<CommunicatorInitStruct>,
cis: CommunicatorInitStruct,
tenant_id: Option<&str>,
timeline_id: Option<&str>,
auth_token: Option<&str>,
@@ -201,7 +202,7 @@ impl<'t> CommunicatorWorkerProcessStruct<'t> {
) {
let client = self.client.as_ref().unwrap();
let shard_spec =
ShardSpec::new(new_shard_map, self.stripe_size.clone()).expect("invalid shard spec");
ShardSpec::new(new_shard_map, self.stripe_size).expect("invalid shard spec");
{
let _in_runtime = self.runtime.enter();
@@ -335,7 +336,8 @@ impl<'t> CommunicatorWorkerProcessStruct<'t> {
.as_ref()
.expect("cannot handle requests without client");
self.request_counters.inc(RequestTypeLabelGroup::from_req(request));
self.request_counters
.inc(RequestTypeLabelGroup::from_req(request));
match request {
NeonIORequest::Empty => {
error!("unexpected Empty IO request");
@@ -392,12 +394,10 @@ impl<'t> CommunicatorWorkerProcessStruct<'t> {
}
}
}
NeonIORequest::GetPageV(req) => {
match self.handle_get_pagev_request(req).await {
Ok(()) => NeonIOResult::GetPageV,
Err(errno) => NeonIOResult::Error(errno),
}
}
NeonIORequest::GetPageV(req) => match self.handle_get_pagev_request(req).await {
Ok(()) => NeonIOResult::GetPageV,
Err(errno) => NeonIOResult::Error(errno),
},
NeonIORequest::ReadSlruSegment(req) => {
let lsn = Lsn(req.request_lsn);
let file_path = req.destination_file_path();
@@ -427,7 +427,8 @@ impl<'t> CommunicatorWorkerProcessStruct<'t> {
}
}
NeonIORequest::PrefetchV(req) => {
self.request_nblocks_counters.inc_by(RequestTypeLabelGroup::from_req(request), req.nblocks as i64);
self.request_nblocks_counters
.inc_by(RequestTypeLabelGroup::from_req(request), req.nblocks as i64);
let req = *req;
tokio::spawn(async move { self.handle_prefetchv_request(&req).await });
NeonIOResult::PrefetchVLaunched
@@ -500,7 +501,8 @@ impl<'t> CommunicatorWorkerProcessStruct<'t> {
NeonIOResult::WriteOK
}
NeonIORequest::RelZeroExtend(req) => {
self.request_nblocks_counters.inc_by(RequestTypeLabelGroup::from_req(request), req.nblocks as i64);
self.request_nblocks_counters
.inc_by(RequestTypeLabelGroup::from_req(request), req.nblocks as i64);
// TODO: need to grab an io-in-progress lock for this? I guess not
// TODO: We could put the empty pages to the cache. Maybe have
@@ -756,8 +758,10 @@ where
use measured::metric::name::MetricName;
self.lfc_metrics.collect_group_into(enc)?;
self.request_counters.collect_family_into(MetricName::from_str("request_counters"), enc)?;
self.request_nblocks_counters.collect_family_into(MetricName::from_str("request_nblocks_counters"), enc)?;
self.request_counters
.collect_family_into(MetricName::from_str("request_counters"), enc)?;
self.request_nblocks_counters
.collect_family_into(MetricName::from_str("request_nblocks_counters"), enc)?;
// FIXME: allocator metrics

2
pgxn/neon/communicator/src/worker_process/worker_interface.rs
View File

@@ -82,7 +82,7 @@ pub extern "C" fn communicator_worker_process_launch(
// The `init` function does all the work.
let result = main_loop::init(
cis,
*cis,
tenant_id,
timeline_id,
auth_token,