[xitca-web]fix io-uring plaintext test. (#8046)

Author: fakeshadow

frameworks/Rust/xitca-web/Cargo.lock

@@ -81,14 +81,14 @@ codegen-units = 1
 panic = "abort"
 
 [patch.crates-io]
-xitca-http = { git = "https://github.com/HFQR/xitca-web.git", rev = "e648bb2f6e2fd787c2dac0b7e6b0a5bcf7d12f86" }
-xitca-io = { git = "https://github.com/HFQR/xitca-web.git", rev = "e648bb2f6e2fd787c2dac0b7e6b0a5bcf7d12f86" }
-xitca-postgres = { git = "https://github.com/HFQR/xitca-web.git", rev = "e648bb2f6e2fd787c2dac0b7e6b0a5bcf7d12f86" }
-xitca-router = { git = "https://github.com/HFQR/xitca-web.git", rev = "e648bb2f6e2fd787c2dac0b7e6b0a5bcf7d12f86" }
-xitca-server = { git = "https://github.com/HFQR/xitca-web.git", rev = "e648bb2f6e2fd787c2dac0b7e6b0a5bcf7d12f86" }
-xitca-service = { git = "https://github.com/HFQR/xitca-web.git", rev = "e648bb2f6e2fd787c2dac0b7e6b0a5bcf7d12f86" }
-xitca-unsafe-collection = { git = "https://github.com/HFQR/xitca-web.git", rev = "e648bb2f6e2fd787c2dac0b7e6b0a5bcf7d12f86" }
-xitca-web = { git = "https://github.com/HFQR/xitca-web.git", rev = "e648bb2f6e2fd787c2dac0b7e6b0a5bcf7d12f86" }
+xitca-http = { git = "https://github.com/HFQR/xitca-web.git", rev = "c58463d4cd2e58a1fbbe5d15cb4e82c7cd0055bf" }
+xitca-io = { git = "https://github.com/HFQR/xitca-web.git", rev = "c58463d4cd2e58a1fbbe5d15cb4e82c7cd0055bf" }
+xitca-postgres = { git = "https://github.com/HFQR/xitca-web.git", rev = "c58463d4cd2e58a1fbbe5d15cb4e82c7cd0055bf" }
+xitca-router = { git = "https://github.com/HFQR/xitca-web.git", rev = "c58463d4cd2e58a1fbbe5d15cb4e82c7cd0055bf" }
+xitca-server = { git = "https://github.com/HFQR/xitca-web.git", rev = "c58463d4cd2e58a1fbbe5d15cb4e82c7cd0055bf" }
+xitca-service = { git = "https://github.com/HFQR/xitca-web.git", rev = "c58463d4cd2e58a1fbbe5d15cb4e82c7cd0055bf" }
+xitca-unsafe-collection = { git = "https://github.com/HFQR/xitca-web.git", rev = "c58463d4cd2e58a1fbbe5d15cb4e82c7cd0055bf" }
+xitca-web = { git = "https://github.com/HFQR/xitca-web.git", rev = "c58463d4cd2e58a1fbbe5d15cb4e82c7cd0055bf" }
 
 postgres-protocol = { git = "https://github.com/sfackler/rust-postgres.git", rev = "7cd7b187a5cb990ceb0ea9531cd3345b1e2799c3" }
 

frameworks/Rust/xitca-web/Cargo.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-03-05"
+channel = "nightly-2023-03-16"

frameworks/Rust/xitca-web/rust-toolchain.toml

@@ -78,7 +78,7 @@ impl Client {
             .next()
             .await
             .ok_or_else(|| format!("World {id} does not exist"))?
-            .map(|row| World::new(row.get(0), row.get(1)))
+            .map(|row| World::new(row.get_raw(0), row.get_raw(1)))
             .map_err(Into::into)
     }
 
@@ -137,16 +137,13 @@ impl Client {
     pub async fn tell_fortune(&self) -> HandleResult<Fortunes> {
         let mut items = Vec::with_capacity(32);
 
-        items.push(Fortune::from_static(
-            0,
-            "Additional fortune added at request time.",
-        ));
+        items.push(Fortune::new(0, "Additional fortune added at request time."));
 
         let mut stream = self.client.query_raw::<&[i32]>(&self.fortune, &[]).await?;
 
         while let Some(row) = stream.next().await {
             let row = row?;
-            items.push(Fortune::new(row.get(0), row.get(1)));
+            items.push(Fortune::new(row.get_raw(0), row.get_raw::<String>(1)));
         }
 
         items.sort_by(|it, next| it.message.cmp(&next.message));

frameworks/Rust/xitca-web/src/db.rs

@@ -166,19 +166,20 @@ where
             let std = stream.into_std()?;
             let stream = tokio_uring::net::TcpStream::from_std(std);
 
-            let mut read_buf = BytesMut::new();
+            let mut read_buf = BytesMut::with_capacity(4096);
             let mut write_buf = BytesMut::with_capacity(4096);
+            let mut paged = PagedBytesMut::new();
 
             let mut ctx = Context::<_, 8>::new(self.date.get());
 
             'io: loop {
-                read_buf.reserve(4096);
                 let (res, buf) = stream.read(read_buf).await;
                 if res? == 0 {
                     break;
                 }
+                read_buf = buf;
+                paged.get_mut().extend_from_slice(&read_buf);
 
-                let mut paged = PagedBytesMut::from(buf);
                 while let Some((req, _)) = ctx.decode_head::<65535>(&mut paged).unwrap() {
                     let (parts, body) = self.service.call(req).await.unwrap().into_parts();
                     let mut encoder = ctx.encode_head(parts, &body, &mut write_buf).unwrap();
@@ -189,7 +190,6 @@ where
                     }
                     encoder.encode_eof(&mut write_buf);
                 }
-                read_buf = paged.into_inner();
 
                 while !write_buf.is_empty() {
                     let (res, mut w) = stream.write(write_buf).await;