Merge branch 'TechEmpower:master' into master

Author: eastspire

.github/workflows/build.yml

@@ -155,7 +155,7 @@ jobs:
           # run-ci.py runs the diffing to see if github actions needs to test this framework. Ideally/eventually,
           # we'd like to try and do the diffing before github_actions_clean & setup.
           # This will run the tests exactly as you would in your own vm:
-          docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --test-dir $RUN_TESTS --results-environment Github-Actions;
+          docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --test-dir $RUN_TESTS --results-environment Github-Actions;
   dependabot:
     needs: verify
     runs-on: ubuntu-latest

frameworks/Java/tio-boot/pom.xml

@@ -11,7 +11,7 @@
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <tio-boot.version>1.9.3</tio-boot.version>
+    <tio-boot.version>1.9.4</tio-boot.version>
 
 
     <main.class>com.litongjava.tio.http.server.MainApp</main.class>

frameworks/Java/tio-http-server/pom.xml

@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.litongjava</groupId>
   <artifactId>tio-http-server-benchmark</artifactId>
@@ -18,17 +16,18 @@
     <dependency>
       <groupId>com.litongjava</groupId>
       <artifactId>tio-http-server</artifactId>
-      <version>3.7.3.v20250301-RELEASE</version>
+      <version>3.7.3.v20250401-RELEASE</version>
     </dependency>
-        <dependency>
+
+    <dependency>
       <groupId>com.litongjava</groupId>
-      <artifactId>tio-core</artifactId>
-      <version>3.7.3.v20250305-RELEASE</version>
+      <artifactId>tio-utils</artifactId>
+      <version>3.7.3.v20250401-RELEASE</version>
     </dependency>
     <dependency>
       <groupId>com.litongjava</groupId>
       <artifactId>java-db</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -62,6 +61,12 @@
       <version>4.0.3</version>
     </dependency>
 
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.13</version>
+    </dependency>
+
   </dependencies>
   <repositories>
     <repository>

frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/MainApp.java

@@ -5,10 +5,10 @@
 import com.litongjava.tio.http.server.config.EhCachePluginConfig;
 import com.litongjava.tio.http.server.config.EnjoyEngineConfig;
 import com.litongjava.tio.http.server.config.MysqlDbConfig;
-import com.litongjava.tio.http.server.controller.CacheController;
-import com.litongjava.tio.http.server.controller.DbController;
-import com.litongjava.tio.http.server.controller.IndexController;
+import com.litongjava.tio.http.server.handler.CacheHandler;
+import com.litongjava.tio.http.server.handler.DbHandler;
 import com.litongjava.tio.http.server.handler.DefaultHttpRequestDispatcher;
+import com.litongjava.tio.http.server.handler.IndexHandler;
 import com.litongjava.tio.http.server.router.DefaultHttpRequestRouter;
 import com.litongjava.tio.http.server.router.HttpRequestRouter;
 import com.litongjava.tio.server.ServerTioConfig;
