Merge pull request #2257 from Jamesbarford/fix/enqueue-job

Fix; enqueuing a job that has already been enqueued

Author: Kobzol

database/src/pool.rs

@@ -224,15 +224,16 @@ pub trait Connection: Send + Sync {
         commit_date: DateTime<Utc>,
     ) -> anyhow::Result<()>;
 
-    /// Add a benchmark job to the job queue and return its ID.
+    /// Add a benchmark job to the job queue and returns its ID, if it was not
+    /// already in the DB previously.
     async fn enqueue_benchmark_job(
         &self,
         request_tag: &str,
         target: Target,
         backend: CodegenBackend,
         profile: Profile,
         benchmark_set: u32,
-    ) -> anyhow::Result<u32>;
+    ) -> anyhow::Result<Option<u32>>;
 
     /// Add a benchmark job which is explicitly using a `parent_sha` we split
     /// this out to improve our error handling. A `parent_sha` may not have

database/src/pool/postgres.rs

@@ -1804,10 +1804,11 @@ where
         backend: CodegenBackend,
         profile: Profile,
         benchmark_set: u32,
-    ) -> anyhow::Result<u32> {
-        let row = self
+    ) -> anyhow::Result<Option<u32>> {
+        // This will return zero rows if the job already exists
+        let rows = self
             .conn()
-            .query_one(
+            .query(
                 r#"
             INSERT INTO job_queue(
                 request_tag,
@@ -1832,7 +1833,11 @@ where
             )
             .await
             .context("failed to insert benchmark_job")?;
-        Ok(row.get::<_, i32>(0) as u32)
+        if let Some(row) = rows.first() {
+            return Ok(Some(row.get::<_, i32>(0) as u32));
+        } else {
+            return Ok(None);
+        }
     }
 
     async fn get_compile_test_cases_with_measurements(

database/src/pool/sqlite.rs

@@ -1335,7 +1335,7 @@ impl Connection for SqliteConnection {
         _backend: CodegenBackend,
         _profile: Profile,
         _benchmark_set: u32,
-    ) -> anyhow::Result<u32> {
+    ) -> anyhow::Result<Option<u32>> {
         no_queue_implementation_abort!()
     }
 

database/src/tests/builder.rs

@@ -49,7 +49,7 @@ impl RequestBuilder {
                 )
                 .await
                 .unwrap();
-            self.jobs.push((job.clone(), id));
+            self.jobs.push((job.clone(), id.unwrap()));
         }
         self
     }