Partial priority ordering

Author: Jamesbarford

database/src/lib.rs

@@ -801,24 +801,35 @@ pub struct ArtifactCollection {
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum BenchmarkRequestStatus {
-    WaitingForArtifacts,
-    WaitingForParent,
     InProgress,
     Completed,
+    ArtifactsReady,
+    WaitingForArtifacts,
 }
 
 impl fmt::Display for BenchmarkRequestStatus {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            BenchmarkRequestStatus::WaitingForArtifacts => write!(f, "waiting_for_artifacts"),
-            BenchmarkRequestStatus::WaitingForParent => write!(f, "waiting_for_parent"),
-            BenchmarkRequestStatus::InProgress => write!(f, "in_progress"),
             BenchmarkRequestStatus::Completed => write!(f, "completed"),
+            BenchmarkRequestStatus::InProgress => write!(f, "in_progress"),
+            BenchmarkRequestStatus::ArtifactsReady => write!(f, "artifacts_ready"),
+            BenchmarkRequestStatus::WaitingForArtifacts => write!(f, "waiting_for_artifacts"),
+        }
+    }
+}
+
+impl BenchmarkRequestStatus {
+    pub fn rank(&self) -> u8 {
+        match self {
+            BenchmarkRequestStatus::Completed => 0,
+            BenchmarkRequestStatus::InProgress => 1,
+            BenchmarkRequestStatus::ArtifactsReady => 2,
+            BenchmarkRequestStatus::WaitingForArtifacts => 3,
         }
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum BenchmarkRequestType {
     /// A Try commit
     Try {
@@ -876,7 +887,7 @@ impl fmt::Display for BenchmarkRequestType {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct BenchmarkRequest {
     pub commit_type: BenchmarkRequestType,
     pub created_at: DateTime<Utc>,

database/src/pool.rs

@@ -404,7 +404,7 @@ mod tests {
                 "parent-sha-1",
                 42,
                 time,
-                BenchmarkRequestStatus::WaitingForParent,
+                BenchmarkRequestStatus::ArtifactsReady,
                 "llvm",
                 "",
             );
@@ -414,15 +414,15 @@ mod tests {
                 "parent-sha-2",
                 32,
                 time,
-                BenchmarkRequestStatus::WaitingForParent,
+                BenchmarkRequestStatus::ArtifactsReady,
                 "cranelift",
                 "",
             );
 
             let release_benchmark_request = BenchmarkRequest::create_release(
                 "1.8.0",
                 time,
-                BenchmarkRequestStatus::WaitingForParent,
+                BenchmarkRequestStatus::ArtifactsReady,
                 "cranelift,llvm",
                 "",
             );
@@ -452,7 +452,7 @@ mod tests {
                 "parent-sha-1",
                 42,
                 time,
-                BenchmarkRequestStatus::WaitingForParent,
+                BenchmarkRequestStatus::ArtifactsReady,
                 "llvm",
                 "",
             );
@@ -470,7 +470,7 @@ mod tests {
             let release_benchmark_request = BenchmarkRequest::create_release(
                 "1.8.0",
                 time,
-                BenchmarkRequestStatus::WaitingForParent,
+                BenchmarkRequestStatus::ArtifactsReady,
                 "cranelift,llvm",
                 "",
             );
@@ -482,12 +482,13 @@ mod tests {
                 .await;
 
             let requests = db
-                .get_benchmark_requests_by_status(&[BenchmarkRequestStatus::WaitingForParent], None)
-                .await;
+                .get_benchmark_requests_by_status(&[BenchmarkRequestStatus::ArtifactsReady], None)
+                .await
+                .unwrap();
 
             assert_eq!(requests.len(), 2);
-            assert_eq!(requests[0].status, BenchmarkRequestStatus::WaitingForParent);
-            assert_eq!(requests[1].status, BenchmarkRequestStatus::WaitingForParent);
+            assert_eq!(requests[0].status, BenchmarkRequestStatus::ArtifactsReady);
+            assert_eq!(requests[1].status, BenchmarkRequestStatus::ArtifactsReady);
 
             Ok(ctx)
         })
@@ -509,7 +510,7 @@ mod tests {
                 "parent-sha-1",
                 42,
                 created_at,
-                BenchmarkRequestStatus::WaitingForParent,
+                BenchmarkRequestStatus::ArtifactsReady,
                 "llvm",
                 "",
             );
@@ -545,7 +546,7 @@ mod tests {
             let release_benchmark_request = BenchmarkRequest::create_release(
                 "1.8.0",
                 old_created_at,
-                BenchmarkRequestStatus::WaitingForParent,
+                BenchmarkRequestStatus::ArtifactsReady,
                 "cranelift,llvm",
                 "",
             );
@@ -563,15 +564,15 @@ mod tests {
             let requests = db
                 .get_benchmark_requests_by_status(
                     &[
-                        BenchmarkRequestStatus::WaitingForParent,
+                        BenchmarkRequestStatus::ArtifactsReady,
                         BenchmarkRequestStatus::InProgress,
                         BenchmarkRequestStatus::Completed,
                     ],
                     Some(cutoff_days),
                 )
                 .await;
 
-            assert_eq!(requests.len(), 3);
+            assert_eq!(requests?.len(), 3);
 
             Ok(ctx)
         })
@@ -590,7 +591,7 @@ mod tests {
                 "parent-sha-1",
                 42,
                 time,
-                BenchmarkRequestStatus::WaitingForParent,
+                BenchmarkRequestStatus::ArtifactsReady,
                 "llvm",
                 "",
             );
@@ -602,11 +603,13 @@ mod tests {
                 &master_benchmark_request,
                 BenchmarkRequestStatus::InProgress,
             )
-            .await;
+            .await
+            .unwrap();
 
             let requests = db
                 .get_benchmark_requests_by_status(&[BenchmarkRequestStatus::InProgress], None)
-                .await;
+                .await
+                .unwrap();
 
             assert_eq!(requests.len(), 1);
             assert_eq!(requests[0].tag(), master_benchmark_request.tag());

database/src/pool/postgres.rs

@@ -1582,7 +1582,7 @@ impl<'a> FromSql<'a> for BenchmarkRequestStatus {
 
         match s {
             "waiting_for_artifacts" => Ok(Self::WaitingForArtifacts),
-            "waiting_for_parent" => Ok(Self::WaitingForParent),
+            "artifacts_ready" => Ok(Self::ArtifactsReady),
             "in_progress" => Ok(Self::InProgress),
             "completed" => Ok(Self::Completed),
             other => Err(format!("unknown benchmark_request_status '{other}'").into()),