@@ -21,20 +21,20 @@ public static void main(String[] args) {
     EnvUtils.buildCmdArgsMap(args);
     EnvUtils.load();
     // add route
-    IndexController controller = new IndexController();
+    IndexHandler controller = new IndexHandler();
 
     HttpRequestRouter simpleHttpRoutes = new DefaultHttpRequestRouter();
     simpleHttpRoutes.add("/", controller::index);
     simpleHttpRoutes.add("/plaintext", controller::plaintext);
     simpleHttpRoutes.add("/json", controller::json);
 
-    DbController dbQueryController = new DbController();
+    DbHandler dbQueryController = new DbHandler();
     simpleHttpRoutes.add("/db", dbQueryController::db);
     simpleHttpRoutes.add("/queries", dbQueryController::queries);
     simpleHttpRoutes.add("/updates", dbQueryController::updates);
     simpleHttpRoutes.add("/fortunes", dbQueryController::fortunes);
 
-    CacheController cacheController = new CacheController();
+    CacheHandler cacheController = new CacheHandler();
     simpleHttpRoutes.add("/cachedQuery", cacheController::cachedQuery);
 
     // config server

…p/server/controller/CacheController.java …io/http/server/handler/CacheHandler.javaframeworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/controller/CacheController.java renamed to frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/handler/CacheHandler.java frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/controller/CacheController.java renamed to frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/handler/CacheHandler.java

@@ -1,4 +1,4 @@
-package com.litongjava.tio.http.server.controller;
+package com.litongjava.tio.http.server.handler;
 
 import java.util.List;
 import java.util.Map;
@@ -14,7 +14,7 @@
 import com.litongjava.tio.http.common.HttpResponse;
 import com.litongjava.tio.http.server.utils.RandomUtils;
 
-public class CacheController {
+public class CacheHandler {
   // private Logger log = LoggerFactory.getLogger(this.getClass());
 
   public HttpResponse cachedQuery(HttpRequest request) {

…http/server/controller/DbController.java …a/tio/http/server/handler/DbHandler.javaframeworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/controller/DbController.java renamed to frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/handler/DbHandler.java frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/controller/DbController.java renamed to frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/handler/DbHandler.java

@@ -1,4 +1,4 @@
-package com.litongjava.tio.http.server.controller;
+package com.litongjava.tio.http.server.handler;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -22,7 +22,7 @@
 import com.litongjava.tio.http.server.util.Resps;
 import com.litongjava.tio.http.server.utils.RandomUtils;
 
-public class DbController {
+public class DbHandler {
 
   public HttpResponse db(HttpRequest request) {
     Integer id = request.getInt("id");

…p/server/controller/IndexController.java …io/http/server/handler/IndexHandler.javaframeworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/controller/IndexController.java renamed to frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/handler/IndexHandler.java frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/controller/IndexController.java renamed to frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/handler/IndexHandler.java

@@ -1,4 +1,4 @@
-package com.litongjava.tio.http.server.controller;
+package com.litongjava.tio.http.server.handler;
 
 import com.alibaba.fastjson2.JSON;
 import com.litongjava.tio.http.common.HeaderName;
@@ -12,7 +12,7 @@
  * ab -k -n1000000 -c10 http://127.0.0.1:8080/json 
  * ab -k -n1000000 -c10 http://127.0.0.1:8080/plaintext
  */
-public class IndexController {
+public class IndexHandler {
   private static final String HELLO_WORLD = "Hello, World!";
 
   private static final byte[] HELLO_WORLD_BYTES = HELLO_WORLD.getBytes();

frameworks/Kotlin/ktor/ktor-r2dbc/pom.xml

@@ -12,7 +12,7 @@
     <name>org.jetbrains.ktor tech-empower-framework-benchmark</name>
 
     <properties>
-        <kotlin.version>2.0.21</kotlin.version>
+        <kotlin.version>2.1.20</kotlin.version>
         <kotlin.coroutines.version>1.10.1</kotlin.coroutines.version>
         <ktor.version>3.1.1</ktor.version>
         <serialization.version>1.8.0</serialization.version>

frameworks/Kotlin/ktor/ktor-r2dbc/src/main/kotlin/org/jetbrains/ktor/benchmarks/Hello.kt

@@ -32,6 +32,14 @@ import org.jetbrains.ktor.benchmarks.models.World
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono
 import kotlin.random.Random
+import java.time.Duration
+
+private val json = Json {
+    prettyPrint = false
+    isLenient = true
+    ignoreUnknownKeys = true
+    coerceInputValues = true
+}
 
 fun Application.main() {
     val config = ApplicationConfig("application.conf")
@@ -40,22 +48,23 @@ fun Application.main() {
     install(DefaultHeaders)
 
     val helloWorldContent = TextContent("Hello, World!", ContentType.Text.Plain)
+    val helloWorldMsg = Message("Hello, world!")
 
     routing {
         get("/plaintext") {
             call.respond(helloWorldContent)
         }
 
         get("/json") {
-            call.respondText(Json.encodeToString(Message("Hello, world!")), ContentType.Application.Json)
+            call.respondText(json.encodeToString(helloWorldMsg), ContentType.Application.Json)
         }
 
         get("/db") {
             val random = Random.Default
             val request = getWorld(dbConnFactory, random)
             val result = request.awaitFirstOrNull()
 
-            call.respondText(Json.encodeToString(result), ContentType.Application.Json)
+            call.respondText(json.encodeToString(result), ContentType.Application.Json)
         }
 
         fun selectWorlds(queries: Int, random: Random): Flow<World> = flow {
@@ -74,7 +83,7 @@ fun Application.main() {
                 }
             }
 
-            call.respondText(Json.encodeToString(result), ContentType.Application.Json)
+            call.respondText(json.encodeToString(result), ContentType.Application.Json)
         }
 
         get("/fortunes") {
@@ -135,21 +144,28 @@ fun Application.main() {
                 }
             }
 
-            call.respondText(Json.encodeToString(worldsUpdated), ContentType.Application.Json)
+            call.respondText(json.encodeToString(worldsUpdated), ContentType.Application.Json)
         }
     }
 }
 
 private fun getWorld(
     dbConnFactory: ConnectionFactory, random: Random
 ): Mono<World> = Mono.usingWhen(dbConnFactory.create(), { connection ->
-    Mono.from(connection.createStatement(WORLD_QUERY).bind(0, random.nextInt(DB_ROWS) + 1).execute()).flatMap { r ->
-        Mono.from(r.map { row, _ ->
-            World(
-                row.get(0, Int::class.java)!!, row.get(1, Int::class.java)!!
-            )
-        })
-    }
+    Mono.from(connection.createStatement(WORLD_QUERY)
+        .bind("$1", random.nextInt(DB_ROWS) + 1)
+        .execute())
+        .flatMap { r ->
+            Mono.from(r.map { row, _ ->
+                val id = row.get(0, Int::class.java)
+                val randomNumber = row.get(1, Int::class.java)
+                if (id != null && randomNumber != null) {
+                    World(id, randomNumber)
+                } else {
+                    throw IllegalStateException("Database returned null values for required fields")
+                }
+            })
+        }
 }, Connection::close)
 
 private fun configurePostgresR2DBC(config: ApplicationConfig): ConnectionFactory {
@@ -170,6 +186,9 @@ private fun configurePostgresR2DBC(config: ApplicationConfig): ConnectionFactory
     val cp = ConnectionPoolConfiguration.builder(cf)
         .initialSize(config.property("db.initPoolSize").getString().toInt())
         .maxSize(config.property("db.maxPoolSize").getString().toInt())
+        .maxIdleTime(Duration.ofSeconds(30))
+        .maxAcquireTime(Duration.ofSeconds(5))
+        .validationQuery("SELECT 1")
         .build()
 
     return ConnectionPool(cp)

frameworks/Kotlin/ktor/ktor-r2dbc/src/main/kotlin/org/jetbrains/ktor/benchmarks/models/Fortune.kt

@@ -3,4 +3,4 @@ package org.jetbrains.ktor.benchmarks.models
 import kotlinx.serialization.Serializable
 
 @Serializable
-class Fortune(val id: Int, var message: String)
+data class Fortune(val id: Int, var message: String)