File tree Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -1096,7 +1096,7 @@ impl Connection for SqliteConnection {
1096
1096
"
1097
1097
select
1098
1098
step,
1099
- end_time is not null,
1099
+ end is not null,
1100
1100
coalesce(end, strftime('%s', 'now')) - start,
1101
1101
(select end - start
1102
1102
from collector_progress as cp
@@ -1114,8 +1114,8 @@ impl Connection for SqliteConnection {
1114
1114
Ok ( crate :: Step {
1115
1115
name : row. get ( 0 ) ?,
1116
1116
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 ) ,
1119
1119
} )
1120
1120
} )
1121
1121
. unwrap ( )
Original file line number Diff line number Diff line change @@ -454,12 +454,11 @@ fn sort_queue(
454
454
let level_len = partition_in_place ( unordered_queue[ finished..] . iter_mut ( ) , |( _, mr) | {
455
455
mr. parent_sha ( ) . map_or ( true , |parent| done. contains ( parent) )
456
456
} ) ;
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
+
463
462
let level = & mut unordered_queue[ finished..] [ ..level_len] ;
464
463
level. sort_unstable_by_key ( |( c, mr) | {
465
464
(
You can’t perform that action at this time.
0 commit comments