Skip to content

Commit 9863980

Browse files
committed
PR Feedback; don't mutate the benchmark_request in memory & fix a typo in the query
1 parent 350fc9e commit 9863980

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

database/src/pool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ pub trait Connection: Send + Sync {
258258
/// it has been marked as completed else `false` meaning there was no change
259259
async fn mark_benchmark_request_as_completed(
260260
&self,
261-
benchmark_request: &mut BenchmarkRequest,
261+
benchmark_request: &BenchmarkRequest,
262262
) -> anyhow::Result<bool>;
263263
}
264264

database/src/pool/postgres.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1891,7 +1891,7 @@ where
18911891

18921892
async fn mark_benchmark_request_as_completed(
18931893
&self,
1894-
benchmark_request: &mut BenchmarkRequest,
1894+
benchmark_request: &BenchmarkRequest,
18951895
) -> anyhow::Result<bool> {
18961896
anyhow::ensure!(
18971897
benchmark_request.tag().is_some(),
@@ -1914,7 +1914,7 @@ where
19141914
status = $1,
19151915
completed_at = NOW()
19161916
WHERE
1917-
banchmark_request.tag = $2
1917+
benchmark_request.tag = $2
19181918
AND benchmark_request.status != $1
19191919
AND NOT EXISTS (
19201920
SELECT
@@ -1957,8 +1957,6 @@ where
19571957
// presence to determine if the request was marked as completed
19581958
if let Some(row) = row {
19591959
let completed_at = row.get::<_, DateTime<Utc>>(0);
1960-
// Also mutate our object
1961-
benchmark_request.status = BenchmarkRequestStatus::Completed { completed_at };
19621960
Ok(true)
19631961
} else {
19641962
Ok(false)

database/src/pool/sqlite.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,7 @@ impl Connection for SqliteConnection {
13561356

13571357
async fn mark_benchmark_request_as_completed(
13581358
&self,
1359-
_benchmark_request: &mut BenchmarkRequest,
1359+
_benchmark_request: &BenchmarkRequest,
13601360
) -> anyhow::Result<bool> {
13611361
no_queue_implementation_abort!()
13621362
}

site/src/job_queue/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,17 +246,14 @@ async fn try_enqueue_next_benchmark_request(
246246
let queue = build_queue(conn, index).await?;
247247

248248
#[allow(clippy::never_loop)]
249-
for mut request in queue {
249+
for request in queue {
250250
match request.status() {
251251
BenchmarkRequestStatus::ArtifactsReady => {
252252
enqueue_benchmark_request(conn, &request).await?;
253253
break;
254254
}
255255
BenchmarkRequestStatus::InProgress => {
256-
if conn
257-
.mark_benchmark_request_as_completed(&mut request)
258-
.await?
259-
{
256+
if conn.mark_benchmark_request_as_completed(&request).await? {
260257
index.add_tag(request.tag().unwrap());
261258
continue;
262259
}

0 commit comments

Comments
 (0)