diff --git a/pageserver/src/tenant/blob_io.rs b/pageserver/src/tenant/blob_io.rs index cee3c1b824..bd8a68639a 100644 --- a/pageserver/src/tenant/blob_io.rs +++ b/pageserver/src/tenant/blob_io.rs @@ -193,9 +193,9 @@ impl BlobWriter { const CAPACITY: usize = 64 * 1024; - /// Writes the given buffer directly to the underlying `VirtualFile`. - /// You need to make sure that the internal buffer is empty, otherwise - /// data will be written in wrong order. + // /// Writes the given buffer directly to the underlying `VirtualFile`. + // /// You need to make sure that the internal buffer is empty, otherwise + // /// data will be written in wrong order. // #[inline(always)] // async fn write_all_unbuffered( // &mut self, @@ -244,7 +244,6 @@ impl BlobWriter { .await .map(|len| { self.offset += len as u64; - () }); (src_buf, res) diff --git a/pageserver/src/tenant/storage_layer/batch_split_writer.rs b/pageserver/src/tenant/storage_layer/batch_split_writer.rs index d997abbce9..67e18350fc 100644 --- a/pageserver/src/tenant/storage_layer/batch_split_writer.rs +++ b/pageserver/src/tenant/storage_layer/batch_split_writer.rs @@ -165,6 +165,7 @@ pub struct SplitImageLayerWriter { } impl SplitImageLayerWriter { + #[allow(clippy::too_many_arguments)] pub async fn new( conf: &'static PageServerConf, timeline_id: TimelineId, @@ -183,7 +184,7 @@ impl SplitImageLayerWriter { tenant_shard_id, &(start_key..Key::MAX), lsn, - &gate, + gate, ctx, ) .await?, @@ -216,7 +217,7 @@ impl SplitImageLayerWriter { self.tenant_shard_id, &(key..Key::MAX), self.lsn, - &gate, + gate, ctx, ) .await?; @@ -323,7 +324,7 @@ impl SplitDeltaLayerWriter { self.tenant_shard_id, key, self.lsn_range.clone(), - &gate, + gate, ctx, ) .await?, @@ -342,7 +343,7 @@ impl SplitDeltaLayerWriter { self.tenant_shard_id, key, self.lsn_range.clone(), - &gate, + gate, ctx, ) .await?; diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs index 9eb5124f67..44a0ded44b 100644 --- a/pageserver/src/tenant/storage_layer/delta_layer.rs +++ b/pageserver/src/tenant/storage_layer/delta_layer.rs @@ -423,7 +423,7 @@ impl DeltaLayerWriterInner { let file = Arc::new(VirtualFile::create(&path, ctx).await?); // Start at PAGE_SZ, make room for the header block - let blob_writer = BlobWriter::new(file, PAGE_SZ as u64, &gate, ctx)?; + let blob_writer = BlobWriter::new(file, PAGE_SZ as u64, gate, ctx)?; // Initialize the b-tree index builder let block_buf = BlockBuf::new(); diff --git a/pageserver/src/tenant/storage_layer/image_layer.rs b/pageserver/src/tenant/storage_layer/image_layer.rs index 8ca2a5c84c..a42637324a 100644 --- a/pageserver/src/tenant/storage_layer/image_layer.rs +++ b/pageserver/src/tenant/storage_layer/image_layer.rs @@ -771,7 +771,7 @@ impl ImageLayerWriterInner { }; // Start at `PAGE_SZ` to make room for the header block. - let blob_writer = BlobWriter::new(file, PAGE_SZ as u64, &gate, ctx)?; + let blob_writer = BlobWriter::new(file, PAGE_SZ as u64, gate, ctx)?; // Initialize the b-tree index builder let block_buf = BlockBuf::new(); @@ -996,7 +996,7 @@ impl ImageLayerWriter { tenant_shard_id, key_range, lsn, - &gate, + gate, ctx, ) .await?, diff --git a/pageserver/src/tenant/storage_layer/inmemory_layer.rs b/pageserver/src/tenant/storage_layer/inmemory_layer.rs index d54d51ceda..a353bf564d 100644 --- a/pageserver/src/tenant/storage_layer/inmemory_layer.rs +++ b/pageserver/src/tenant/storage_layer/inmemory_layer.rs @@ -758,7 +758,7 @@ impl InMemoryLayer { self.tenant_shard_id, Key::MIN, self.start_lsn..end_lsn, - &gate, + gate, ctx, ) .await?; diff --git a/pageserver/src/tenant/timeline/compaction.rs b/pageserver/src/tenant/timeline/compaction.rs index 0b88333ade..2dd0a04553 100644 --- a/pageserver/src/tenant/timeline/compaction.rs +++ b/pageserver/src/tenant/timeline/compaction.rs @@ -154,30 +154,30 @@ impl KeyHistoryRetention { }; stat.produce_image_key(img); if let Some(image_writer) = image_writer.as_mut() { - image_writer.put_image(key, img.clone(), &gate, ctx).await?; + image_writer.put_image(key, img.clone(), gate, ctx).await?; } else { delta_writer - .put_value(key, cutoff_lsn, Value::Image(img.clone()), &gate, ctx) + .put_value(key, cutoff_lsn, Value::Image(img.clone()), gate, ctx) .await?; } } else { for (lsn, val) in logs { stat.produce_key(&val); - delta_writer.put_value(key, lsn, val, &gate, ctx).await?; + delta_writer.put_value(key, lsn, val, gate, ctx).await?; } } first_batch = false; } else { for (lsn, val) in logs { stat.produce_key(&val); - delta_writer.put_value(key, lsn, val, &gate, ctx).await?; + delta_writer.put_value(key, lsn, val, gate, ctx).await?; } } } let KeyLogAtLsn(above_horizon_logs) = self.above_horizon; for (lsn, val) in above_horizon_logs { stat.produce_key(&val); - delta_writer.put_value(key, lsn, val, &gate, ctx).await?; + delta_writer.put_value(key, lsn, val, gate, ctx).await?; } Ok(()) } diff --git a/pageserver/src/virtual_file/owned_buffers_io/aligned_buffer/raw.rs b/pageserver/src/virtual_file/owned_buffers_io/aligned_buffer/raw.rs index 6a3485d947..6c26dec0db 100644 --- a/pageserver/src/virtual_file/owned_buffers_io/aligned_buffer/raw.rs +++ b/pageserver/src/virtual_file/owned_buffers_io/aligned_buffer/raw.rs @@ -61,10 +61,6 @@ impl RawAlignedBuffer> { align, } } - - pub const fn const_align() -> usize { - A - } } impl RawAlignedBuffer {