Update dependencies and change settings

jaguililla · jaguililla · commit 3846a22bae0d · 2024-08-15T23:22:33.000+02:00
diff --git a/frameworks/Kotlin/hexagon/build.gradle b/frameworks/Kotlin/hexagon/build.gradle
@@ -1,6 +1,6 @@
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "2.0.20-RC" apply false
+    id "org.jetbrains.kotlin.jvm" version "2.0.10" apply false
     id "org.graalvm.buildtools.native" version "0.10.2" apply false
 }
 
@@ -9,7 +9,7 @@ description = "TFB benchmark"
 group = "com.hexagonkt"
 
 ext {
-    hexagonVersion = "3.6.1"
+    hexagonVersion = "3.6.2"
     jettyVersion = "12.0.12"
     nettyVersion = "4.1.112.Final"
 
@@ -30,5 +30,5 @@ subprojects {
 }
 
 tasks.wrapper {
-    gradleVersion = "8.9"
+    gradleVersion = "8.10"
 }
diff --git a/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.jar b/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.jar
diff --git a/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties b/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/frameworks/Kotlin/hexagon/gradlew b/frameworks/Kotlin/hexagon/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/frameworks/Kotlin/hexagon/gradlew.bat b/frameworks/Kotlin/hexagon/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/frameworks/Kotlin/hexagon/hexagon-helidon-native.dockerfile b/frameworks/Kotlin/hexagon/hexagon-helidon-native.dockerfile
@@ -16,6 +16,8 @@ RUN ./gradlew --quiet -x test hexagon_helidon_pgclient:nativeCompile
 FROM scratch
 ARG PROJECT=hexagon_helidon_pgclient
 
+ENV maximumPoolSize 300
+
 COPY --from=build /hexagon/$PROJECT/build/native/nativeCompile/$PROJECT /
 
 ENTRYPOINT [ "/hexagon_helidon_pgclient" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-helidon-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-helidon-pgclient.dockerfile
@@ -1,22 +1,23 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.9-jdk21-alpine AS build
+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-22-cds-musl AS build
 USER root
 WORKDIR /hexagon
 
 ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
+RUN ./gradlew --quiet classes
+RUN ./gradlew --quiet -x test installDist
 
 #
 # RUNTIME
 #
-FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
+FROM docker.io/bellsoft/liberica-runtime-container:jre-22-musl
 ARG PROJECT=hexagon_helidon_pgclient
 
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV JDK_JAVA_OPTIONS --enable-preview -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+ENV maximumPoolSize 300
 
 COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-helidon.dockerfile b/frameworks/Kotlin/hexagon/hexagon-helidon.dockerfile
@@ -1,22 +1,23 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.9-jdk21-alpine AS build
+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-22-cds-musl AS build
 USER root
 WORKDIR /hexagon
 
 ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
+RUN ./gradlew --quiet classes
+RUN ./gradlew --quiet -x test installDist
 
 #
 # RUNTIME
 #
-FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
+FROM docker.io/bellsoft/liberica-runtime-container:jre-22-musl
 ARG PROJECT=hexagon_helidon_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV JDK_JAVA_OPTIONS --enable-preview -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+ENV maximumPoolSize 300
 
 COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-jetty-native.dockerfile b/frameworks/Kotlin/hexagon/hexagon-jetty-native.dockerfile
@@ -16,6 +16,8 @@ RUN ./gradlew --quiet -x test hexagon_jetty_postgresql:nativeCompile
 FROM scratch
 ARG PROJECT=hexagon_jetty_postgresql
 
+ENV maximumPoolSize 300
+
 COPY --from=build /hexagon/$PROJECT/build/native/nativeCompile/$PROJECT /
 
 ENTRYPOINT [ "/hexagon_jetty_postgresql" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-jettyloom-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-jettyloom-pgclient.dockerfile
@@ -1,13 +1,13 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.9-jdk21-alpine AS build
+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-21-cds-musl AS build
 USER root
 WORKDIR /hexagon
 
 ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
+RUN ./gradlew --quiet classes
+RUN ./gradlew --quiet -x test installDist
 
 #
 # RUNTIME
@@ -17,6 +17,7 @@ ARG PROJECT=hexagon_jetty_pgclient
 
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV JDK_JAVA_OPTIONS --enable-preview -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA -DvirtualThreads=true
+ENV maximumPoolSize 300
 
 COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-jettyloom.dockerfile b/frameworks/Kotlin/hexagon/hexagon-jettyloom.dockerfile
@@ -1,13 +1,13 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.9-jdk21-alpine AS build
+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-21-cds-musl AS build
 USER root
 WORKDIR /hexagon
 
 ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
+RUN ./gradlew --quiet classes
+RUN ./gradlew --quiet -x test installDist
 
 #
 # RUNTIME
@@ -17,6 +17,7 @@ ARG PROJECT=hexagon_jetty_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV JDK_JAVA_OPTIONS --enable-preview -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA -DvirtualThreads=true
+ENV maximumPoolSize 300
 
 COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-nettyepoll-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nettyepoll-pgclient.dockerfile
@@ -1,13 +1,13 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.9-jdk21-alpine AS build
+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-21-cds-musl AS build
 USER root
 WORKDIR /hexagon
 
 ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
+RUN ./gradlew --quiet classes
+RUN ./gradlew --quiet -x test installDist
 
 #
 # RUNTIME
@@ -17,6 +17,7 @@ ARG PROJECT=hexagon_nettyepoll_pgclient
 
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV JDK_JAVA_OPTIONS -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+ENV maximumPoolSize 300
 
 COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-nettyepoll.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nettyepoll.dockerfile
@@ -1,13 +1,13 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.9-jdk21-alpine AS build
+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-21-cds-musl AS build
 USER root
 WORKDIR /hexagon
 
 ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
+RUN ./gradlew --quiet classes
+RUN ./gradlew --quiet -x test installDist
 
 #
 # RUNTIME
@@ -17,6 +17,7 @@ ARG PROJECT=hexagon_nettyepoll_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV JDK_JAVA_OPTIONS -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+ENV maximumPoolSize 300
 
 COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile b/frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile
@@ -1,13 +1,13 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.9-jdk21-alpine AS build
+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-21-cds-musl AS build
 USER root
 WORKDIR /hexagon
 
 ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test war
+RUN ./gradlew --quiet classes
+RUN ./gradlew --quiet -x test war
 
 #
 # RUNTIME
@@ -17,5 +17,6 @@ ARG MODULE=/hexagon/hexagon_tomcat_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV JDK_JAVA_OPTIONS -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+ENV maximumPoolSize 300
 
 COPY --from=build $MODULE/build/libs/ROOT.war /usr/local/tomcat/webapps/ROOT.war
diff --git a/frameworks/Kotlin/hexagon/hexagon.dockerfile b/frameworks/Kotlin/hexagon/hexagon.dockerfile
@@ -1,13 +1,13 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.9-jdk21-alpine AS build
+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-21-cds-musl AS build
 USER root
 WORKDIR /hexagon
 
 ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
+RUN ./gradlew --quiet classes
+RUN ./gradlew --quiet -x test installDist
 
 #
 # RUNTIME
@@ -17,6 +17,7 @@ ARG PROJECT=hexagon_jetty_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database
 ENV JDK_JAVA_OPTIONS -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+ENV maximumPoolSize 300
 
 COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
 
diff --git a/frameworks/Kotlin/hexagon/store_pgclient/src/main/kotlin/BenchmarkPgClientStore.kt b/frameworks/Kotlin/hexagon/store_pgclient/src/main/kotlin/BenchmarkPgClientStore.kt
@@ -6,8 +6,10 @@ import com.hexagonkt.model.CachedWorld
 import com.hexagonkt.model.Fortune
 import com.hexagonkt.model.World
 import io.vertx.core.Future
+import io.vertx.core.Vertx
+import io.vertx.core.VertxOptions
+import io.vertx.pgclient.PgBuilder
 import io.vertx.pgclient.PgConnectOptions
-import io.vertx.pgclient.PgPool
 import io.vertx.sqlclient.*
 import org.cache2k.Cache
 
@@ -35,11 +37,15 @@ class BenchmarkPgClientStore(
     private val poolOptions: PoolOptions by lazy {
         PoolOptions().apply {
             val environment = Jvm.systemSettingOrNull<String>("BENCHMARK_ENV")?.lowercase()
-            maxSize = 8 + if (environment == "citrine") Jvm.cpuCount else Jvm.cpuCount * 2
+            val poolSize = 8 + if (environment == "citrine") Jvm.cpuCount else Jvm.cpuCount * 2
+            maxSize = Jvm.systemSettingOrNull(Int::class, "maximumPoolSize") ?: poolSize
         }
     }
 
-    private val dataSource: SqlClient by lazy { PgPool.client(connectOptions, poolOptions) }
+    private val dataSource: SqlClient by lazy {
+        val vertx = Vertx.vertx(VertxOptions().setPreferNativeTransport(true))
+        PgBuilder.client().using(vertx).connectingTo(connectOptions).with(poolOptions).build()
+    }
 
     override fun findAllFortunes(): List<Fortune> =
         dataSource.preparedQuery(SELECT_ALL_FORTUNES)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`plugins {`
`3`		`- id "org.jetbrains.kotlin.jvm" version "2.0.20-RC" apply false`
	`3`	`+ id "org.jetbrains.kotlin.jvm" version "2.0.10" apply false`
`4`	`4`	`id "org.graalvm.buildtools.native" version "0.10.2" apply false`
`5`	`5`	`}`
`6`	`6`
`@@ -9,7 +9,7 @@ description = "TFB benchmark"`
`9`	`9`	`group = "com.hexagonkt"`
`10`	`10`
`11`	`11`	`ext {`
`12`		`- hexagonVersion = "3.6.1"`
	`12`	`+ hexagonVersion = "3.6.2"`
`13`	`13`	`jettyVersion = "12.0.12"`
`14`	`14`	`nettyVersion = "4.1.112.Final"`
`15`	`15`
`@@ -30,5 +30,5 @@ subprojects {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`tasks.wrapper {`
`33`		`- gradleVersion = "8.9"`
	`33`	`+ gradleVersion = "8.10"`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`# See the License for the specific language governing permissions and`
`16`	`16`	`# limitations under the License.`
`17`	`17`	`#`
	`18`	`+# SPDX-License-Identifier: Apache-2.0`
	`19`	`+#`
`18`	`20`
`19`	`21`	`##############################################################################`
`20`	`22`	`#`
`@@ -55,7 +57,7 @@`
`55`	`57`	`# Darwin, MinGW, and NonStop.`
`56`	`58`	`#`
`57`	`59`	`# (3) This script is generated from the Groovy template`
`58`		`-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
	`60`	`+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
`59`	`61`	`# within the Gradle project.`
`60`	`62`	`#`
`61`	`63`	`# You can find Gradle at https://github.com/gradle/gradle/.`
`@@ -84,7 +86,8 @@ done`
`84`	`86`	`# shellcheck disable=SC2034`
`85`	`87`	`APP_BASE_NAME=${0##*/}`
`86`	`88`	`# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)`
`87`		`-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) \|\| exit`
	`89`	`+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s`
	`90`	`+' "$PWD" ) \|\| exit`
`88`	`91`
`89`	`92`	`# Use the maximum available, or set MAX_FD != -1 to use that value.`
`90`	`93`	`MAX_FD=maximum`
Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,23 @@`
`1`	`1`	`#`
`2`	`2`	`# BUILD`
`3`	`3`	`#`
`4`		`-FROM docker.io/gradle:8.9-jdk21-alpine AS build`
	`4`	`+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-22-cds-musl AS build`
`5`	`5`	`USER root`
`6`	`6`	`WORKDIR /hexagon`
`7`	`7`
`8`	`8`	`ADD . .`
`9`		`-RUN gradle --quiet classes`
`10`		`-RUN gradle --quiet -x test installDist`
	`9`	`+RUN ./gradlew --quiet classes`
	`10`	`+RUN ./gradlew --quiet -x test installDist`
`11`	`11`
`12`	`12`	`#`
`13`	`13`	`# RUNTIME`
`14`	`14`	`#`
`15`		`-FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl`
	`15`	`+FROM docker.io/bellsoft/liberica-runtime-container:jre-22-musl`
`16`	`16`	`ARG PROJECT=hexagon_helidon_pgclient`
`17`	`17`
`18`	`18`	`ENV POSTGRESQL_DB_HOST tfb-database`
`19`	`19`	`ENV JDK_JAVA_OPTIONS --enable-preview -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA`
	`20`	`+ENV maximumPoolSize 300`
`20`	`21`
`21`	`22`	`COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT`
`22`	`23`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`#`
`2`	`2`	`# BUILD`
`3`	`3`	`#`
`4`		`-FROM docker.io/gradle:8.9-jdk21-alpine AS build`
	`4`	`+FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-21-cds-musl AS build`
`5`	`5`	`USER root`
`6`	`6`	`WORKDIR /hexagon`
`7`	`7`
`8`	`8`	`ADD . .`
`9`		`-RUN gradle --quiet classes`
`10`		`-RUN gradle --quiet -x test installDist`
	`9`	`+RUN ./gradlew --quiet classes`
	`10`	`+RUN ./gradlew --quiet -x test installDist`
`11`	`11`
`12`	`12`	`#`
`13`	`13`	`# RUNTIME`
`@@ -17,6 +17,7 @@ ARG PROJECT=hexagon_jetty_pgclient`
`17`	`17`
`18`	`18`	`ENV POSTGRESQL_DB_HOST tfb-database`
`19`	`19`	`ENV JDK_JAVA_OPTIONS --enable-preview -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA -DvirtualThreads=true`
	`20`	`+ENV maximumPoolSize 300`
`20`	`21`
`21`	`22`	`COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT`
`22`	`23`