[xitca-web] reduce memory allocation

Author: fakeshadow

frameworks/Rust/xitca-web/Cargo.lock

@@ -29,7 +29,7 @@ pg = ["dep:xitca-postgres"]
 # diesel orm optional
 diesel = ["dep:diesel", "dep:diesel-async", "dep:xitca-postgres-diesel", "dep:futures-util"]
 # toasty orm optional
-toasty = ["dep:toasty", "dep:xitca-postgres-toasty"]
+toasty = ["dep:toasty", "dep:xitca-postgres-toasty", "futures-util/alloc"]
 # http router optional
 router = ["xitca-http/router"]
 # web optional
@@ -64,7 +64,7 @@ xitca-postgres = { version = "0.3", optional = true }
 # diesel orm optional
 diesel = { version = "2", features = ["postgres"], optional = true }
 diesel-async = { version = "0.7", features = ["bb8", "postgres"], optional = true }
-xitca-postgres-diesel = { version = "0.2", optional = true }
+xitca-postgres-diesel = { version = "0.2", default-features = false, optional = true }
 futures-util = { version = "0.3", default-features = false, optional = true }
 
 # toasty orm optional
@@ -94,16 +94,17 @@ codegen-units = 1
 panic = "abort"
 
 [patch.crates-io]
-xitca-postgres-diesel = { git = "https://github.com/fakeshadow/xitca-postgres-diesel", rev = "8ce4e5b" }
+xitca-postgres-diesel = { git = "https://github.com/fakeshadow/xitca-postgres-diesel", rev = "7671975" }
 xitca-postgres-toasty = { git = "https://github.com/fakeshadow/xitca-postgres-toasty", rev = "04bedb8" }
 
-toasty = { git = "https://github.com/tokio-rs/toasty", rev = "e0c84c5" }
-toasty-core = { git = "https://github.com/tokio-rs/toasty", rev = "e0c84c5" }
-toasty-sql = { git = "https://github.com/tokio-rs/toasty", rev = "e0c84c5" }
-
-xitca-codegen = { git = "http://github.com/HFQR/xitca-web", rev = "c9c4b25" }
-xitca-http = { git = "http://github.com/HFQR/xitca-web", rev = "c9c4b25" }
-xitca-postgres = { git = "http://github.com/HFQR/xitca-web", rev = "c9c4b25" }
-xitca-server = { git = "http://github.com/HFQR/xitca-web", rev = "c9c4b25" }
-xitca-service = { git = "http://github.com/HFQR/xitca-web", rev = "c9c4b25" }
-xitca-web = { git = "http://github.com/HFQR/xitca-web", rev = "c9c4b25" }
+# personal fork for efficient toasty engine fine tuned with pipelined xitca-postgres client
+toasty = { git = "https://github.com/fakeshadow/toasty", branch = "engine" }
+toasty-core = { git = "https://github.com/fakeshadow/toasty", branch = "engine" }
+toasty-sql = { git = "https://github.com/fakeshadow/toasty", branch = "engine" }
+
+xitca-codegen = { git = "http://github.com/HFQR/xitca-web", rev = "cf70ed7" }
+xitca-http = { git = "http://github.com/HFQR/xitca-web", rev = "cf70ed7" }
+xitca-postgres = { git = "http://github.com/HFQR/xitca-web", rev = "cf70ed7" }
+xitca-server = { git = "http://github.com/HFQR/xitca-web", rev = "cf70ed7" }
+xitca-service = { git = "http://github.com/HFQR/xitca-web", rev = "cf70ed7" }
+xitca-web = { git = "http://github.com/HFQR/xitca-web", rev = "cf70ed7" }

frameworks/Rust/xitca-web/Cargo.toml

@@ -10,11 +10,11 @@ use diesel_async::{
     RunQueryDsl,
     pooled_connection::{AsyncDieselConnectionManager, bb8},
 };
-use futures_util::future::{TryFutureExt, try_join, try_join_all};
+use futures_util::future::{TryFutureExt, TryJoinAll, try_join};
 use xitca_postgres_diesel::AsyncPgConnection;
 
 use crate::{
-    ser::{Fortune, Fortunes, World},
+    ser::{Fortunes, World},
     util::{DB_URL, HandleResult, Rand},
 };
 
@@ -52,52 +52,54 @@ impl Pool {
     }
 
     pub async fn get_worlds(&self, num: u16) -> HandleResult<Vec<World>> {
-        try_join_all({
+        {
             use crate::schema::world::dsl::*;
 
             let mut conn = self.pool.get().await?;
             let mut rng = self.rng.borrow_mut();
 
-            core::iter::repeat_with(|| {
+            core::iter::repeat_with(move || {
                 let w_id = rng.gen_id();
                 world.filter(id.eq(w_id)).first(&mut conn).map_err(Into::into)
             })
             .take(num as _)
-            .collect::<Vec<_>>()
-        })
+            .collect::<TryJoinAll<_>>()
+        }
         .await
     }
 
     pub async fn update(&self, num: u16) -> HandleResult<Vec<World>> {
-        let (get, update) = {
+        {
             use crate::schema::world::dsl::*;
 
             let mut conn = self.pool.get().await?;
             let mut rng = self.rng.borrow_mut();
+            let mut params = Vec::with_capacity(num as _);
 
-            let (rngs, get) = core::iter::repeat_with(|| {
+            let get = core::iter::repeat_with(|| {
                 let w_id = rng.gen_id();
                 let rng = rng.gen_id();
 
                 let get = world.filter(id.eq(w_id)).first::<World>(&mut conn);
 
-                ((w_id, rng), async move {
+                params.push((w_id, rng));
+
+                async move {
                     let mut w = get.await?;
                     w.randomnumber = rng;
                     HandleResult::Ok(w)
-                })
+                }
             })
             .take(num as _)
-            .collect::<(Vec<_>, Vec<_>)>();
-
-            let update = diesel::sql_query(update_query_from_ids(rngs))
-                .execute(&mut conn)
-                .map_err(Into::into);
+            .collect::<TryJoinAll<_>>();
 
-            (try_join_all(get), update)
-        };
+            let sql = update_query_from_ids(params);
+            let update = diesel::sql_query(sql).execute(&mut conn).map_err(Into::into);
 
-        try_join(get, update).await.map(|(worlds, _)| worlds)
+            try_join(get, update)
+        }
+        .await
+        .map(|(worlds, _)| worlds)
     }
 
     pub async fn tell_fortune(&self) -> HandleResult<Fortunes> {