optimize fortunes benchmark (#4043)

TechEmpower · Sep 15, 2018 · f86dee7 · f86dee7
1 parent cffabe9
commit f86dee7
Show file tree

Hide file tree

Showing 13 changed files with 457 additions and 369 deletions.
diff --git a/frameworks/Rust/actix/Cargo.lock b/frameworks/Rust/actix/Cargo.lock
diff --git a/frameworks/Rust/actix/Cargo.toml b/frameworks/Rust/actix/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix"
-version = "0.7.1"
+version = "0.7.2"
 build = "build.rs"
 
 [[bin]]

diff --git a/frameworks/Rust/actix/actix-diesel.dockerfile b/frameworks/Rust/actix/actix-diesel.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.28
+FROM rust:1.29.0
 
 ADD ./ /actix
 WORKDIR /actix

diff --git a/frameworks/Rust/actix/actix-pg.dockerfile b/frameworks/Rust/actix/actix-pg.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.28
+FROM rust:1.29.0
 
 ADD ./ /actix
 WORKDIR /actix

diff --git a/frameworks/Rust/actix/actix-raw.dockerfile b/frameworks/Rust/actix/actix-raw.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.28
+FROM rust:1.29.0
 
 ADD ./ /actix
 WORKDIR /actix

diff --git a/frameworks/Rust/actix/actix.dockerfile b/frameworks/Rust/actix/actix.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.28
+FROM rust:1.29.0
 
 ADD ./ /actix
 WORKDIR /actix

diff --git a/frameworks/Rust/actix/src/db_pg.rs b/frameworks/Rust/actix/src/db_pg.rs
@@ -68,8 +68,7 @@ impl PgConnection {
                     act.cl = Some(cl);
                     Arbiter::spawn(conn.map_err(|e| panic!("{}", e)));
                     fut::ok(())
-                })
-                .wait(ctx);
+                }).wait(ctx);
 
             act
         })
@@ -228,8 +227,7 @@ impl Handler<TellFortune> for PgConnection {
                         message: row.get(1),
                     });
                     Ok::<_, io::Error>(items)
