[xitca-web] reduce memory allocation (#10343)

* [xitca-web] reduce memory allocation

* generate rng with iterator

* clean up module layout

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,7 +10,7 @@ use super::{
     util::{DB_URL, HandleResult},
 };
 
-use db_util::{FORTUNE_STMT, Shared, UPDATE_BATCH_STMT, WORLD_STMT, not_found};
+use db_util::{FORTUNE_STMT, Shared, UPDATE_STMT, WORLD_STMT, not_found};
 
 pub struct Client {
     pool: Pool,
@@ -35,19 +35,19 @@ impl Client {
     }
 
     pub async fn get_worlds(&self, num: u16) -> HandleResult<Vec<World>> {
-        let len = num as usize;
-
         let mut conn = self.pool.get().await?;
         let stmt = WORLD_STMT.execute(&mut conn).await?;
 
         let mut res = {
             let (ref mut rng, ref mut buf) = *self.shared.borrow_mut();
-            let mut pipe = Pipeline::with_capacity_from_buf(len, buf);
-            (0..num).try_for_each(|_| stmt.bind([rng.gen_id()]).query(&mut pipe))?;
+            let mut pipe = Pipeline::with_capacity_from_buf(num as _, buf);
+            rng.gen_multi()
+                .take(num as _)
+                .try_for_each(|id| stmt.bind([id]).query(&mut pipe))?;
             pipe.query(&conn.consume())?
         };
 
-        let mut worlds = Vec::with_capacity(len);
+        let mut worlds = Vec::with_capacity(num as _);
 
         while let Some(mut item) = res.try_next().await? {
             let row = item.try_next().await?.ok_or_else(not_found)?;
@@ -58,28 +58,26 @@ impl Client {
     }
 
     pub async fn update(&self, num: u16) -> HandleResult<Vec<World>> {
-        let len = num as usize;
-
         let mut conn = self.pool.get().await?;
         let world_stmt = WORLD_STMT.execute(&mut conn).await?;
-        let update_stmt = UPDATE_BATCH_STMT.execute(&mut conn).await?;
+        let update_stmt = UPDATE_STMT.execute(&mut conn).await?;
 
         let (mut res, worlds) = {
             let (ref mut rng, ref mut buf) = *self.shared.borrow_mut();
-            let mut pipe = Pipeline::with_capacity_from_buf(len + 1, buf);
-
-            let (mut params, worlds) = core::iter::repeat_with(|| {
-                let id = rng.gen_id();
-                let rand = rng.gen_id();
-                world_stmt.bind([id]).query(&mut pipe)?;
-                HandleResult::Ok(((id, rand), World::new(id, rand)))
-            })
-            .take(len)
-            .collect::<Result<(Vec<_>, Vec<_>), _>>()?;
-
-            params.sort();
-            let (ids, rngs) = params.into_iter().collect::<(Vec<_>, Vec<_>)>();
-
+            let mut pipe = Pipeline::with_capacity_from_buf((num + 1) as _, buf);
+
+            let mut ids = rng.gen_multi().take(num as _).collect::<Vec<_>>();
+            ids.sort();
+
+            let (rngs, worlds) = ids
+                .iter()
+                .cloned()
+                .zip(rng.gen_multi())
+                .map(|(id, rand)| {
+                    world_stmt.bind([id]).query(&mut pipe)?;
+                    HandleResult::Ok((rand, World::new(id, rand)))
+                })
+                .collect::<HandleResult<(Vec<_>, Vec<_>)>>()?;
             update_stmt.bind([&ids, &rngs]).query(&mut pipe)?;
             (pipe.query(&conn.consume())?, worlds)
         };