Mustache optimizations, plus minor DB optimizations (#6838)

frameworks/Swift/hummingbird/src-postgres/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.13.1")),
-        .package(url: "https://github.com/hummingbird-project/hummingbird-mustache.git", from: "1.0.0"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird-mustache.git", from: "1.0.1"),
         .package(url: "https://github.com/vapor/postgres-kit.git", from: "2.3.0"),
     ],
     targets: [

frameworks/Swift/hummingbird/src-postgres/Sources/server/Controllers/FortunesController.swift

@@ -27,7 +27,7 @@ class FortunesController {
         return request.db.query("SELECT id, message FROM Fortune").map { results in
             var fortunes = results.map {
                 return Fortune(
-                    id: $0.column("id")?.int32 ?? 0,
+                    id: $0.column("id")?.int32,
                     message: $0.column("message")?.string ?? ""
                 )
             }

frameworks/Swift/hummingbird/src-postgres/Sources/server/Controllers/WorldController.swift

@@ -9,13 +9,14 @@ class WorldController {
     }
 
     func single(request: HBRequest) -> EventLoopFuture<World> {
-        request.db.query("SELECT id, randomnumber FROM World WHERE id = $1", [
-            PostgresData(int32: .random(in: 1...10_000))
+        let id = Int32.random(in: 1...10_000)
+        return request.db.query("SELECT id, randomnumber FROM World WHERE id = $1", [
+            PostgresData(int32: id)
         ]).flatMapThrowing { result -> World in
             guard let firstResult = result.first else { throw HBHTTPError(.notFound) }
             return World(
-                id: firstResult.column("id")?.int32 ?? 0,
-                randomNumber: firstResult.column("randomnumber")?.int ?? 0
+                id: id,
+                randomNumber: firstResult.column("randomnumber")?.int32 ?? 0
             )
         }
     }
@@ -23,13 +24,14 @@ class WorldController {
     func multiple(request: HBRequest) -> EventLoopFuture<[World]> {
         let queries = (request.uri.queryParameters.get("queries", as: Int.self) ?? 1).bound(1, 500)
         let futures: [EventLoopFuture<World>] = (0 ..< queries).map { _ -> EventLoopFuture<World> in
-            request.db.query("SELECT id, randomnumber FROM World WHERE id = $1", [
-                PostgresData(int32: .random(in: 1...10_000))
+            let id = Int32.random(in: 1...10_000)
+            return request.db.query("SELECT id, randomnumber FROM World WHERE id = $1", [
+                PostgresData(int32: id)
             ]).flatMapThrowing { result -> World in
                 guard let firstResult = result.first else { throw HBHTTPError(.notFound) }
                 return World(
-                    id: firstResult.column("id")?.int32 ?? 0,
-                    randomNumber: firstResult.column("randomnumber")?.int ?? 0
+                    id: id,
+                    randomNumber: firstResult.column("randomnumber")?.int32 ?? 0
                 )
             }
         }
@@ -40,18 +42,17 @@ class WorldController {
         let queries = (request.uri.queryParameters.get("queries", as: Int.self) ?? 1).bound(1, 500)
         let ids = (0 ..< queries).map { _ in Int32.random(in: 1...10_000) }
         let futures: [EventLoopFuture<World>] = ids.map { _ -> EventLoopFuture<World> in
-            request.db.query("SELECT id, randomnumber FROM World WHERE id = $1", [
-                PostgresData(int32: .random(in: 1...10_000))
+            let id = Int32.random(in: 1...10_000)
+            let randomNumber = Int32.random(in: 1...10_000)
+            return request.db.query("SELECT id, randomnumber FROM World WHERE id = $1", [
+                PostgresData(int32: id)
             ]).flatMap { result in
-                guard let firstResult = result.first else { return request.failure(.notFound) }
-                let id = firstResult.column("id")?.int32 ?? 0
-                let randomNumber = Int32.random(in: 1...10_000)
                 return request.db.query("UPDATE World SET randomnumber = $1 WHERE id = $2", [
                     PostgresData(int32: randomNumber),
                     PostgresData(int32: id)
-                ]).map { ($0, World(id: id, randomNumber: numericCast(randomNumber))) }
-            }.map { (result: PostgresQueryResult, world) in
-                return world
+                ])
+            }.map { _ in
+                return World(id: id, randomNumber: randomNumber)
             }
         }
         return EventLoopFuture.whenAllSucceed(futures, on: request.eventLoop)

frameworks/Swift/hummingbird/src-postgres/Sources/server/Models/Fortune.swift

@@ -1,7 +1,21 @@
 import Hummingbird
+import HummingbirdMustache
 
 struct Fortune: HBResponseEncodable {
     var id: Int32?
     var message: String
 }
 
+// avoid using Mirror as it is expensive
+extension Fortune: HBMustacheParent {
+    func child(named: String) -> Any? {
+        switch named {
+        case "id":
+            return id
+        case "message":
+            return message
+        default:
+            return nil
+        }
+    }
+}

frameworks/Swift/hummingbird/src-postgres/Sources/server/Models/World.swift

@@ -2,6 +2,6 @@ import Hummingbird
 
 struct World: HBResponseEncodable {
     var id: Int32?
-    var randomNumber: Int
+    var randomNumber: Int32
 }