Merge remote-tracking branch 'upstream/master'

eastspire · eastspire · commit 353444b67758 · 2025-06-10T08:39:38.000+08:00
diff --git a/frameworks/Java/activeweb/pom.xml b/frameworks/Java/activeweb/pom.xml
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.9</version>
+            <version>2.13.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/frameworks/Java/avaje-jex/pom.xml b/frameworks/Java/avaje-jex/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.7.5</version>
+      <version>42.7.6</version>
     </dependency>
 
     <dependency>
diff --git a/frameworks/Java/avaje-jex/src/main/java/benchmark/repository/HikariFactory.java b/frameworks/Java/avaje-jex/src/main/java/benchmark/repository/HikariFactory.java
@@ -5,6 +5,7 @@
 import io.avaje.config.Config;
 import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
+import java.util.concurrent.Executors;
 import javax.sql.DataSource;
 
 @Factory
@@ -22,8 +23,21 @@ DataSource dataSource() {
       maxPoolSize = Config.getInt("postgresDefaultPoolSize");
     }
 
-    var hikari = new HikariDataSource(new HikariConfig("hikari.properties"));
-    hikari.setMaximumPoolSize(maxPoolSize);
-    return hikari;
+    maxPoolSize = Math.max(maxPoolSize, Runtime.getRuntime().availableProcessors() * 2);
+    HikariConfig hikariConfig = new HikariConfig("hikari.properties");
+
+    var vtThreadFactory = Thread.ofVirtual().factory();
+    hikariConfig.setThreadFactory(vtThreadFactory);
+    hikariConfig.setScheduledExecutor(
+        Executors.newScheduledThreadPool(maxPoolSize, vtThreadFactory));
+
+    // data source properties
+    hikariConfig.addDataSourceProperty("cachePrepStmts", "true");
+    hikariConfig.addDataSourceProperty("prepStmtCacheSize", "250");
+    hikariConfig.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
+    hikariConfig.addDataSourceProperty("ssl", "false");
+    hikariConfig.addDataSourceProperty("tcpKeepAlive", "true");
+    hikariConfig.setMaximumPoolSize(maxPoolSize);
+    return new HikariDataSource(hikariConfig);
   }
 }
diff --git a/frameworks/Java/avaje-jex/src/main/java/benchmark/repository/JDBCDbService.java b/frameworks/Java/avaje-jex/src/main/java/benchmark/repository/JDBCDbService.java
@@ -22,7 +22,7 @@ public JDBCDbService(DataSource connectionFactory) {
   }
 
   @Override
-  public List<World> getWorld(int num) {
+  public List<World> getWorld(int num) throws SQLException {
 
     String select = "select id, randomNumber from World where id = ?";
     List<World> worldList = new ArrayList<>();
@@ -37,8 +37,6 @@ public List<World> getWorld(int num) {
           worldList.add(new World(rs.getInt("id"), rs.getInt("randomNumber")));
         }
       }
-    } catch (SQLException e) {
-      throw new RuntimeException(e);
     }
 
     return worldList;
@@ -55,7 +53,7 @@ public List<Fortune> getFortune() throws SQLException {
         ResultSet rs = pstm.executeQuery()) {
 
       while (rs.next()) {
-        fortuneList.add(new Fortune(rs.getInt("id"), rs.getString("message")));
+        fortuneList.add(new Fortune(rs.getInt(1), rs.getString(2)));
       }
       fortuneList.add(new Fortune(defaultFortuneId, defaultFortuneMessage));
     }
diff --git a/frameworks/Java/avaje-jex/src/main/resources/application.properties b/frameworks/Java/avaje-jex/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 physicalTag=Citrine
 cloudTag=Azure
 
-postgresPhysicalPoolSize=56
+postgresPhysicalPoolSize=64
 postgresCloudPoolSize=16
 postgresDefaultPoolSize=10
diff --git a/frameworks/Java/avaje-jex/src/main/resources/hikari.properties b/frameworks/Java/avaje-jex/src/main/resources/hikari.properties
@@ -1,4 +1,4 @@
-dataSourceClassName=org.postgresql.ds.PGSimpleDataSource
+jdbcUrl=jdbc:postgresql://tfb-database:5432/hello_world
 dataSource.serverName=tfb-database
 dataSource.portNumber=5432
 dataSource.user=benchmarkdbuser
diff --git a/frameworks/Java/ninja-standalone/pom.xml b/frameworks/Java/ninja-standalone/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.9</version>
+            <version>2.13.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
diff --git a/frameworks/Java/smart-socket/pom.xml b/frameworks/Java/smart-socket/pom.xml
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>tech.smartboot.feat</groupId>
             <artifactId>feat-cloud-starter</artifactId>
