rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-06-04 05:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy

Browse Source
This commit is contained in:
John Spray
2023-08-16 17:11:00 +01:00
parent a0ed43cc12
commit bb3a59f275
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pageserver/src/deletion_queue.rs
View File

@@ -184,7 +184,7 @@ impl DeletionQueueClient {
tenant_id,
timeline_id,
layers: Vec::new(),
objects: objects,
objects,
}))
.await;
}
@@ -245,7 +245,7 @@ impl BackendQueueWorker {
DELETION_QUEUE_ERRORS
.with_label_values(&["failpoint"])
.inc();
return false;
false
});
if self.accumulator.is_empty() {
@@ -478,7 +478,7 @@ impl FrontendQueueWorker {
return;
}
match self.remote_storage.upload(source, size, &key, None).await {
match self.remote_storage.upload(source, size, key, None).await {
Ok(_) => {
info!(
"Stored deletion list {key} ({0}..{1})",

2
pageserver/src/http/routes.rs
View File

@@ -1138,7 +1138,7 @@ async fn deletion_queue_flush_execute(
) -> Result<Response<Body>, ApiError> {
let state = get_state(&r);
if let None = state.remote_storage {
if state.remote_storage.is_none() {
// Nothing to do if remote storage is disabled.
return json_response(StatusCode::OK, ());
}

2
pageserver/src/tenant/timeline.rs
View File

@@ -1266,7 +1266,7 @@ impl Timeline {
async fn delete_all_remote(&self) -> anyhow::Result<()> {
if let Some(remote_client) = &self.remote_client {
if let Some(deletion_queue_client) = &self.deletion_queue_client {
remote_client.delete_all(&deletion_queue_client).await
remote_client.delete_all(deletion_queue_client).await
} else {
Ok(())
}