Skip to content
Merged

aa #37

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frameworks/Go/goravel/src/fiber/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ require (
github.com/gofiber/template v1.8.3 // indirect
github.com/gofiber/template/html/v2 v2.1.1 // indirect
github.com/gofiber/utils v1.1.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
github.com/golang-module/carbon/v2 v2.3.12 // indirect
Expand Down
3 changes: 2 additions & 1 deletion frameworks/Go/goravel/src/fiber/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,9 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/redkale/redkale-pgclient.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.

EXPOSE 8080

CMD ["java", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
CMD ["java", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Dio.netty.buffer.checkBounds=false", "-Dio.netty.buffer.checkAccessible=false", "-Dvertx.disableURIValidation=true", "-Dvertx.threadChecks=false", "-Dvertx.disableContextTimings=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
4 changes: 2 additions & 2 deletions frameworks/Java/smart-socket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<log4j.version>2.17.1</log4j.version>
<smartservlet.version>1.5-SNAPSHOT</smartservlet.version>
<smartservlet.version>2.3</smartservlet.version>
<hikaricp.version>5.0.0</hikaricp.version>
<jsoniter.version>0.9.23</jsoniter.version>
</properties>
Expand All @@ -23,7 +23,7 @@
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.smartboot.servlet</groupId>
<groupId>tech.smartboot.servlet</groupId>
<artifactId>servlet-core</artifactId>
<version>${smartservlet.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import com.jsoniter.output.JsonStreamPool;
import com.jsoniter.spi.JsonException;
import com.jsoniter.spi.Slice;
import jakarta.servlet.http.HttpServletResponse;
import org.smartboot.http.server.HttpResponse;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
package org.smartboot.servlet;


import org.smartboot.http.server.HttpBootstrap;
import org.smartboot.http.server.HttpRequest;
import org.smartboot.http.server.HttpResponse;
import org.smartboot.http.server.HttpServerHandler;
import org.smartboot.servlet.conf.ServletInfo;
import tech.smartboot.servlet.Container;
import tech.smartboot.servlet.ServletContextRuntime;
import tech.smartboot.servlet.conf.ServletInfo;
import tech.smartboot.servlet.conf.ServletMappingInfo;

import java.util.concurrent.CompletableFuture;

Expand All @@ -15,7 +19,7 @@
public class Bootstrap {

public static void main(String[] args) throws Throwable {
ContainerRuntime containerRuntime = new ContainerRuntime();
Container containerRuntime = new Container();
// plaintext
ServletContextRuntime applicationRuntime = new ServletContextRuntime(null, Thread.currentThread().getContextClassLoader(), "/");
applicationRuntime.setVendorProvider(response -> {
Expand All @@ -24,15 +28,15 @@ public static void main(String[] args) throws Throwable {
ServletInfo plainTextServletInfo = new ServletInfo();
plainTextServletInfo.setServletName("plaintext");
plainTextServletInfo.setServletClass(HelloWorldServlet.class.getName());
plainTextServletInfo.addMapping("/plaintext");
applicationRuntime.getDeploymentInfo().addServletMapping(new ServletMappingInfo(plainTextServletInfo.getServletName(), "/plaintext"));
applicationRuntime.getDeploymentInfo().addServlet(plainTextServletInfo);

// json
ServletInfo jsonServletInfo = new ServletInfo();
jsonServletInfo.setServletName("json");
jsonServletInfo.setServletClass(JsonServlet.class.getName());
jsonServletInfo.addMapping("/json");
applicationRuntime.getDeploymentInfo().addServlet(jsonServletInfo);
applicationRuntime.getDeploymentInfo().addServletMapping(new ServletMappingInfo(jsonServletInfo.getServletName(), "/json"));
containerRuntime.addRuntime(applicationRuntime);

int cpuNum = Runtime.getRuntime().availableProcessors();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package org.smartboot.servlet;


import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import java.io.IOException;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.smartboot.servlet;

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.smartboot.Message;
import org.smartboot.http.JsonUtil;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
Expand Down
4 changes: 1 addition & 3 deletions frameworks/Java/spring-webflux/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.4</version>
<version>3.3.5</version>
</parent>

<properties>
<java.version>21</java.version>
<jstachio.version>1.3.6</jstachio.version>
<r2dbc-pool.version>1.0.2.RELEASE</r2dbc-pool.version>
<r2dbc-postgresql.version>1.0.7.RELEASE</r2dbc-postgresql.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY src src
COPY pom.xml pom.xml
RUN mvn package -q

FROM bellsoft/liberica-openjre-debian:21
FROM bellsoft/liberica-openjre-debian:23
WORKDIR /spring
COPY --from=maven /spring/target/spring-webflux-benchmark.jar app.jar
# See https://docs.spring.io/spring-boot/reference/packaging/efficient.html
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/spring-webflux/spring-webflux.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY src src
COPY pom.xml pom.xml
RUN mvn package -q

FROM bellsoft/liberica-openjre-debian:21
FROM bellsoft/liberica-openjre-debian:23
WORKDIR /spring
COPY --from=maven /spring/target/spring-webflux-benchmark.jar app.jar
# See https://docs.spring.io/spring-boot/reference/packaging/efficient.html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package benchmark.repository;

import java.util.List;

import benchmark.model.Fortune;
import benchmark.model.World;
import reactor.core.publisher.Flux;
Expand All @@ -9,7 +11,7 @@ public interface DbRepository {

Mono<World> getWorld(int id);

Mono<World> findAndUpdateWorld(int id, int randomNumber);
Mono<Void> updateWorlds(List<World> worlds);

Flux<Fortune> fortunes();
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package benchmark.repository;

import java.util.List;

import benchmark.model.Fortune;
import benchmark.model.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.springframework.context.annotation.Profile;
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import static org.springframework.data.mongodb.core.FindAndModifyOptions.options;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
import static org.springframework.data.mongodb.core.query.Update.update;
Expand All @@ -31,12 +31,11 @@ public Mono<World> getWorld(int id) {
}

@Override
public Mono<World> findAndUpdateWorld(int id, int randomNumber) {
return operations.findAndModify(
query(where("id").is(id)),
update("randomNumber", randomNumber),
options().returnNew(true),
World.class);
public Mono<Void> updateWorlds(List<World> worlds) {
return Flux.fromIterable(worlds).flatMap(world -> operations.findAndModify(
query(where("id").is(world.id)),
update("randomNumber", world.randomnumber),
World.class)).then();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
package benchmark.repository;

import java.util.List;

import org.springframework.context.annotation.Profile;
import org.springframework.r2dbc.core.DatabaseClient;
import org.springframework.stereotype.Component;

import benchmark.model.Fortune;
import benchmark.model.World;
import io.r2dbc.spi.Connection;
import io.r2dbc.spi.ConnectionFactory;
import io.r2dbc.spi.Result;
import io.r2dbc.spi.Statement;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand All @@ -23,28 +29,25 @@ public R2dbcDbRepository(DatabaseClient databaseClient) {
public Mono<World> getWorld(int id) {
return databaseClient
.sql("SELECT id, randomnumber FROM world WHERE id = $1")
.bind("$1", id)
.bind(0, id)
.mapProperties(World.class)
.first();
}

private Mono<World> updateWorld(World world) {
return databaseClient
.sql("UPDATE world SET randomnumber=$2 WHERE id = $1")
.bind("$1", world.id)
.bind("$2", world.randomnumber)
.fetch()
.rowsUpdated()
.map(count -> world);
}


@Override
public Mono<World> findAndUpdateWorld(int id, int randomNumber) {
return getWorld(id).flatMap(world -> {
world.randomnumber = randomNumber;
return updateWorld(world);
});
public Mono<Void> updateWorlds(List<World> worlds) {
return databaseClient.inConnectionMany(con -> {
Statement statement = con.createStatement("UPDATE world SET randomnumber=$2 WHERE id = $1");
for (int i = 0; i < worlds.size(); i++) {
World world = worlds.get(i);
statement.bind(0, world.randomnumber)
.bind(1, world.id);
if (i < worlds.size() - 1) {
statement.add();
}
}
return Flux.from(statement.execute());
}).flatMap(Result::getRowsUpdated).then();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package benchmark.web;

import java.util.Comparator;
import java.util.List;

import benchmark.Utils;
Expand Down Expand Up @@ -68,8 +69,16 @@ public Mono<ServerResponse> updates(ServerRequest request) {
int queries = parseQueryCount(request.queryParams().getFirst("queries"));

Mono<List<World>> worlds = Flux.fromStream(Utils.randomWorldNumbers().limit(queries).boxed())
.flatMap(i -> dbRepository.findAndUpdateWorld(i, Utils.randomWorldNumber()))
.collectList();
.flatMap(id -> dbRepository.getWorld(id).map(world -> {
int randomNumber;
do {
randomNumber = Utils.randomWorldNumber();
} while (randomNumber == world.randomnumber);
world.randomnumber = randomNumber;
return world;
}))
.collectSortedList(Comparator.comparingInt(w -> w.id))
.flatMap(list -> dbRepository.updateWorlds(list).thenReturn(list));

return ServerResponse.ok()
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spring:
password: ${database.password}
url: r2dbc:postgresql://${database.host}:${database.port}/${database.name}?loggerLevel=OFF&disableColumnSanitiser=true&assumeMinServerVersion=16&sslmode=disable
pool:
max-size: 256
max-size: 512

---
spring:
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.4</version>
<version>3.3.5</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/spring/spring-mongo.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY src src
COPY pom.xml pom.xml
RUN mvn package -q

FROM bellsoft/liberica-openjre-debian:21
FROM bellsoft/liberica-openjre-debian:23
WORKDIR /spring
COPY --from=maven /spring/target/hello-spring-1.0-SNAPSHOT.jar app.jar
# See https://docs.spring.io/spring-boot/reference/packaging/efficient.html
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/spring/spring.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY src src
COPY pom.xml pom.xml
RUN mvn package -q

FROM bellsoft/liberica-openjre-debian:21
FROM bellsoft/liberica-openjre-debian:23
WORKDIR /spring
COPY --from=maven /spring/target/hello-spring-1.0-SNAPSHOT.jar app.jar
# See https://docs.spring.io/spring-boot/reference/packaging/efficient.html
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/spring/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spring:
username: ${database.username}
password: ${database.password}
hikari:
maximum-pool-size: 256
maximum-pool-size: 512
database:
name: hello_world
host: tfb-database
Expand Down
Loading
Loading