Browse Source

update ohkami to v0.19, dependencies & refactor some (#9120)

kanarus 1 year ago
parent
commit
bec7f74cb4

+ 11 - 11
frameworks/Rust/ohkami/Cargo.lock

@@ -770,9 +770,9 @@ dependencies = [
 
 [[package]]
 name = "ohkami"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d810447a32af4750a45183a4915db5ca4183bb6d44b8e7731e63f627c581d93e"
+checksum = "e598d3d323527b920e159d55da2754067a5edfbc0678d60b3886fc379f4637f2"
 dependencies = [
  "byte_reader",
  "hmac",
@@ -787,7 +787,7 @@ dependencies = [
 
 [[package]]
 name = "ohkami_framework_benchmarks"
-version = "0.18.2"
+version = "0.19.0"
 dependencies = [
  "futures-util",
  "ohkami",
@@ -799,9 +799,9 @@ dependencies = [
 
 [[package]]
 name = "ohkami_lib"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4433e6c4c6c67a72afc306783ca8c641e69c9d171279fcab51f1f0c2d875e121"
+checksum = "05fdeee00f86ee850c63a15068f2c2a3aeb6d707d4936f2261ec0e70ff48704b"
 dependencies = [
  "byte_reader",
  "percent-encoding",
@@ -810,9 +810,9 @@ dependencies = [
 
 [[package]]
 name = "ohkami_macros"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffed4cd7e8c12a62c077273cb0f0fedf67ca3912488e5de1b325be85ca86bb06"
+checksum = "d5fa46d8805dede76dce71f8725d48d655f74e2c702824f7a785257d1cc4dd1b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1574,9 +1574,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1593,9 +1593,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",

+ 3 - 3
frameworks/Rust/ohkami/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name    = "ohkami_framework_benchmarks"
-version = "0.18.2"
+version = "0.19.0"
 edition = "2021"
 authors = ["kanarus <[email protected]>"]
 
 [dependencies]
-ohkami       = { version = "=0.18.2", features = ["rt_tokio"] }
-tokio        = { version = "1.37.0" , features = ["full"] }
+ohkami       = { version = "=0.19.0", features = ["rt_tokio"] }
+tokio        = { version = "1.38.0" , features = ["full"] }
 rand         = { version = "0.8.5"  , features = ["small_rng"] }
 sqlx         = { version = "0.7.4"  , features = ["postgres", "macros", "runtime-tokio-native-tls"] }
 yarte        = { version = "0.15.7" }

+ 1 - 1
frameworks/Rust/ohkami/README.md

@@ -1,4 +1,4 @@
-# [ohkami](https://github.com/kana-rus/ohkami) - Intuitive and Declarative Web Framework for Rust
+# [Ohkami](https://github.com/kana-rus/ohkami) - Intuitive and Declarative Web Framework for Rust
 
 ## Description
 

+ 1 - 1
frameworks/Rust/ohkami/ohkami.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.78-slim-buster
+FROM rust:1.79-slim-buster
 WORKDIR /ohkami_framework_benchmarks
 
 ENV DATABASE_URL=postgres://benchmarkdbuser:benchmarkdbpass@tfb-database/hello_world

+ 3 - 6
frameworks/Rust/ohkami/src/postgres.rs

@@ -16,16 +16,14 @@ impl Postgres {
     pub async fn select_random_world(&self) -> World {
         let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
     
-        sqlx::query_as(
-            "SELECT id, randomnumber FROM World WHERE id = $1")
+        sqlx::query_as("SELECT id, randomnumber FROM World WHERE id = $1")
             .bind((rng.gen::<u32>() % 10_000 + 1) as i32)
             .fetch_one(&self.0).await
             .expect("Failed to fetch a world")
     }
     
     pub async fn select_all_fortunes(&self) -> Vec<Fortune> {
-        sqlx::query_as(
-            "SELECT id, message FROM Fortune")
+        sqlx::query_as("SELECT id, message FROM Fortune")
             .fetch_all(&self.0).await
             .expect("Failed to fetch fortunes")
     }
@@ -36,8 +34,7 @@ impl Postgres {
         let selects = FuturesUnordered::new();
         for _ in 0..n {
             selects.push(
-                sqlx::query_as(
-                    "SELECT id, randomnumber FROM World WHERE id = $1")
+                sqlx::query_as("SELECT id, randomnumber FROM World WHERE id = $1")
                     .bind((rng.gen::<u32>() % 10_000 + 1) as i32)
                     .fetch_one(&self.0)
             )