Home Explore Help
Sign In
compsci-industry
/
TechEmpower.FrameworkBenchmarks
mirror of https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Update anansi (#7936)

* Update to anansi 0.13.1

* Update to anansi 0.13.2

* Fixed anansi

---------

Co-authored-by: sarutora <example.com>
saru-tora 2 years ago
parent
c38ad2b0e2
commit
7f98f8109d
6 changed files with 18 additions and 14 deletions
Unified View Show Diff Stats
  1. 2 1
      frameworks/Rust/anansi/Cargo.toml
  2. 0 1
      frameworks/Rust/anansi/settings.toml
  3. 2 2
      frameworks/Rust/anansi/src/hello/records.rs
  4. 12 8
      frameworks/Rust/anansi/src/hello/world/raw.rs
  5. 1 1
      frameworks/Rust/anansi/src/hello/world/templates/.parsed/base.in
  6. 1 1
      frameworks/Rust/anansi/src/http_errors/templates/.parsed/not_found.in

+ 2 - 1
frameworks/Rust/anansi/Cargo.toml
View File 

@@ -12,8 +12,9 @@ edition = "2021"
 
 raw = []
 
 raw = []
 
 
 
 [dependencies]
 
 [dependencies]
 
-anansi = { git = "https://github.com/saru-tora/anansi", rev = "7098e09", features = ["postgres", "minimal", "redis"] }
 
+anansi = { git = "https://github.com/saru-tora/anansi", rev = "94cae98", features = ["postgres", "minimal", "redis"] }
 
 async-trait = "0.1.57"
 
 async-trait = "0.1.57"
 
 rand = "0.8.4"
 
 rand = "0.8.4"
 
 serde = { version = "1.0", features = ["derive"] }
 
 serde = { version = "1.0", features = ["derive"] }
 
 serde_json = "1.0"
 
 serde_json = "1.0"
 
+tokio-postgres = "0.7.7"

+ 0 - 1
frameworks/Rust/anansi/settings.toml
View File 

@@ -16,4 +16,3 @@ name = "hello_world"
 
 user = "benchmarkdbuser"
 
 user = "benchmarkdbuser"
 
 password = "benchmarkdbpass"
 
 password = "benchmarkdbpass"
 
 address = "tfb-database"
 
 address = "tfb-database"
 
-max_conn = 512

+ 2 - 2
frameworks/Rust/anansi/src/hello/records.rs
View File 

@@ -15,7 +15,7 @@ pub struct World {
 
 
 
 #[async_trait]
 
 #[async_trait]
 
 impl<R: BaseRequest> Relate<R> for World {
 
 impl<R: BaseRequest> Relate<R> for World {
 
-    async fn on_save(&self, _req: &R) -> Result<()> {
 
+    async fn on_save(&self, _req: &mut R) -> Result<()> {
 
         unimplemented!();
 
         unimplemented!();
 
     }
 
     }
 
     async fn on_delete(&self, _req: &R) -> Result<()> {
 
     async fn on_delete(&self, _req: &R) -> Result<()> {
 
@@ -38,7 +38,7 @@ impl Fortune {
 
 
 
 #[async_trait]
 
 #[async_trait]
 
 impl<R: BaseRequest> Relate<R> for Fortune {
 
 impl<R: BaseRequest> Relate<R> for Fortune {
 
-    async fn on_save(&self, _req: &R) -> Result<()> {
 
+    async fn on_save(&self, _req: &mut R) -> Result<()> {
 
         unimplemented!();
 
         unimplemented!();
 
     }
 
     }
 
     async fn on_delete(&self, _req: &R) -> Result<()> {
 
     async fn on_delete(&self, _req: &R) -> Result<()> {

+ 12 - 8
frameworks/Rust/anansi/src/hello/world/raw.rs
View File 

@@ -7,6 +7,7 @@ use std::borrow::Cow;
 
 use anansi::db::DbRow;
 
 use anansi::db::DbRow;
 
 use rand::Rng;
 
 use rand::Rng;
 
 use std::fmt::Write;
 
 use std::fmt::Write;
 
+use tokio_postgres::types::ToSql;
 
 
 
 thread_local!(static UPDATES: Vec<Cow<'static, str>> = {
 
 thread_local!(static UPDATES: Vec<Cow<'static, str>> = {
 
     let mut updates = vec![Cow::from("")];
 
     let mut updates = vec![Cow::from("")];
 
@@ -55,8 +56,7 @@ fn base<R: Request>(_req: &mut R) -> Result<Response> {}
 
 #[viewer]
 
 #[viewer]
 
 impl<R: Request> WorldView<R> {
 
 impl<R: Request> WorldView<R> {
 
     async fn get_world(req: &R) -> Result<PgDbRow> {
 
     async fn get_world(req: &R) -> Result<PgDbRow> {
 
-        PgQuery::new("SELECT * FROM world WHERE id = $1")
 
-            .bind(random_num())
 
+        PgQuery::new("SELECT * FROM world WHERE id = $1", &[&random_num()])
 
             .fetch_one(req)
 
             .fetch_one(req)
 
             .await
 
             .await
 
     }
 
     }
 
@@ -90,7 +90,7 @@ impl<R: Request> WorldView<R> {
 
     #[view(Site::is_visitor)]
 
     #[view(Site::is_visitor)]
 
     pub async fn raw_fortunes(req: &mut R) -> Result<Response> {
 
     pub async fn raw_fortunes(req: &mut R) -> Result<Response> {
 
         let title = "Fortunes";
 
         let title = "Fortunes";
 
-        let rows = PgQuery::new("SELECT * FROM fortune")
 
+        let rows = PgQuery::new("SELECT * FROM fortune", &[])
 
             .fetch_all(req)
 
             .fetch_all(req)
 
             .await?;
 
             .await?;
 
         let mut fortunes = vec![Fortune {
 
         let mut fortunes = vec![Fortune {
 
@@ -113,21 +113,25 @@ impl<R: Request> WorldView<R> {
 
         UPDATES.with(|u| {
 
         UPDATES.with(|u| {
 
             update = u[q].clone();
 
             update = u[q].clone();
 
         });
 
         });
 
-        let mut updates = PgQuery::new(&update);
 
+        let mut params: Vec<&(dyn ToSql + Sync)> = Vec::with_capacity(q * 3);
 
         for _ in 0..q {
 
         for _ in 0..q {
 
             let row = Self::get_world(req).await?;
 
             let row = Self::get_world(req).await?;
 
             let world = World {
 
             let world = World {
 
                 id: row.try_i32("id")?,
 
                 id: row.try_i32("id")?,
 
                 randomnumber: random_num(),
 
                 randomnumber: random_num(),
 
             };
 
             };
 
-            updates = updates.bind(world.id)
 
-                .bind(world.randomnumber);
 
             worlds.push(world);
 
             worlds.push(world);
 
         }
 
         }
 
         for world in &worlds {
 
         for world in &worlds {
 
-            updates = updates.bind(world.id);
 
+            params.push(&world.id);
 
+            params.push(&world.randomnumber);
 
         }
 
         }
 
-        updates.execute(req).await?;
 
+        for world in &worlds {
 
+            params.push(&world.id);
 
+        }
 
+        PgQuery::new(&update, params.as_slice())
 
+            .execute(req)
 
+            .await?;
 
         Response::json(&worlds)
 
         Response::json(&worlds)
 
     }
 
     }
 
 }
 
 }

+ 1 - 1
frameworks/Rust/anansi/src/hello/world/templates/.parsed/base.in
View File 

@@ -6,4 +6,4 @@
 
         <body>
 
         <body>
 
                 ");_c.push_str(&_base_args._content);_c.push_str("
 
                 ");_c.push_str(&_base_args._content);_c.push_str("
 
         </body>
 
         </body>
 
-</html>");Ok(anansi::web::Response::new(200, _c.into_bytes()))}
 
+</html>");_c.into_bytes()}

+ 1 - 1
frameworks/Rust/anansi/src/http_errors/templates/.parsed/not_found.in
View File 

@@ -8,4 +8,4 @@
 
 		<h1>404</h1>
 
 		<h1>404</h1>
 
 		<p>Page not found.</p>
 
 		<p>Page not found.</p>
 
 	</body>
 
 	</body>
 
-</html>");Ok(anansi::web::Response::new(200, _c.into_bytes()))}
 
+</html>");_c.into_bytes()}