Skip to content

Commit d1273ef

Browse files
KobzolKobzol
committed
Fix tests
1 parent da8bcbd commit d1273ef

File tree

5 files changed

+50
-41
lines changed

5 files changed

+50
-41
lines changed

‎database/src/lib.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,6 +1096,12 @@ impl fmt::Display for BenchmarkJobStatus {
10961096
#[derive(Debug, Copy, Clone, PartialEq)]
10971097
pub struct BenchmarkSet(u32);
10981098

1099+
impl BenchmarkSet {
1100+
pub fn new(id: u32) -> Self {
1101+
Self(id)
1102+
}
1103+
}
1104+
10991105
/// A single unit of work generated from a benchmark request. Split by profiles
11001106
/// and backends
11011107
///

‎database/src/pool.rs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ pub trait Connection: Send + Sync {
269269
async fn mark_benchmark_job_as_completed(
270270
&self,
271271
id: u32,
272-
benchmark_job_conculsion: &BenchmarkJobConclusion,
272+
benchmark_job_conculsion: BenchmarkJobConclusion,
273273
) -> anyhow::Result<()>;
274274
}
275275

@@ -411,29 +411,29 @@ mod tests {
411411
request_tag: &str,
412412
collector_name: &str,
413413
benchmark_set: u32,
414-
target: &Target,
414+
target: Target,
415415
) {
416416
/* Create job for the request */
417417
db.enqueue_benchmark_job(
418418
request_tag,
419-
&target,
420-
&CodegenBackend::Llvm,
421-
&Profile::Opt,
419+
target,
420+
CodegenBackend::Llvm,
421+
Profile::Opt,
422422
benchmark_set,
423423
)
424424
.await
425425
.unwrap();
426426

427-
let job = db
428-
.dequeue_benchmark_job(collector_name, &target, &BenchmarkSet(benchmark_set))
427+
let (job, _) = db
428+
.dequeue_benchmark_job(collector_name, target, BenchmarkSet(benchmark_set))
429429
.await
430430
.unwrap()
431431
.unwrap();
432432

433433
assert_eq!(job.request_tag(), request_tag);
434434

435435
/* Mark the job as complete */
436-
db.mark_benchmark_job_as_completed(job.id(), &BenchmarkJobConclusion::Success)
436+
db.mark_benchmark_job_as_completed(job.id(), BenchmarkJobConclusion::Success)
437437
.await
438438
.unwrap();
439439

@@ -533,18 +533,18 @@ mod tests {
533533
async fn multiple_non_completed_try_requests() {
534534
run_postgres_test(|ctx| async {
535535
let db = ctx.db_client().connection().await;
536-
let target = &Target::X86_64UnknownLinuxGnu;
536+
let target = Target::X86_64UnknownLinuxGnu;
537537
let collector_name = "collector-1";
538538
let benchmark_set = 1;
539539

540-
db.add_collector_config(collector_name, &target, benchmark_set, true)
540+
db.add_collector_config(collector_name, target, benchmark_set, true)
541541
.await
542542
.unwrap();
543543

544544
// Complete parent
545545
let parent = BenchmarkRequest::create_release("sha-parent-1", Utc::now());
546546
// Complete
547-
let req_a = BenchmarkRequest::create_try_without_artifacts(42, Utc::now(), "", "");
547+
let req_a = BenchmarkRequest::create_try_without_artifacts(42, "", "");
548548
// WaitingForArtifacts
549549
let req_b = BenchmarkRequest::create_try_without_artifacts(42, "", "");
550550
let req_c = BenchmarkRequest::create_try_without_artifacts(42, "", "");
@@ -555,8 +555,8 @@ mod tests {
555555
.await
556556
.unwrap();
557557

558-
complete_request(&*db, "sha-parent-1", collector_name, benchmark_set, &target).await;
559-
complete_request(&*db, "sha1", collector_name, benchmark_set, &target).await;
558+
complete_request(&*db, "sha-parent-1", collector_name, benchmark_set, target).await;
559+
complete_request(&*db, "sha1", collector_name, benchmark_set, target).await;
560560

561561
// This should be fine, req_a was completed
562562
db.insert_benchmark_request(&req_b).await.unwrap();
@@ -605,11 +605,11 @@ mod tests {
605605
run_postgres_test(|ctx| async {
606606
let db = ctx.db_client().connection().await;
607607
let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
608-
let target = &Target::X86_64UnknownLinuxGnu;
608+
let target = Target::X86_64UnknownLinuxGnu;
609609
let collector_name = "collector-1";
610610
let benchmark_set = 1;
611611

612-
db.add_collector_config(collector_name, &target, benchmark_set, true)
612+
db.add_collector_config(collector_name, target, benchmark_set, true)
613613
.await
614614
.unwrap();
615615

@@ -628,7 +628,7 @@ mod tests {
628628
db.insert_benchmark_request(req).await.unwrap();
629629
}
630630

631-
complete_request(&*db, "1.79.0", collector_name, benchmark_set, &target).await;
631+
complete_request(&*db, "1.79.0", collector_name, benchmark_set, target).await;
632632

633633
db.update_benchmark_request_status("sha-2", BenchmarkRequestStatus::InProgress)
634634
.await
@@ -911,7 +911,7 @@ mod tests {
911911
let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
912912

913913
let insert_result = db
914-
.add_collector_config("collector-1", &Target::X86_64UnknownLinuxGnu, 1, true)
914+
.add_collector_config("collector-1", Target::X86_64UnknownLinuxGnu, 1, true)
915915
.await;
916916
assert!(insert_result.is_ok());
917917

@@ -942,7 +942,7 @@ mod tests {
942942
let target = Target::X86_64UnknownLinuxGnu;
943943

944944
let insert_result = db
945-
.add_collector_config(collector_name, &target, 1, true)
945+
.add_collector_config(collector_name, target, 1, true)
946946
.await;
947947
assert!(insert_result.is_ok());
948948

@@ -955,24 +955,24 @@ mod tests {
955955
/* Create job for the request */
956956
db.enqueue_benchmark_job(
957957
benchmark_request.tag().unwrap(),
958-
&target,
959-
&CodegenBackend::Llvm,
960-
&Profile::Opt,
958+
target,
959+
CodegenBackend::Llvm,
960+
Profile::Opt,
961961
benchmark_set.0,
962962
)
963963
.await
964964
.unwrap();
965965

966-
let job = db
967-
.dequeue_benchmark_job(collector_name, &target, &benchmark_set)
966+
let (job, _) = db
967+
.dequeue_benchmark_job(collector_name, target, benchmark_set)
968968
.await
969969
.unwrap()
970970
.unwrap();
971971

972972
assert_eq!(job.request_tag(), benchmark_request.tag().unwrap());
973973

974974
/* Mark the job as complete */
975-
db.mark_benchmark_job_as_completed(job.id(), &BenchmarkJobConclusion::Success)
975+
db.mark_benchmark_job_as_completed(job.id(), BenchmarkJobConclusion::Success)
976976
.await
977977
.unwrap();
978978

‎database/src/pool/postgres.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,7 +1870,7 @@ where
18701870
picked
18711871
WHERE
18721872
job_queue.id = picked.id
1873-
RETURNING *
1873+
RETURNING job_queue.*
18741874
)
18751875
SELECT
18761876
updated.id,
@@ -1912,7 +1912,7 @@ where
19121912
started_at: row.get::<_, DateTime<Utc>>(5),
19131913
collector_name: collector_name.into(),
19141914
},
1915-
retry: row.get::<_, i32>(6) as u32,
1915+
deque_counter: row.get::<_, i32>(6) as u32,
19161916
};
19171917
let commit_type = row.get::<_, &str>(7);
19181918
let commit_date = row.get::<_, Option<DateTime<Utc>>>(8);
@@ -1999,7 +1999,7 @@ where
19991999
async fn mark_benchmark_job_as_completed(
20002000
&self,
20012001
id: u32,
2002-
benchmark_job_conclusion: &BenchmarkJobConclusion,
2002+
conclusion: BenchmarkJobConclusion,
20032003
) -> anyhow::Result<()> {
20042004
self.conn()
20052005
.execute(
@@ -2011,7 +2011,7 @@ where
20112011
completed_at = NOW()
20122012
WHERE
20132013
id = $2",
2014-
&[&benchmark_job_conclusion.as_str(), &(id as i32)],
2014+
&[&conclusion.as_str(), &(id as i32)],
20152015
)
20162016
.await
20172017
.context("Failed to mark benchmark job as completed")?;

‎database/src/pool/sqlite.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ impl Connection for SqliteConnection {
13651365
async fn mark_benchmark_job_as_completed(
13661366
&self,
13671367
_id: u32,
1368-
_benchmark_job_conculsion: &BenchmarkJobConclusion,
1368+
_benchmark_job_conculsion: BenchmarkJobConclusion,
13691369
) -> anyhow::Result<()> {
13701370
no_queue_implementation_abort!()
13711371
}

‎site/src/job_queue/mod.rs‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,10 @@ mod tests {
308308
use crate::job_queue::build_queue;
309309
use chrono::Utc;
310310
use database::tests::run_postgres_test;
311-
use database::{BenchmarkRequest, BenchmarkRequestStatus};
311+
use database::{
312+
BenchmarkJobConclusion, BenchmarkRequest, BenchmarkRequestStatus, BenchmarkSet,
313+
CodegenBackend, Profile, Target,
314+
};
312315

313316
fn create_master(sha: &str, parent: &str, pr: u32) -> BenchmarkRequest {
314317
BenchmarkRequest::create_master(sha, parent, pr, Utc::now())
@@ -336,29 +339,29 @@ mod tests {
336339
request_tag: &str,
337340
collector_name: &str,
338341
benchmark_set: u32,
339-
target: &Target,
342+
target: Target,
340343
) {
341344
/* Create job for the request */
342345
db.enqueue_benchmark_job(
343346
request_tag,
344-
&target,
345-
&CodegenBackend::Llvm,
346-
&Profile::Opt,
347+
target,
348+
CodegenBackend::Llvm,
349+
Profile::Opt,
347350
benchmark_set,
348351
)
349352
.await
350353
.unwrap();
351354

352-
let job = db
353-
.dequeue_benchmark_job(collector_name, &target, &BenchmarkSet(benchmark_set))
355+
let (job, _) = db
356+
.dequeue_benchmark_job(collector_name, target, BenchmarkSet::new(benchmark_set))
354357
.await
355358
.unwrap()
356359
.unwrap();
357360

358361
assert_eq!(job.request_tag(), request_tag);
359362

360363
/* Mark the job as complete */
361-
db.mark_benchmark_job_as_completed(job.id(), &BenchmarkJobConclusion::Success)
364+
db.mark_benchmark_job_as_completed(job.id(), BenchmarkJobConclusion::Success)
362365
.await
363366
.unwrap();
364367

@@ -375,7 +378,7 @@ mod tests {
375378
shas: &[&str],
376379
collector_name: &str,
377380
benchmark_set: u32,
378-
target: &database::Target,
381+
target: database::Target,
379382
) {
380383
for sha in shas {
381384
complete_request(conn, sha, collector_name, benchmark_set, target).await;
@@ -394,11 +397,11 @@ mod tests {
394397
async fn queue_ordering() {
395398
run_postgres_test(|ctx| async {
396399
let db = ctx.db_client().connection().await;
397-
let target = &Target::X86_64UnknownLinuxGnu;
400+
let target = Target::X86_64UnknownLinuxGnu;
398401
let collector_name = "collector-1";
399402
let benchmark_set = 1;
400403

401-
db.add_collector_config(collector_name, &target, benchmark_set, true)
404+
db.add_collector_config(collector_name, target, benchmark_set, true)
402405
.await
403406
.unwrap();
404407
/* Key:
@@ -488,7 +491,7 @@ mod tests {
488491
&["bar", "345", "aaa", "rrr"],
489492
collector_name,
490493
benchmark_set,
491-
&target,
494+
target,
492495
)
493496
.await;
494497

0 commit comments

Comments
 (0)