Skip to content

Commit a5e79f8

Browse files
authored
Merge pull request #1831 from s7tya/allow-no-current-builds
To allow the `/perf/status_page` to run even if the current collection is empty
2 parents c8960a1 + 350eabd commit a5e79f8

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

database/src/pool/sqlite.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ impl Connection for SqliteConnection {
10961096
"
10971097
select
10981098
step,
1099-
end_time is not null,
1099+
end is not null,
11001100
coalesce(end, strftime('%s', 'now')) - start,
11011101
(select end - start
11021102
from collector_progress as cp
@@ -1114,8 +1114,8 @@ impl Connection for SqliteConnection {
11141114
Ok(crate::Step {
11151115
name: row.get(0)?,
11161116
is_done: row.get(1)?,
1117-
duration: Duration::from_secs(row.get::<_, i64>(2)? as u64),
1118-
expected: Duration::from_secs(row.get::<_, i64>(3)? as u64),
1117+
duration: Duration::from_secs(row.get::<_, i64>(2).unwrap_or_default() as u64),
1118+
expected: Duration::from_secs(row.get::<_, i64>(3).unwrap_or_default() as u64),
11191119
})
11201120
})
11211121
.unwrap()

site/src/load.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,12 +454,11 @@ fn sort_queue(
454454
let level_len = partition_in_place(unordered_queue[finished..].iter_mut(), |(_, mr)| {
455455
mr.parent_sha().map_or(true, |parent| done.contains(parent))
456456
});
457-
assert!(
458-
level_len != 0,
459-
"at least one commit is ready done={:#?}, {:?}",
460-
done,
461-
&unordered_queue[finished..]
462-
);
457+
458+
if level_len == 0 {
459+
return vec![];
460+
}
461+
463462
let level = &mut unordered_queue[finished..][..level_len];
464463
level.sort_unstable_by_key(|(c, mr)| {
465464
(

0 commit comments

Comments
 (0)