-            <version>0.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.smartboot.socket</groupId>
-            <artifactId>aio-pro</artifactId>
-            <version>1.5.62-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>io.github.smartboot.socket</groupId>-->
+<!--            <artifactId>aio-pro</artifactId>-->
+<!--            <version>1.5.62-SNAPSHOT</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>tech.smartboot.servlet</groupId>
             <artifactId>servlet-core</artifactId>
diff --git a/frameworks/Java/tio-boot/pom.xml b/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.5</tio-boot.version>
+    <tio-boot.version>1.9.8</tio-boot.version>
 
 
     <main.class>com.litongjava.tio.http.server.MainApp</main.class>
diff --git a/frameworks/Java/tio-boot/src/main/java/com/litongjava/tio/http/server/MainAppConfig.java b/frameworks/Java/tio-boot/src/main/java/com/litongjava/tio/http/server/MainAppConfig.java
@@ -5,9 +5,9 @@
 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.CacheHandler;
-import com.litongjava.tio.http.server.controller.DbHandler;
-import com.litongjava.tio.http.server.controller.IndexHandler;
+import com.litongjava.tio.http.server.handler.CacheHandler;
+import com.litongjava.tio.http.server.handler.DbHandler;
+import com.litongjava.tio.http.server.handler.IndexHandler;
 import com.litongjava.tio.http.server.router.HttpRequestRouter;
 import com.litongjava.tio.utils.environment.EnvUtils;
 
