editoast: collect early

The macro was doing the job of collecting. However, most of the objects sent are already collected before calling the macro which creates twice the allocations.
OpenRailAssociation · May 17, 2024 · 8bcaee1 · 8bcaee1
1 parent eea95d4
commit 8bcaee1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/editoast/editoast_derive/src/modelv2/codegen/create_batch_impl.rs b/editoast/editoast_derive/src/modelv2/codegen/create_batch_impl.rs
@@ -39,6 +39,7 @@ impl ToTokens for CreateBatchImpl {
                     use diesel::prelude::*;
                     use diesel_async::RunQueryDsl;
                     use futures_util::stream::TryStreamExt;
+                    let values = values.into_iter().collect::<Vec<_>>();
                     Ok(crate::chunked_for_libpq! {
                         #field_count,
                         values,

diff --git a/editoast/src/modelsv2/prelude/mod.rs b/editoast/src/modelsv2/prelude/mod.rs
@@ -128,9 +128,8 @@ macro_rules! chunked_for_libpq {
         const ASYNC_SUBDIVISION: usize = 2_usize;
         const CHUNK_SIZE: usize = LIBPQ_MAX_PARAMETERS / ASYNC_SUBDIVISION / $parameters_per_row;
         let mut result = Vec::new();
-        let values = $values.into_iter().collect::<Vec<_>>();
-        let chunks = values.chunks(CHUNK_SIZE);
-        for $chunk in chunks.into_iter() {
+        let chunks = $values.chunks(CHUNK_SIZE);
+        for $chunk in chunks {
             let chunk_result = $query;
             result.push(chunk_result);
         }
@@ -143,9 +142,8 @@ macro_rules! chunked_for_libpq {
         const ASYNC_SUBDIVISION: usize = 2_usize;
         const CHUNK_SIZE: usize = LIBPQ_MAX_PARAMETERS / ASYNC_SUBDIVISION / $parameters_per_row;
         let mut result = $result;
-        let values = $values.into_iter().collect::<Vec<_>>();
-        let chunks = values.chunks(CHUNK_SIZE);
-        for $chunk in chunks.into_iter() {
+        let chunks = $values.chunks(CHUNK_SIZE);
+        for $chunk in chunks {
             let chunk_result = $query;
             result.extend(chunk_result);
         }