worker/jobs/rss: Run test setup queries concurrently (#9663)

Turbo87 · web-flow · commit 858012946394 · 2024-10-15T16:51:27.000+02:00
diff --git a/src/worker/jobs/rss/sync_crate_feed.rs b/src/worker/jobs/rss/sync_crate_feed.rs
@@ -180,7 +180,10 @@ mod tests {
     use chrono::NaiveDateTime;
     use crates_io_test_db::TestDatabase;
     use diesel_async::AsyncConnection;
+    use futures_util::future::join_all;
     use insta::assert_debug_snapshot;
+    use std::borrow::Cow;
+    use std::future::Future;
 
     #[tokio::test]
     async fn test_load_version_updates() {
@@ -197,32 +200,39 @@ mod tests {
         let foo = create_crate(&mut conn, "foo").await;
 
         // If there are less than NUM_ITEMS versions, they should all be returned
-        create_version(&mut conn, foo, "1.0.0", now - Duration::days(123)).await;
-        create_version(&mut conn, foo, "1.0.1", now - Duration::days(110)).await;
-        create_version(&mut conn, foo, "1.1.0", now - Duration::days(100)).await;
-        create_version(&mut conn, foo, "1.2.0", now - Duration::days(90)).await;
+        let futures = [
+            create_version(&mut conn, foo, "1.0.0", now - Duration::days(123)),
+            create_version(&mut conn, foo, "1.0.1", now - Duration::days(110)),
+            create_version(&mut conn, foo, "1.1.0", now - Duration::days(100)),
+            create_version(&mut conn, foo, "1.2.0", now - Duration::days(90)),
+        ];
+        join_all(futures).await;
 
         let updates = assert_ok!(load_version_updates("foo", &mut conn).await);
         assert_eq!(updates.len(), 4);
         assert_debug_snapshot!(updates.iter().map(|u| &u.version).collect::<Vec<_>>());
 
         // If there are more than NUM_ITEMS versions, only the most recent NUM_ITEMS should be returned
+        let mut futures = Vec::new();
         for i in 1..=NUM_ITEMS {
             let version = format!("1.2.{i}");
             let publish_time = now - Duration::days(90) + Duration::hours(i);
-            create_version(&mut conn, foo, &version, publish_time).await;
+            futures.push(create_version(&mut conn, foo, version, publish_time));
         }
+        join_all(futures).await;
 
         let updates = assert_ok!(load_version_updates("foo", &mut conn).await);
         assert_eq!(updates.len() as i64, NUM_ITEMS);
         assert_debug_snapshot!(updates.iter().map(|u| &u.version).collect::<Vec<_>>());
 
         // But if there are more than NUM_ITEMS versions that are younger than ALWAYS_INCLUDE_AGE, all of them should be returned
+        let mut futures = Vec::new();
         for i in 1..=(NUM_ITEMS + 10) {
             let version = format!("1.3.{i}");
             let publish_time = now - Duration::minutes(30) + Duration::seconds(i);
-            create_version(&mut conn, foo, &version, publish_time).await;
+            futures.push(create_version(&mut conn, foo, version, publish_time));
         }
+        join_all(futures).await;
 
         let updates = assert_ok!(load_version_updates("foo", &mut conn).await);
         assert_eq!(updates.len() as i64, NUM_ITEMS + 10);
@@ -238,23 +248,23 @@ mod tests {
             .unwrap()
     }
 
-    async fn create_version(
+    fn create_version(
         conn: &mut AsyncPgConnection,
         crate_id: i32,
-        version: &str,
+        version: impl Into<Cow<'static, str>>,
         publish_time: NaiveDateTime,
-    ) -> i32 {
-        diesel::insert_into(versions::table)
+    ) -> impl Future<Output = i32> {
+        let future = diesel::insert_into(versions::table)
             .values((
                 versions::crate_id.eq(crate_id),
-                versions::num.eq(version),
+                versions::num.eq(version.into()),
                 versions::created_at.eq(publish_time),
                 versions::updated_at.eq(publish_time),
                 versions::checksum.eq("checksum"),
             ))
             .returning(versions::id)
-            .get_result(conn)
-            .await
-            .unwrap()
+            .get_result(conn);
+
+        async move { future.await.unwrap() }
     }
 }
diff --git a/src/worker/jobs/rss/sync_crates_feed.rs b/src/worker/jobs/rss/sync_crates_feed.rs
@@ -158,7 +158,10 @@ mod tests {
     use chrono::NaiveDateTime;
     use crates_io_test_db::TestDatabase;
     use diesel_async::{AsyncConnection, AsyncPgConnection};
+    use futures_util::future::join_all;
     use insta::assert_debug_snapshot;
+    use std::borrow::Cow;
+    use std::future::Future;
 
     #[tokio::test]
     async fn test_load_version_updates() {
@@ -173,52 +176,59 @@ mod tests {
         assert_eq!(new_crates.len(), 0);
 
         // If there are less than NUM_ITEMS crates, they should all be returned
-        create_crate(&mut conn, "foo", now - Duration::days(123)).await;
-        create_crate(&mut conn, "bar", now - Duration::days(110)).await;
-        create_crate(&mut conn, "baz", now - Duration::days(100)).await;
-        create_crate(&mut conn, "qux", now - Duration::days(90)).await;
+        let futures = [
+            create_crate(&mut conn, "foo", now - Duration::days(123)),
+            create_crate(&mut conn, "bar", now - Duration::days(110)),
+            create_crate(&mut conn, "baz", now - Duration::days(100)),
+            create_crate(&mut conn, "qux", now - Duration::days(90)),
+        ];
+        join_all(futures).await;
 
         let new_crates = assert_ok!(load_new_crates(&mut conn).await);
         assert_eq!(new_crates.len(), 4);
         assert_debug_snapshot!(new_crates.iter().map(|u| &u.name).collect::<Vec<_>>());
 
         // If there are more than NUM_ITEMS crates, only the most recent NUM_ITEMS should be returned
+        let mut futures = Vec::new();
         for i in 1..=NUM_ITEMS {
             let name = format!("crate-{i}");
             let publish_time = now - Duration::days(90) + Duration::hours(i);
-            create_crate(&mut conn, &name, publish_time).await;
+            futures.push(create_crate(&mut conn, name, publish_time));
         }
+        join_all(futures).await;
 
         let new_crates = assert_ok!(load_new_crates(&mut conn).await);
         assert_eq!(new_crates.len() as i64, NUM_ITEMS);
         assert_debug_snapshot!(new_crates.iter().map(|u| &u.name).collect::<Vec<_>>());
 
         // But if there are more than NUM_ITEMS crates that are younger than ALWAYS_INCLUDE_AGE, all of them should be returned
+        let mut futures = Vec::new();
         for i in 1..=(NUM_ITEMS + 10) {
             let name = format!("other-crate-{i}");
             let publish_time = now - Duration::minutes(30) + Duration::seconds(i);
-            create_crate(&mut conn, &name, publish_time).await;
+            futures.push(create_crate(&mut conn, name, publish_time));
         }
+        join_all(futures).await;
 
         let new_crates = assert_ok!(load_new_crates(&mut conn).await);
         assert_eq!(new_crates.len() as i64, NUM_ITEMS + 10);
         assert_debug_snapshot!(new_crates.iter().map(|u| &u.name).collect::<Vec<_>>());
     }
 
-    async fn create_crate(
+    fn create_crate(
         conn: &mut AsyncPgConnection,
-        name: &str,
+        name: impl Into<Cow<'static, str>>,
         publish_time: NaiveDateTime,
-    ) -> i32 {
-        diesel::insert_into(crates::table)
+    ) -> impl Future<Output = i32> {
+        let future = diesel::insert_into(crates::table)
             .values((
-                crates::name.eq(name),
+                crates::name.eq(name.into()),
                 crates::created_at.eq(publish_time),
                 crates::updated_at.eq(publish_time),
             ))
             .returning(crates::id)
-            .get_result(conn)
-            .await
-            .unwrap()
+            .get_result(conn);
+
+        async move { future.await.unwrap() }
     }
 }
diff --git a/src/worker/jobs/rss/sync_updates_feed.rs b/src/worker/jobs/rss/sync_updates_feed.rs
@@ -174,7 +174,10 @@ mod tests {
     use chrono::NaiveDateTime;
     use crates_io_test_db::TestDatabase;
     use diesel_async::AsyncConnection;
+    use futures_util::future::join_all;
     use insta::assert_debug_snapshot;
+    use std::borrow::Cow;
+    use std::future::Future;
 
     #[tokio::test]
     async fn test_load_version_updates() {
@@ -191,32 +194,39 @@ mod tests {
         let foo = create_crate(&mut conn, "foo").await;
 
         // If there are less than NUM_ITEMS versions, they should all be returned
-        create_version(&mut conn, foo, "1.0.0", now - Duration::days(123)).await;
-        create_version(&mut conn, foo, "1.0.1", now - Duration::days(110)).await;
-        create_version(&mut conn, foo, "1.1.0", now - Duration::days(100)).await;
-        create_version(&mut conn, foo, "1.2.0", now - Duration::days(90)).await;
+        let futures = [
+            create_version(&mut conn, foo, "1.0.0", now - Duration::days(123)),
+            create_version(&mut conn, foo, "1.0.1", now - Duration::days(110)),
+            create_version(&mut conn, foo, "1.1.0", now - Duration::days(100)),
+            create_version(&mut conn, foo, "1.2.0", now - Duration::days(90)),
+        ];
+        join_all(futures).await;
 
         let updates = assert_ok!(load_version_updates(&mut conn).await);
         assert_eq!(updates.len(), 4);
         assert_debug_snapshot!(updates.iter().map(|u| &u.version).collect::<Vec<_>>());
 
         // If there are more than NUM_ITEMS versions, only the most recent NUM_ITEMS should be returned
+        let mut futures = Vec::new();
         for i in 1..=NUM_ITEMS {
             let version = format!("1.2.{i}");
             let publish_time = now - Duration::days(90) + Duration::hours(i);
-            create_version(&mut conn, foo, &version, publish_time).await;
+            futures.push(create_version(&mut conn, foo, version, publish_time));
         }
+        join_all(futures).await;
 
         let updates = assert_ok!(load_version_updates(&mut conn).await);
         assert_eq!(updates.len() as i64, NUM_ITEMS);
         assert_debug_snapshot!(updates.iter().map(|u| &u.version).collect::<Vec<_>>());
 
         // But if there are more than NUM_ITEMS versions that are younger than ALWAYS_INCLUDE_AGE, all of them should be returned
+        let mut futures = Vec::new();
         for i in 1..=(NUM_ITEMS + 10) {
             let version = format!("1.3.{i}");
             let publish_time = now - Duration::minutes(30) + Duration::seconds(i);
-            create_version(&mut conn, foo, &version, publish_time).await;
+            futures.push(create_version(&mut conn, foo, version, publish_time));
         }
+        join_all(futures).await;
 
         let updates = assert_ok!(load_version_updates(&mut conn).await);
         assert_eq!(updates.len() as i64, NUM_ITEMS + 10);
@@ -232,23 +242,23 @@ mod tests {
             .unwrap()
     }
 
-    async fn create_version(
+    fn create_version(
         conn: &mut AsyncPgConnection,
         crate_id: i32,
-        version: &str,
+        version: impl Into<Cow<'static, str>>,
         publish_time: NaiveDateTime,
-    ) -> i32 {
-        diesel::insert_into(versions::table)
+    ) -> impl Future<Output = i32> {
+        let future = diesel::insert_into(versions::table)
             .values((
                 versions::crate_id.eq(crate_id),
-                versions::num.eq(version),
+                versions::num.eq(version.into()),
                 versions::created_at.eq(publish_time),
                 versions::updated_at.eq(publish_time),
                 versions::checksum.eq("checksum"),
             ))
             .returning(versions::id)
-            .get_result(conn)
-            .await
-            .unwrap()
+            .get_result(conn);
+
+        async move { future.await.unwrap() }
     }
 }