@@ -38,7 +38,6 @@ public void config() throws Exception {
     TioBootServer server = TioBootServer.me();
     HttpRequestRouter requestRouter = server.getRequestRouter();
     if (requestRouter != null) {
-      requestRouter.add("/", controller::index);
       requestRouter.add("/plaintext", controller::plaintext);
       requestRouter.add("/json", controller::json);
 
diff --git a/frameworks/Java/tio-boot/src/main/java/com/litongjava/tio/http/server/handler/CacheHandler.java b/frameworks/Java/tio-boot/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.ArrayList;
 import java.util.List;
diff --git a/frameworks/Java/tio-boot/src/main/java/com/litongjava/tio/http/server/handler/DbHandler.java b/frameworks/Java/tio-boot/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;
diff --git a/frameworks/Java/tio-boot/src/main/java/com/litongjava/tio/http/server/handler/IndexHandler.java b/frameworks/Java/tio-boot/src/main/java/com/litongjava/tio/http/server/handler/IndexHandler.java
@@ -1,38 +1,37 @@
-package com.litongjava.tio.http.server.controller;
+package com.litongjava.tio.http.server.handler;
 
 import com.alibaba.fastjson2.JSON;
 import com.litongjava.tio.boot.http.TioRequestContext;
-import com.litongjava.tio.http.common.HeaderName;
-import com.litongjava.tio.http.common.HeaderValue;
 import com.litongjava.tio.http.common.HttpRequest;
 import com.litongjava.tio.http.common.HttpResponse;
+import com.litongjava.tio.http.common.utils.MimeTypeUtils;
 import com.litongjava.tio.http.server.model.Message;
-import com.litongjava.tio.http.server.util.Resps;
 
 /**
  * ab -k -n1000000 -c10 http://127.0.0.1:8080/json 
  * ab -k -n1000000 -c10 http://127.0.0.1:8080/plaintext
  */
 public class IndexHandler {
+  private static final String HELLO_WORLD_RN = "Hello, World!\r\n";
+  
   private static final String HELLO_WORLD = "Hello, World!";
 
-  private static final byte[] HELLO_WORLD_BYTES = HELLO_WORLD.getBytes();
-
-  public HttpResponse index(HttpRequest request) {
-    return Resps.txt(request, "tio-boot");
-  }
+  private static final byte[] HELLO_WORLD_BYTES = HELLO_WORLD_RN.getBytes();
+  private static byte[] JSON_BYTES = JSON.toJSONBytes(new Message(HELLO_WORLD));
 
   public HttpResponse plaintext(HttpRequest request) {
     HttpResponse response = TioRequestContext.getResponse();
     response.setBody(HELLO_WORLD_BYTES);
-    response.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_TXT);
+    String mimeTypeStr = MimeTypeUtils.getTextUTF8();
+    response.setContentType(mimeTypeStr);
     return response;
   }
 
   public HttpResponse json(HttpRequest request) {
     HttpResponse response = TioRequestContext.getResponse();
-    response.setBody(JSON.toJSONBytes(new Message(HELLO_WORLD)));
-    response.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
+    response.setBody(JSON_BYTES);
+    String mimeTypeStr = MimeTypeUtils.getJsonUTF8();
+    response.setContentType(mimeTypeStr);
     return response;
   }
 }
diff --git a/frameworks/Java/tio-boot/src/main/resources/app.properties b/frameworks/Java/tio-boot/src/main/resources/app.properties
@@ -6,4 +6,6 @@ server.port=8080
 
 JDBC_URL=jdbc:mysql://tfb-database/hello_world
 JDBC_USER=benchmarkdbuser
-JDBC_PSWD=benchmarkdbpass
+JDBC_PSWD=benchmarkdbpass
+
+#--tio.core.diagnostic=true --server.http.request.printPacket=true
diff --git a/frameworks/PHP/laravel/app/Http/Controllers/Controller.php b/frameworks/PHP/laravel/app/Http/Controllers/Controller.php
@@ -52,7 +52,8 @@ public function updates($queries = 1)
 
         while ($queries--) {
             $row = World::query()->find(self::randomInt());
-            $row->randomNumber = self::randomInt();
+            while (($randomInt = self::randomInt()) === $row->randomNumber) {}
+            $row->randomNumber = $randomInt;
             $row->save();
 
             $rows[] = $row;
diff --git a/frameworks/PHP/phalcon/phalcon-micro.dockerfile b/frameworks/PHP/phalcon/phalcon-micro.dockerfile
@@ -1,26 +1,26 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
-RUN apt-get install -y php-pear php8.3-dev > /dev/null
-RUN mkdir -p /etc/php/8.3/fpm/conf.d
-RUN pecl install phalcon > /dev/null && echo "extension=phalcon.so" > /etc/php/8.3/fpm/conf.d/phalcon.ini
+RUN apt-get install -y php-pear php8.4-dev > /dev/null
+RUN mkdir -p /etc/php/8.4/fpm/conf.d
+RUN pecl install phalcon > /dev/null && echo "extension=phalcon.so" > /etc/php/8.4/fpm/conf.d/phalcon.ini
 
 RUN apt-get install -yqq nginx git unzip \
-    php8.3-cli php8.3-fpm php8.3-mysql php8.3-mbstring php8.3-xml > /dev/null
+    php8.4-cli php8.4-fpm php8.4-mysql php8.4-mbstring php8.4-xml > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY deploy/conf/* /etc/php/8.3/fpm/
+COPY deploy/conf/* /etc/php/8.4/fpm/
 
 ADD ./ /phalcon
 WORKDIR /phalcon
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --ignore-platform-reqs
 
@@ -30,5 +30,5 @@ RUN chmod -R 777 app
 
 EXPOSE 8080
 
-CMD service php8.3-fpm start && \
+CMD service php8.4-fpm start && \
     nginx -c /phalcon/deploy/nginx.conf
diff --git a/frameworks/PHP/phalcon/phalcon-mongodb.dockerfile b/frameworks/PHP/phalcon/phalcon-mongodb.dockerfile
@@ -1,26 +1,26 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
-RUN apt-get install -y php-pear php8.3-dev > /dev/null
-RUN mkdir -p /etc/php/8.3/fpm/conf.d
-RUN pecl install phalcon > /dev/null && echo "extension=phalcon.so" > /etc/php/8.3/fpm/conf.d/phalcon.ini
+RUN apt-get install -y php-pear php8.4-dev > /dev/null
+RUN mkdir -p /etc/php/8.4/fpm/conf.d
+RUN pecl install phalcon > /dev/null && echo "extension=phalcon.so" > /etc/php/8.4/fpm/conf.d/phalcon.ini
 
 RUN apt-get install -yqq nginx git unzip \
-    php8.3-cli php8.3-fpm php8.3-mbstring php8.3-xml php8.3-mongodb > /dev/null
+    php8.4-cli php8.4-fpm php8.4-mbstring php8.4-xml php8.4-mongodb > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY deploy/conf/* /etc/php/8.3/fpm/
+COPY deploy/conf/* /etc/php/8.4/fpm/
 
 ADD ./ /phalcon
 WORKDIR /phalcon
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet --ignore-platform-reqs
 
@@ -30,5 +30,5 @@ RUN chmod -R 777 app
 
 EXPOSE 8080
 
-CMD service php8.3-fpm start && \
+CMD service php8.4-fpm start && \
     nginx -c /phalcon/deploy/nginx.conf
diff --git a/frameworks/PHP/phalcon/phalcon.dockerfile b/frameworks/PHP/phalcon/phalcon.dockerfile
@@ -1,32 +1,32 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
-RUN apt-get install -y php-pear php8.3-dev > /dev/null
-RUN mkdir -p /etc/php/8.3/fpm/conf.d
-RUN pecl install phalcon > /dev/null && echo "extension=phalcon.so" > /etc/php/8.3/fpm/conf.d/phalcon.ini
+RUN apt-get install -y php-pear php8.4-dev > /dev/null
+RUN mkdir -p /etc/php/8.4/fpm/conf.d
+RUN pecl install phalcon > /dev/null && echo "extension=phalcon.so" > /etc/php/8.4/fpm/conf.d/phalcon.ini
 
 RUN apt-get install -yqq nginx git unzip \
-    php8.3-cli php8.3-fpm php8.3-mysql php8.3-mbstring php8.3-xml > /dev/null
+    php8.4-cli php8.4-fpm php8.4-mysql php8.4-mbstring php8.4-xml > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY deploy/conf/* /etc/php/8.3/fpm/
+COPY deploy/conf/* /etc/php/8.4/fpm/
 
 ADD ./ /phalcon
 WORKDIR /phalcon
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --ignore-platform-reqs
 
 RUN chmod -R 777 app
 
 EXPOSE 8080
 
-CMD service php8.3-fpm start && \
+CMD service php8.4-fpm start && \
     nginx -c /phalcon/deploy/nginx.conf
diff --git a/frameworks/Python/aiohttp/app/main.py b/frameworks/Python/aiohttp/app/main.py
@@ -49,10 +49,11 @@ def pg_dsn(dialect=None) -> str:
 async def db_ctx(app: web.Application):
     # number of gunicorn workers = multiprocessing.cpu_count() as per gunicorn_conf.py
     # max_connections = 2000 as per toolset/setup/linux/databases/postgresql/postgresql.conf:64
-    # give 10% leeway
-    max_size = min(1800 / multiprocessing.cpu_count(), 160)
-    max_size = max(int(max_size), 1)
-    min_size = max(int(max_size / 2), 1)
+    # since the world table contains only 10,000 rows, a large connection pool is unnecessary
+    # the server hardware provides 56 CPU cores producing high concurrency
+    # https://wiki.postgresql.org/wiki/Number_Of_Database_Connections
+    max_size = 2
+    min_size = 2
     print(f'connection pool: min size: {min_size}, max size: {max_size}, orm: {CONNECTION_ORM}')
     if CONNECTION_ORM:
         dsn = pg_dsn('asyncpg')
diff --git a/frameworks/Python/aiohttp/app/views.py b/frameworks/Python/aiohttp/app/views.py
diff --git a/frameworks/Python/blacksheep/app-socketify.py b/frameworks/Python/blacksheep/app-socketify.py
diff --git a/frameworks/Ruby/rack-sequel/Gemfile b/frameworks/Ruby/rack-sequel/Gemfile
diff --git a/frameworks/Ruby/rack-sequel/Gemfile.lock b/frameworks/Ruby/rack-sequel/Gemfile.lock
diff --git a/frameworks/Rust/hyperlane/Cargo.lock b/frameworks/Rust/hyperlane/Cargo.lock

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public JDBCDbService(DataSource connectionFactory) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`		`- public List<World> getWorld(int num) {`
	`25`	`+ public List<World> getWorld(int num) throws SQLException {`
`26`	`26`
`27`	`27`	`String select = "select id, randomNumber from World where id = ?";`
`28`	`28`	`List<World> worldList = new ArrayList<>();`
`@@ -37,8 +37,6 @@ public List<World> getWorld(int num) {`
`37`	`37`	`worldList.add(new World(rs.getInt("id"), rs.getInt("randomNumber")));`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`- } catch (SQLException e) {`
`41`		`- throw new RuntimeException(e);`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`return worldList;`
`@@ -55,7 +53,7 @@ public List<Fortune> getFortune() throws SQLException {`
`55`	`53`	`ResultSet rs = pstm.executeQuery()) {`
`56`	`54`
`57`	`55`	`while (rs.next()) {`
`58`		`- fortuneList.add(new Fortune(rs.getInt("id"), rs.getString("message")));`
	`56`	`+ fortuneList.add(new Fortune(rs.getInt(1), rs.getString(2)));`
`59`	`57`	`}`
`60`	`58`	`fortuneList.add(new Fortune(defaultFortuneId, defaultFortuneMessage));`
`61`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-dataSourceClassName=org.postgresql.ds.PGSimpleDataSource`
	`1`	`+jdbcUrl=jdbc:postgresql://tfb-database:5432/hello_world`
`2`	`2`	`dataSource.serverName=tfb-database`
`3`	`3`	`dataSource.portNumber=5432`
`4`	`4`	`dataSource.user=benchmarkdbuser`