Skip to content

Commit 809537e

Browse files
jaguilillajaguililla
authored
[ Kotlin / Hexagon ] Update Hexagon version and disable native image benchmarks (#9819)
* Update dependencies * Update dependencies * Update dependencies * Update dependencies * Update dependencies * Fix native image settings * Change implementations * Update version * Add tests for new adapter * Update dependencies * Update dependencies * Update dependencies * Update dependencies * Update dependencies * Update dependencies * Disable native benchmarks * Update configuration
1 parent 2999989 commit 809537e

File tree

22 files changed

+54
-116
lines changed

22 files changed

+54
-116
lines changed

‎frameworks/Kotlin/hexagon/benchmark_config.json‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,6 @@
2525
"notes": "http://hexagonkt.com",
2626
"versus": "servlet"
2727
},
28-
"jetty-native": {
29-
"json_url": "/json",
30-
"db_url": "/db",
31-
"query_url": "/query?queries=",
32-
"fortune_url": "/fortunes",
33-
"update_url": "/update?queries=",
34-
"cached_query_url": "/cached-queries?count=",
35-
"plaintext_url": "/plaintext",
36-
"port": 9090,
37-
"approach": "Realistic",
38-
"classification": "Micro",
39-
"database": "postgres",
40-
"framework": "Hexagon",
41-
"language": "Kotlin",
42-
"orm": "Raw",
43-
"platform": "Servlet",
44-
"webserver": "None",
45-
"os": "Linux",
46-
"database_os": "Linux",
47-
"display_name": "Hexagon Jetty Native PostgreSQL",
48-
"notes": "http://hexagonkt.com",
49-
"versus": "servlet"
50-
},
5128
"jdk": {
5229
"json_url": "/json",
5330
"db_url": "/db",
@@ -163,29 +140,6 @@
163140
"notes": "http://hexagonkt.com",
164141
"versus": "helidon-helidon"
165142
},
166-
"helidon-native": {
167-
"json_url": "/json",
168-
"db_url": "/db",
169-
"query_url": "/query?queries=",
170-
"fortune_url": "/fortunes",
171-
"update_url": "/update?queries=",
172-
"cached_query_url": "/cached-queries?count=",
173-
"plaintext_url": "/plaintext",
174-
"port": 9090,
175-
"approach": "Realistic",
176-
"classification": "Micro",
177-
"database": "postgres",
178-
"framework": "Hexagon",
179-
"language": "Kotlin",
180-
"orm": "Raw",
181-
"platform": "Helidon",
182-
"webserver": "None",
183-
"os": "Linux",
184-
"database_os": "Linux",
185-
"display_name": "Hexagon Helidon Native PgClient",
186-
"notes": "http://hexagonkt.com",
187-
"versus": "helidon-helidon"
188-
},
189143
"helidon-pgclient": {
190144
"json_url": "/json",
191145
"db_url": "/db",

‎frameworks/Kotlin/hexagon/build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11

22
plugins {
3-
id "org.jetbrains.kotlin.jvm" version "2.1.0" apply false
4-
id "org.graalvm.buildtools.native" version "0.10.5" apply false
3+
id "org.jetbrains.kotlin.jvm" version "2.1.20" apply false
4+
id "org.graalvm.buildtools.native" version "0.10.6" apply false
55
}
66

77
version = "1.0.0"
88
description = "TFB benchmark"
99
group = "com.hexagontk"
1010

1111
ext {
12-
hexagonVersion = "4.0.1"
13-
jettyVersion = "12.0.16"
14-
nettyVersion = "4.1.118.Final"
12+
hexagonVersion = "4.1.1"
13+
jettyVersion = "12.0.19"
14+
nettyVersion = "4.2.0.Final"
1515

16-
hikariVersion = "6.2.1"
16+
hikariVersion = "6.3.0"
1717
postgresqlVersion = "42.7.5"
18-
vertxVersion = "4.5.12"
18+
vertxVersion = "5.0.0.CR6"
1919
cache2kVersion = "2.6.1.Final"
2020

2121
applicationClass = "com.hexagontk.BenchmarkKt"
@@ -30,5 +30,6 @@ subprojects {
3030
}
3131

3232
tasks.wrapper {
33-
gradleVersion = "8.12.1"
33+
// gradleVersion = "8.14.0"
34+
gradleVersion = "release-candidate"
3435
}

‎frameworks/Kotlin/hexagon/config.toml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,6 @@ platform = "Netty"
7373
webserver = "None"
7474
versus = "netty"
7575

76-
[nettyepoll-native]
77-
urls.plaintext = "/plaintext"
78-
urls.json = "/json"
79-
urls.db = "/db"
80-
urls.query = "/query?queries="
81-
urls.update = "/update?queries="
82-
urls.fortune = "/fortunes"
83-
urls.cached_query = "/cached-queries?count="
84-
approach = "Realistic"
85-
classification = "Micro"
86-
database = "postgres"
87-
database_os = "Linux"
88-
os = "Linux"
89-
orm = "Raw"
90-
platform = "Netty"
91-
webserver = "None"
92-
versus = "netty"
93-
9476
[nettyepoll-pgclient]
9577
urls.plaintext = "/plaintext"
9678
urls.json = "/json"
@@ -127,24 +109,6 @@ platform = "Helidon"
127109
webserver = "None"
128110
versus = "helidon-helidon"
129111

130-
[helidon-native]
131-
urls.plaintext = "/plaintext"
132-
urls.json = "/json"
133-
urls.db = "/db"
134-
urls.query = "/query?queries="
135-
urls.update = "/update?queries="
136-
urls.fortune = "/fortunes"
137-
urls.cached_query = "/cached-queries?count="
138-
approach = "Realistic"
139-
classification = "Micro"
140-
database = "postgres"
141-
database_os = "Linux"
142-
os = "Linux"
143-
orm = "Raw"
144-
platform = "Helidon"
145-
webserver = "None"
146-
versus = "helidon-helidon"
147-
148112
[helidon-pgclient]
149113
urls.plaintext = "/plaintext"
150114
urls.json = "/json"

‎frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.jar‎

181 Bytes
Binary file not shown.

‎frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-rc-1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎frameworks/Kotlin/hexagon/gradlew‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.
212212

213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

‎frameworks/Kotlin/hexagon/gradlew.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

‎frameworks/Kotlin/hexagon/hexagon-helidon-native.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# BUILD
33
#
4-
FROM container-registry.oracle.com/graalvm/native-image:21-muslib-ol9 as build
4+
FROM container-registry.oracle.com/graalvm/native-image:24-muslib-ol9 as build
55
USER root
66
WORKDIR /hexagon
77

‎frameworks/Kotlin/hexagon/hexagon-helidon-pgclient.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# BUILD
33
#
4-
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-23-cds-musl AS build
4+
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-24-cds-musl AS build
55
USER root
66
WORKDIR /hexagon
77

@@ -12,7 +12,7 @@ RUN ./gradlew --quiet -x test installDist
1212
#
1313
# RUNTIME
1414
#
15-
FROM docker.io/bellsoft/liberica-runtime-container:jre-23-musl
15+
FROM docker.io/bellsoft/liberica-runtime-container:jre-24-musl
1616
ARG PROJECT=hexagon_helidon_pgclient
1717

1818
ENV POSTGRESQL_DB_HOST tfb-database

‎frameworks/Kotlin/hexagon/hexagon-helidon.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# BUILD
33
#
4-
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-23-cds-musl AS build
4+
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-24-cds-musl AS build
55
USER root
66
WORKDIR /hexagon
77

@@ -12,7 +12,7 @@ RUN ./gradlew --quiet -x test installDist
1212
#
1313
# RUNTIME
1414
#
15-
FROM docker.io/bellsoft/liberica-runtime-container:jre-23-musl
15+
FROM docker.io/bellsoft/liberica-runtime-container:jre-24-musl
1616
ARG PROJECT=hexagon_helidon_postgresql
1717

1818
ENV POSTGRESQL_DB_HOST tfb-database

0 commit comments

Comments
 (0)