Browse Source

[Rust] Drop range in viz-pg (#8438)

* [viz] deps updates

* chore(rust): lock rust version

* chore([Rust]): drop range in viz-pg

* fix([Rust]): seed number in viz-pg
Fangdun Tsai 1 year ago
parent
commit
c83de1571d

+ 4 - 5
frameworks/Rust/viz/src/db_pg.rs

@@ -6,7 +6,6 @@ use tokio_postgres::{connect, types::ToSql, Client, NoTls, Statement};
 use viz::{Error, IntoResponse, Response, StatusCode};
 use viz::{Error, IntoResponse, Response, StatusCode};
 
 
 use crate::models::{Fortune, World};
 use crate::models::{Fortune, World};
-use crate::utils::RANGE;
 
 
 /// Postgres Error
 /// Postgres Error
 #[derive(Debug, thiserror::Error)]
 #[derive(Debug, thiserror::Error)]
@@ -104,7 +103,7 @@ impl PgConnection {
 
 
     pub async fn get_world(&self) -> Result<World, PgError> {
     pub async fn get_world(&self) -> Result<World, PgError> {
         let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
         let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
-        let random_id = rng.gen_range(RANGE);
+        let random_id = (rng.gen::<u32>() % 10_000 + 1) as i32;
 
 
         self.query_one_world(random_id).await
         self.query_one_world(random_id).await
     }
     }
@@ -115,7 +114,7 @@ impl PgConnection {
         let worlds = FuturesUnordered::new();
         let worlds = FuturesUnordered::new();
 
 
         for _ in 0..num {
         for _ in 0..num {
-            let id = rng.gen_range(RANGE);
+            let id = (rng.gen::<u32>() % 10_000 + 1) as i32;
             worlds.push(self.query_one_world(id));
             worlds.push(self.query_one_world(id));
         }
         }
 
 
@@ -128,8 +127,8 @@ impl PgConnection {
         let worlds = FuturesUnordered::new();
         let worlds = FuturesUnordered::new();
 
 
         for _ in 0..num {
         for _ in 0..num {
-            let id = rng.gen_range(RANGE);
-            let rid = rng.gen_range(RANGE);
+            let id = (rng.gen::<u32>() % 10_000 + 1) as i32;
+            let rid = (rng.gen::<u32>() % 10_000 + 1) as i32;
 
 
             worlds.push(self.query_one_world(id).map_ok(move |mut world| {
             worlds.push(self.query_one_world(id).map_ok(move |mut world| {
                 world.randomnumber = rid;
                 world.randomnumber = rid;

+ 1 - 1
frameworks/Rust/viz/src/db_sqlx.rs

@@ -5,7 +5,7 @@ use nanorand::{Rng, WyRand};
 pub use sqlx::{
 pub use sqlx::{
     pool::PoolConnection,
     pool::PoolConnection,
     postgres::{PgArguments, PgPoolOptions, PgRow},
     postgres::{PgArguments, PgPoolOptions, PgRow},
-    Arguments, PgPool, Postgres, Row
+    Arguments, PgPool, Postgres, Row,
 };
 };
 
 
 use viz::{
 use viz::{

+ 2 - 2
frameworks/Rust/viz/src/main_pg.rs

@@ -46,8 +46,8 @@ async fn fortunes(req: Request) -> Result<Response> {
 }
 }
 
 
 async fn queries(req: Request) -> Result<Response> {
 async fn queries(req: Request) -> Result<Response> {
-    let count = utils::get_query_param(req.query_string());
     let conn = get_conn(req.state::<Arc<PgConnection>>())?;
     let conn = get_conn(req.state::<Arc<PgConnection>>())?;
+    let count = utils::get_query_param(req.query_string());
 
 
     let worlds = conn.get_worlds(count).await?;
     let worlds = conn.get_worlds(count).await?;
 
 
@@ -58,8 +58,8 @@ async fn queries(req: Request) -> Result<Response> {
 }
 }
 
 
 async fn updates(req: Request) -> Result<Response> {
 async fn updates(req: Request) -> Result<Response> {
-    let count = utils::get_query_param(req.query_string());
     let conn = get_conn(req.state::<Arc<PgConnection>>())?;
     let conn = get_conn(req.state::<Arc<PgConnection>>())?;
+    let count = utils::get_query_param(req.query_string());
 
 
     let worlds = conn.update(count).await?;
     let worlds = conn.update(count).await?;