diff --git a/frameworks/Clojure/ring-http-exchange/benchmark_config.json b/frameworks/Clojure/ring-http-exchange/benchmark_config.json index d8d2ba0ce3e..b0381b921ac 100755 --- a/frameworks/Clojure/ring-http-exchange/benchmark_config.json +++ b/frameworks/Clojure/ring-http-exchange/benchmark_config.json @@ -81,6 +81,26 @@ "display_name": "ring-http-exchange-robaho-graalvm", "notes": "", "versus": "ring-http-exchange-robaho" + }, + "robaho-semeru": { + "json_url": "/json", + "plaintext_url": "/plaintext", + "fortune_url": "/fortunes", + "port": 8080, + "approach": "Realistic", + "classification": "Platform", + "database": "postgres", + "framework": "None", + "language": "Clojure", + "flavor": "None", + "orm": "Raw", + "platform": "None", + "webserver": "None", + "os": "Linux", + "database_os": "Linux", + "display_name": "ring-http-exchange-robaho-semeru", + "notes": "", + "versus": "ring-http-exchange-robaho" } } ] diff --git a/frameworks/Clojure/ring-http-exchange/ring-http-exchange-robaho-semeru.dockerfile b/frameworks/Clojure/ring-http-exchange/ring-http-exchange-robaho-semeru.dockerfile new file mode 100644 index 00000000000..64f06a3418a --- /dev/null +++ b/frameworks/Clojure/ring-http-exchange/ring-http-exchange-robaho-semeru.dockerfile @@ -0,0 +1,14 @@ +FROM clojure:lein as lein +WORKDIR /ring-http-exchange +COPY project.clj project.clj +COPY resources resources +COPY src src +RUN lein with-profile robaho uberjar + +FROM ibm-semeru-runtimes:open-25-jre-jammy +WORKDIR /ring-http-exchange +COPY --from=lein /ring-http-exchange/target/ring-http-server-1.0.0-standalone.jar app.jar + +EXPOSE 8080 + +CMD ["java", "-server", "-XX:+UseParallelGC", "-jar", "app.jar"] diff --git a/frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/benchmark.clj b/frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/benchmark.clj index a5ee8a34384..fc6afa569b6 100644 --- a/frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/benchmark.clj +++ b/frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/benchmark.clj @@ -15,14 +15,13 @@ (def query-fortunes (boa/execute (boa/->NextJdbcAdapter) "fortune.sql")) (def db-spec {:auto-commit true - :read-only false - :connection-timeout 30000 + :read-only true + :connection-timeout 10000 :validation-timeout 5000 :idle-timeout 600000 :max-lifetime 1800000 - :minimum-idle 10 - :maximum-pool-size 520 - :minimum-pool-size 512 + :minimum-idle 16 + :maximum-pool-size 64 :register-mbeans false :jdbcUrl "jdbc:postgresql://tfb-database/hello_world?user=benchmarkdbuser&password=benchmarkdbpass"}) diff --git a/frameworks/Java/activej/activej.dockerfile b/frameworks/Java/activej/activej.dockerfile index cea75f79e0d..da3ba92ee5a 100644 --- a/frameworks/Java/activej/activej.dockerfile +++ b/frameworks/Java/activej/activej.dockerfile @@ -1,11 +1,11 @@ -FROM maven:3.6.1-jdk-11-slim as maven - +FROM maven:3.9.0-eclipse-temurin-17 as maven WORKDIR /activej COPY pom.xml pom.xml COPY src src RUN mvn compile assembly:single -q -FROM openjdk:11.0.3-jdk-slim +FROM amazoncorretto:25 WORKDIR /activej COPY --from=maven /activej/target/activej-server-benchmark-0.0.1-SNAPSHOT-jar-with-dependencies.jar app.jar -CMD ["java", "-Xms2G", "-Xmx2G", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-DHttpServerConnection.initialWriteBufferSize=4096", "-DHttpHeadersMultimap.initialSize=16", "-jar", "app.jar"] \ No newline at end of file +EXPOSE 8080 +CMD ["java", "-server", "-XX:+UseParallelGC", "-jar", "app.jar"] \ No newline at end of file diff --git a/frameworks/Java/dropwizard/dropwizard-jdbi-postgres.dockerfile b/frameworks/Java/dropwizard/dropwizard-jdbi-postgres.dockerfile index 21a897236d7..13b5b94ce53 100644 --- a/frameworks/Java/dropwizard/dropwizard-jdbi-postgres.dockerfile +++ b/frameworks/Java/dropwizard/dropwizard-jdbi-postgres.dockerfile @@ -4,7 +4,7 @@ COPY pom.xml pom.xml COPY src src RUN mvn package -q -P postgres,jdbi -FROM openjdk:11.0.3-jdk-slim +FROM amazoncorretto:25 WORKDIR /dropwizard COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar COPY hello-world-jdbi-postgres.yml hello-world-jdbi-postgres.yml diff --git a/frameworks/Java/dropwizard/dropwizard-mongodb.dockerfile b/frameworks/Java/dropwizard/dropwizard-mongodb.dockerfile index 1d13f4f9013..ce1fb9d4bbc 100644 --- a/frameworks/Java/dropwizard/dropwizard-mongodb.dockerfile +++ b/frameworks/Java/dropwizard/dropwizard-mongodb.dockerfile @@ -4,7 +4,7 @@ COPY pom.xml pom.xml COPY src src RUN mvn package -q -P mongo -FROM openjdk:11.0.3-jdk-slim +FROM amazoncorretto:25 WORKDIR /dropwizard COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar COPY hello-world-mongo.yml hello-world-mongo.yml diff --git a/frameworks/Java/dropwizard/dropwizard-postgres.dockerfile b/frameworks/Java/dropwizard/dropwizard-postgres.dockerfile index b088d2df510..25cb2080922 100644 --- a/frameworks/Java/dropwizard/dropwizard-postgres.dockerfile +++ b/frameworks/Java/dropwizard/dropwizard-postgres.dockerfile @@ -4,7 +4,7 @@ COPY pom.xml pom.xml COPY src src RUN mvn package -q -P postgres -FROM openjdk:11.0.3-jdk-slim +FROM amazoncorretto:25 WORKDIR /dropwizard COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar COPY hello-world-postgres.yml hello-world-postgres.yml diff --git a/frameworks/Java/dropwizard/dropwizard.dockerfile b/frameworks/Java/dropwizard/dropwizard.dockerfile index af3b49c8682..206455df590 100644 --- a/frameworks/Java/dropwizard/dropwizard.dockerfile +++ b/frameworks/Java/dropwizard/dropwizard.dockerfile @@ -4,7 +4,7 @@ COPY pom.xml pom.xml COPY src src RUN mvn package -q -P mysql -FROM openjdk:11.0.3-jdk-slim +FROM amazoncorretto:25 WORKDIR /dropwizard COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar COPY hello-world-mysql.yml hello-world-mysql.yml diff --git a/frameworks/Java/httpserver/pom.xml b/frameworks/Java/httpserver/pom.xml index 26673413278..5b983699fe6 100644 --- a/frameworks/Java/httpserver/pom.xml +++ b/frameworks/Java/httpserver/pom.xml @@ -30,23 +30,21 @@ postgresql 42.7.2 - - com.zaxxer - HikariCP - 3.3.1 - - com.github.httl httl 1.0.11 - org.slf4j slf4j-simple 1.8.0-beta4 + + com.zaxxer + HikariCP + 7.0.2 + diff --git a/frameworks/Java/httpserver/src/main/java/benchmarks/Server.java b/frameworks/Java/httpserver/src/main/java/benchmarks/Server.java index 2b4beb71889..80566641a9f 100755 --- a/frameworks/Java/httpserver/src/main/java/benchmarks/Server.java +++ b/frameworks/Java/httpserver/src/main/java/benchmarks/Server.java @@ -52,12 +52,23 @@ private static List queryFortunes(DataSource ds) throws SQLException { } private static DataSource createPostgresDataSource() throws ClassNotFoundException { - Class.forName("org.postgresql.Driver"); HikariConfig config = new HikariConfig(); + config.setJdbcUrl("jdbc:postgresql://tfb-database:5432/hello_world"); config.setUsername("benchmarkdbuser"); config.setPassword("benchmarkdbpass"); - config.setMaximumPoolSize(512); + + config.setMaximumPoolSize(64); + config.setMinimumIdle(16); + + config.setConnectionTimeout(10000); + config.setIdleTimeout(600000); + config.setMaxLifetime(1800000); + + config.setAutoCommit(true); + + config.setPoolName("PostgreSQL-HikariCP-Pool"); + return new HikariDataSource(config); } @@ -145,4 +156,4 @@ static void main(String[] args) throws Exception { // start server server.start(); } -} +} \ No newline at end of file diff --git a/frameworks/Java/voovan/voovan.dockerfile b/frameworks/Java/voovan/voovan.dockerfile index 2ffcb0dbcfc..26ed65a1bdf 100644 --- a/frameworks/Java/voovan/voovan.dockerfile +++ b/frameworks/Java/voovan/voovan.dockerfile @@ -5,7 +5,7 @@ COPY src src COPY config/framework.properties config/framework.properties RUN mvn package -q -FROM openjdk:25-ea-slim-bullseye +FROM amazoncorretto:25 WORKDIR /voovan COPY --from=maven /voovan/target/voovan-bench-0.1-jar-with-dependencies.jar app.jar COPY --from=maven /voovan/config/framework.properties config/framework.properties