Merge branch 'TechEmpower:master' into tio-boot

Author: litongjava

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>

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);
   }
 }

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));
     }

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

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

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;

frameworks/Ruby/rack-sequel/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'json', '~> 2.8'
 gem 'sequel', '~> 5.0'
-gem 'rack', '~> 3.0'
+gem 'rack', '~> 3.1'
 
 group :mysql, optional: true do
   gem 'mysql2', '~> 0.4', platforms: [:ruby, :mswin]

frameworks/Ruby/rack-sequel/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
     pg (1.5.9)
     puma (6.6.0)
       nio4r (~> 2.0)
-    rack (3.1.11)
+    rack (3.1.16)
     sequel (5.90.0)
       bigdecimal
     sequel_pg (1.17.1)
@@ -25,7 +25,7 @@ DEPENDENCIES
   mysql2 (~> 0.4)
   pg (~> 1.5)
   puma (~> 6.5)
-  rack (~> 3.0)
+  rack (~> 3.1)
   sequel (~> 5.0)
   sequel_pg (~> 1.6)