query parse fix

Author: fakeshadow

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

@@ -10,7 +10,7 @@ use super::{
     util::{HandleResult, DB_URL},
 };
 
-use db_util::{not_found, sort_update_params, update_query, Shared, FORTUNE_STMT, WORLD_STMT};
+use db_util::{not_found, sort_update_params, update_query_from_num, Shared, FORTUNE_STMT, WORLD_STMT};
 
 pub struct Client {
     pool: Pool,
@@ -23,7 +23,7 @@ pub async fn create() -> HandleResult<Client> {
         pool: Pool::builder(DB_URL).capacity(1).build()?,
         shared: Default::default(),
         updates: core::iter::once(Box::from(""))
-            .chain((1..=500).map(update_query))
+            .chain((1..=500).map(update_query_from_num))
             .collect(),
     })
 }

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

@@ -13,7 +13,7 @@ use super::{
     util::{HandleResult, DB_URL},
 };
 
-use db_util::{not_found, sort_update_params, update_query, Shared, FORTUNE_STMT, WORLD_STMT};
+use db_util::{not_found, sort_update_params, update_query_from_num, Shared, FORTUNE_STMT, WORLD_STMT};
 
 pub struct Client {
     cli: xitca_postgres::Client,
@@ -36,7 +36,7 @@ pub async fn create() -> HandleResult<Client> {
 
     let mut updates = vec![Statement::default()];
 
-    for update in (1..=500).map(update_query).into_iter() {
+    for update in (1..=500).map(update_query_from_num).into_iter() {
         let stmt = Statement::named(&update, &[]).execute(&cli).await?.leak();
         updates.push(stmt);
     }

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

@@ -1,17 +1,24 @@
 use crate::util::Error;
 
+#[cfg(any(feature = "pg-orm", feature = "pg-orm-async"))]
 // diesel does not support high level bulk update api. use raw sql to bypass the limitation.
 // relate discussion: https://github.com/diesel-rs/diesel/discussions/2879
 pub fn update_query_from_ids(ids: &[(i32, i32)]) -> String {
+    update_query(|query| {
+        use core::fmt::Write;
+        ids.iter().for_each(|(w_id, num)| {
+            write!(query, "({}::int,{}::int),", w_id, num).unwrap();
+        });
+    })
+}
+
+fn update_query(func: impl FnOnce(&mut String)) -> String {
     const PREFIX: &str = "UPDATE world SET randomNumber = w.r FROM (VALUES ";
     const SUFFIX: &str = ") AS w (i,r) WHERE world.id = w.i";
 
     let mut query = String::from(PREFIX);
 
-    use std::fmt::Write;
-    ids.iter().for_each(|(w_id, num)| {
-        write!(query, "({}::int,{}::int),", w_id, num).unwrap();
-    });
+    func(&mut query);
 
     if query.ends_with(',') {
         query.pop();
@@ -46,12 +53,15 @@ pub mod pg {
     pub const FORTUNE_STMT: StatementNamed = Statement::named("SELECT * FROM fortune", &[]);
     pub const WORLD_STMT: StatementNamed = Statement::named("SELECT * FROM world WHERE id=$1", &[Type::INT4]);
 
-    pub fn update_query(num: usize) -> Box<str> {
-        let (_, ids) = (1..=num).fold((1, Vec::new()), |(id, mut ids), _| {
-            ids.push((id, id + 1));
-            (id + 2, ids)
-        });
-        super::update_query_from_ids(&ids).into_boxed_str()
+    pub fn update_query_from_num(num: usize) -> Box<str> {
+        super::update_query(|query| {
+            use core::fmt::Write;
+            (1..=num).fold(1, |idx, _| {
+                write!(query, "(${}::int,${}::int),", idx, idx + 1).unwrap();
+                idx + 2
+            });
+        })
+        .into_boxed_str()
     }
 
     pub fn sort_update_params(params: &[[i32; 2]]) -> impl ExactSizeIterator<Item = i32> {

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

@@ -114,13 +114,13 @@ async fn handler<'h>(req: Request<'h>, res: Response<'h>, state: &State<db::Clie
             let world = state.client.get_world().await.unwrap();
             json_response(res, state, &world)
         }
-        p if p.starts_with("/queries") => {
-            let num = p.parse_query();
+        p if p.starts_with("/q") => {
+            let num = p["/queries?q=".len()..].parse_query();
             let worlds = state.client.get_worlds(num).await.unwrap();
             json_response(res, state, &worlds)
         }
-        p if p.starts_with("/updates") => {
-            let num = p.parse_query();
+        p if p.starts_with("/u") => {
+            let num = p["/updates?q=".len()..].parse_query();
             let worlds = state.client.update(num).await.unwrap();
             json_response(res, state, &worlds)
         }

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

@@ -10,17 +10,15 @@ pub trait QueryParse {
 
 impl QueryParse for Option<&str> {
     fn parse_query(self) -> u16 {
-        self.map(QueryParse::parse_query).unwrap_or(1)
+        self.and_then(|q| q.find('q').map(|pos| q.split_at(pos + 2).1.parse_query()))
+            .unwrap_or(1)
     }
 }
 
 impl QueryParse for &str {
     fn parse_query(self) -> u16 {
         use atoi::FromRadix10;
-        self.find('q')
-            .map(|pos| u16::from_radix_10(self.split_at(pos + 2).1.as_ref()).0)
-            .unwrap_or(1)
-            .clamp(1, 500)
+        u16::from_radix_10(self.as_bytes()).0.clamp(1, 500)
     }
 }