-                })
-                .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+                }).map_err(|e| io::Error::new(io::ErrorKind::Other, e))
                 .and_then(|mut items| {
                     items.sort_by(|it, next| it.message.cmp(&next.message));
                     Ok(items)

diff --git a/frameworks/Rust/actix/src/db_pg_direct.rs b/frameworks/Rust/actix/src/db_pg_direct.rs
@@ -16,7 +16,7 @@ pub struct PgConnection {
 }
 
 impl PgConnection {
-    pub fn connect(db_url: &str) -> impl Future<Item=PgConnection, Error=()> {
+    pub fn connect(db_url: &str) -> impl Future<Item = PgConnection, Error = ()> {
         let hs = connect(db_url.parse().unwrap(), TlsMode::None);
 
         hs.map_err(|_| panic!("can not connect to postgresql"))
@@ -32,12 +32,11 @@ impl PgConnection {
                                 cl.prepare("SELECT id FROM world WHERE id=$1")
                                     .map_err(|_| ())
                                     .and_then(|update| {
-
                                         Ok(PgConnection {
                                             cl,
                                             fortune: st.0,
                                             world: st.1,
-                                            update
+                                            update,
                                         })
                                     })
                             })
@@ -47,8 +46,7 @@ impl PgConnection {
 }
 
 impl PgConnection {
-
-    pub fn get_world(&self) -> impl Future<Item=World, Error=io::Error> {
+    pub fn get_world(&self) -> impl Future<Item = World, Error = io::Error> {
         let random_id = thread_rng().gen_range::<i32>(1, 10_001);
 
         self.cl
@@ -64,7 +62,9 @@ impl PgConnection {
             })
     }
 
-    pub fn get_worlds(&self, num: usize) -> impl Future<Item=Vec<World>, Error=io::Error> {
+    pub fn get_worlds(
+        &self, num: usize,
+    ) -> impl Future<Item = Vec<World>, Error = io::Error> {
         let mut worlds = Vec::with_capacity(num);
         for _ in 0..num {
             let w_id: i32 = thread_rng().gen_range(1, 10_001);
@@ -86,7 +86,9 @@ impl PgConnection {
         stream::futures_unordered(worlds).collect()
     }
 
-    pub fn update(&self, num: usize) -> impl Future<Item=Vec<World>, Error=io::Error> {
+    pub fn update(
+        &self, num: usize,
+    ) -> impl Future<Item = Vec<World>, Error = io::Error> {
         let mut worlds = Vec::with_capacity(num);
         for _ in 0..num {
             let id: i32 = thread_rng().gen_range(1, 10_001);
@@ -111,25 +113,27 @@ impl PgConnection {
             .collect()
             .and_then(move |mut worlds| {
                 let mut update = String::with_capacity(120 + 6 * num as usize);
-                update
-                    .push_str("UPDATE world SET randomnumber = temp.randomnumber FROM (VALUES ");
+                update.push_str(
+                    "UPDATE world SET randomnumber = temp.randomnumber FROM (VALUES ",
+                );
 
                 for w in &worlds {
                     update.push_str(&format!("({}, {}),", w.id, w.randomnumber));
                 }
                 worlds.sort_by_key(|w| w.id);
 
                 update.pop();
-                update
-                    .push_str(" ORDER BY 1) AS temp(id, randomnumber) WHERE temp.id = world.id");
+                update.push_str(
+                    " ORDER BY 1) AS temp(id, randomnumber) WHERE temp.id = world.id",
+                );
 
                 cl.batch_execute(&update)
-                  .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
-                  .and_then(|_| Ok(worlds))
+                    .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+                    .and_then(|_| Ok(worlds))
             })
     }
 
-    pub fn tell_fortune(&self) -> impl Future<Item=Vec<Fortune>, Error=io::Error> {
+    pub fn tell_fortune(&self) -> impl Future<Item = Vec<Fortune>, Error = io::Error> {
         let mut items = Vec::new();
         items.push(Fortune {
             id: 0,
@@ -144,8 +148,7 @@ impl PgConnection {
                     message: row.get(1),
                 });
                 Ok::<_, io::Error>(items)
-            })
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+            }).map_err(|e| io::Error::new(io::ErrorKind::Other, e))
             .and_then(|mut items| {
                 items.sort_by(|it, next| it.message.cmp(&next.message));
                 Ok(items)

diff --git a/frameworks/Rust/actix/src/main.rs b/frameworks/Rust/actix/src/main.rs
@@ -44,9 +44,9 @@ fn main() {
             .resource("/json", |r| r.f(json))
             .resource("/plaintext", |r| r.f(plaintext))
     }).backlog(8192)
-        .bind("0.0.0.0:8080")
-        .unwrap()
-        .start();
+    .bind("0.0.0.0:8080")
+    .unwrap()
+    .start();
 
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();

diff --git a/frameworks/Rust/actix/src/main_diesel.rs b/frameworks/Rust/actix/src/main_diesel.rs
@@ -50,8 +50,7 @@ fn world_row(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
                     .body(body))
             }
             Err(_) => Ok(HttpResponse::InternalServerError().into()),
-        })
-        .responder()
+        }).responder()
 }
 
 fn queries(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
@@ -79,8 +78,7 @@ fn queries(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
             } else {
                 Ok(HttpResponse::InternalServerError().into())
             }
-        })
-        .responder()
+        }).responder()
 }
 
 fn updates(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
@@ -109,8 +107,7 @@ fn updates(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
             } else {
                 Ok(HttpResponse::InternalServerError().into())
             }
-        })
-        .responder()
+        }).responder()
 }
 
 #[derive(Template)]
@@ -136,8 +133,7 @@ fn fortune(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
                     .body(res))
             }
             Err(_) => Ok(HttpResponse::InternalServerError().into()),
-        })
-        .responder()
+        }).responder()
 }
 
 fn main() {
@@ -164,9 +160,9 @@ fn main() {
             .resource("/queries", |r| r.route().f(queries))
             .resource("/updates", |r| r.route().f(updates))
     }).backlog(8192)
-        .bind("0.0.0.0:8080")
-        .unwrap()
-        .start();
+    .bind("0.0.0.0:8080")
+    .unwrap()
+    .start();
 
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();

diff --git a/frameworks/Rust/actix/src/main_pg.rs b/frameworks/Rust/actix/src/main_pg.rs
@@ -49,8 +49,7 @@ fn world_row(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
                     .body(body))
             }
             Err(_) => Ok(HttpResponse::InternalServerError().into()),
-        })
-        .responder()
+        }).responder()
 }
 
 fn queries(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
@@ -75,8 +74,7 @@ fn queries(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
             } else {
                 Ok(HttpResponse::InternalServerError().into())
             }
-        })
-        .responder()
+        }).responder()
 }
 
 fn updates(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
@@ -100,8 +98,7 @@ fn updates(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
             } else {
                 Ok(HttpResponse::InternalServerError().into())
             }
-        })
-        .responder()
+        }).responder()
 }
 
 #[derive(Template)]
@@ -127,8 +124,7 @@ fn fortune(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
                     .body(res))
             }
             Err(_) => Ok(HttpResponse::InternalServerError().into()),
-        })
-        .responder()
+        }).responder()
 }
 
 fn main() {
@@ -145,9 +141,9 @@ fn main() {
             .resource("/fortune", |r| r.route().f(fortune))
             .resource("/updates", |r| r.route().f(updates))
     }).backlog(8192)
-        .bind("0.0.0.0:8080")
-        .unwrap()
-        .start();
+    .bind("0.0.0.0:8080")
+    .unwrap()
+    .start();
 
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();