This is an automated email from the ASF dual-hosted git repository.
icodening pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-benchmark.git
The following commit(s) were added to refs/heads/master by this push:
new a052535 rename org.apache.dubbo.benchmark.Client to
org.apache.dubbo.benchmark.ClientSimple
a052535 is described below
commit a0525357c711f6e4961064be87b768ab7a57c6db
Author: icodening <[email protected]>
AuthorDate: Wed Mar 13 22:59:34 2024 +0800
rename org.apache.dubbo.benchmark.Client to
org.apache.dubbo.benchmark.ClientSimple
---
.../org/apache/dubbo/benchmark/ClientGrpc.java | 1 -
.../apache/dubbo/benchmark/ClientNativeGrpc.java | 2 +-
.../java/org/apache/dubbo/benchmark/ClientPb.java | 2 +-
.../benchmark/{Client.java => ClientSimple.java} | 6 +++---
dubbo-avro-client/pom.xml | 2 +-
dubbo-fastjson-client/pom.xml | 2 +-
dubbo-fastjson2-client/pom.xml | 2 +-
dubbo-fst-client/pom.xml | 2 +-
dubbo-gson-client/pom.xml | 2 +-
dubbo-hessianlite-client/pom.xml | 2 +-
dubbo-kryo-client/pom.xml | 2 +-
dubbo-metrics-client/pom.xml | 2 +-
dubbo-native-hessian-client/pom.xml | 2 +-
dubbo-protostuff-client/pom.xml | 2 +-
dubbo-protostuff-server/pom.xml | 2 +-
dubbo-triple-client/pom.xml | 4 ----
dubbo-triple-server/pom.xml | 5 -----
pom.xml | 22 +++++++++++++++++++---
18 files changed, 35 insertions(+), 29 deletions(-)
diff --git
a/client-base/src/main/java/org/apache/dubbo/benchmark/ClientGrpc.java
b/client-base/src/main/java/org/apache/dubbo/benchmark/ClientGrpc.java
index 3d7f25a..608a48f 100644
--- a/client-base/src/main/java/org/apache/dubbo/benchmark/ClientGrpc.java
+++ b/client-base/src/main/java/org/apache/dubbo/benchmark/ClientGrpc.java
@@ -89,7 +89,6 @@ public class ClientGrpc {
ChainedOptionsBuilder optBuilder =
ClientHelper.newBaseChainedOptionsBuilder(arguments)
.result(System.currentTimeMillis() + "." + format)
.include(ClientGrpc.class.getSimpleName())
- .exclude(Client.class.getSimpleName())
.exclude(ClientNativeGrpc.class.getSimpleName())
.exclude(ClientPb.class.getSimpleName())
.mode(Mode.Throughput)
diff --git
a/client-base/src/main/java/org/apache/dubbo/benchmark/ClientNativeGrpc.java
b/client-base/src/main/java/org/apache/dubbo/benchmark/ClientNativeGrpc.java
index 6e4dafe..844a977 100644
--- a/client-base/src/main/java/org/apache/dubbo/benchmark/ClientNativeGrpc.java
+++ b/client-base/src/main/java/org/apache/dubbo/benchmark/ClientNativeGrpc.java
@@ -114,7 +114,7 @@ public class ClientNativeGrpc {
.include(ClientNativeGrpc.class.getSimpleName())
.exclude(ClientPb.class.getSimpleName())
.exclude(ClientGrpc.class.getSimpleName())
- .exclude(Client.class.getSimpleName())
+ .exclude(ClientSimple.class.getSimpleName())
.mode(Mode.Throughput)
.mode(Mode.AverageTime)
.mode(Mode.SampleTime)
diff --git a/client-base/src/main/java/org/apache/dubbo/benchmark/ClientPb.java
b/client-base/src/main/java/org/apache/dubbo/benchmark/ClientPb.java
index 8ba5173..c56f92d 100644
--- a/client-base/src/main/java/org/apache/dubbo/benchmark/ClientPb.java
+++ b/client-base/src/main/java/org/apache/dubbo/benchmark/ClientPb.java
@@ -92,7 +92,7 @@ public class ClientPb {
.include(ClientPb.class.getSimpleName())
.exclude(ClientGrpc.class.getSimpleName())
.exclude(ClientNativeGrpc.class.getSimpleName())
- .exclude(Client.class.getSimpleName())
+ .exclude(ClientSimple.class.getSimpleName())
.mode(Mode.Throughput)
.mode(Mode.AverageTime)
.mode(Mode.SampleTime)
diff --git a/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
b/client-base/src/main/java/org/apache/dubbo/benchmark/ClientSimple.java
similarity index 95%
rename from client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
rename to client-base/src/main/java/org/apache/dubbo/benchmark/ClientSimple.java
index 834834e..baecb3d 100644
--- a/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
+++ b/client-base/src/main/java/org/apache/dubbo/benchmark/ClientSimple.java
@@ -19,13 +19,13 @@ import java.util.Arrays;
import java.util.concurrent.TimeUnit;
@State(Scope.Benchmark)
-public class Client extends AbstractClient {
+public class ClientSimple extends AbstractClient {
private static final int CONCURRENCY = 32;
private final ClassPathXmlApplicationContext context;
private final UserService userService;
- public Client() {
+ public ClientSimple() {
context = new ClassPathXmlApplicationContext("consumer.xml");
context.start();
userService = (UserService) context.getBean("userService");
@@ -71,7 +71,7 @@ public class Client extends AbstractClient {
String format = arguments.getResultFormat();
ChainedOptionsBuilder optBuilder =
ClientHelper.newBaseChainedOptionsBuilder(arguments)
.result(System.currentTimeMillis() + "." + format)
- .include(Client.class.getSimpleName())
+ .include(ClientSimple.class.getSimpleName())
.exclude(ClientPb.class.getSimpleName())
.exclude(ClientGrpc.class.getSimpleName())
.exclude(ClientNativeGrpc.class.getSimpleName())
diff --git a/dubbo-avro-client/pom.xml b/dubbo-avro-client/pom.xml
index 845dd35..50866fd 100644
--- a/dubbo-avro-client/pom.xml
+++ b/dubbo-avro-client/pom.xml
@@ -61,7 +61,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-fastjson-client/pom.xml b/dubbo-fastjson-client/pom.xml
index 878e939..f21dc20 100644
--- a/dubbo-fastjson-client/pom.xml
+++ b/dubbo-fastjson-client/pom.xml
@@ -36,7 +36,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-fastjson2-client/pom.xml b/dubbo-fastjson2-client/pom.xml
index b8c9854..72e376c 100644
--- a/dubbo-fastjson2-client/pom.xml
+++ b/dubbo-fastjson2-client/pom.xml
@@ -35,7 +35,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-fst-client/pom.xml b/dubbo-fst-client/pom.xml
index d00e9a8..fcd10d8 100644
--- a/dubbo-fst-client/pom.xml
+++ b/dubbo-fst-client/pom.xml
@@ -38,7 +38,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-gson-client/pom.xml b/dubbo-gson-client/pom.xml
index d342f06..857dc6a 100644
--- a/dubbo-gson-client/pom.xml
+++ b/dubbo-gson-client/pom.xml
@@ -31,7 +31,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-hessianlite-client/pom.xml b/dubbo-hessianlite-client/pom.xml
index 03f40ee..2e11435 100644
--- a/dubbo-hessianlite-client/pom.xml
+++ b/dubbo-hessianlite-client/pom.xml
@@ -32,7 +32,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-kryo-client/pom.xml b/dubbo-kryo-client/pom.xml
index cb62297..a57b6a5 100644
--- a/dubbo-kryo-client/pom.xml
+++ b/dubbo-kryo-client/pom.xml
@@ -42,7 +42,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-metrics-client/pom.xml b/dubbo-metrics-client/pom.xml
index 8edee78..936a539 100644
--- a/dubbo-metrics-client/pom.xml
+++ b/dubbo-metrics-client/pom.xml
@@ -38,7 +38,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-native-hessian-client/pom.xml
b/dubbo-native-hessian-client/pom.xml
index 6a43d3d..ba086dc 100644
--- a/dubbo-native-hessian-client/pom.xml
+++ b/dubbo-native-hessian-client/pom.xml
@@ -42,7 +42,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-protostuff-client/pom.xml b/dubbo-protostuff-client/pom.xml
index 0480b8c..8aba6c8 100644
--- a/dubbo-protostuff-client/pom.xml
+++ b/dubbo-protostuff-client/pom.xml
@@ -46,7 +46,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-protostuff-server/pom.xml b/dubbo-protostuff-server/pom.xml
index dd0d37a..fe3fd36 100644
--- a/dubbo-protostuff-server/pom.xml
+++ b/dubbo-protostuff-server/pom.xml
@@ -46,7 +46,7 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.dubbo.benchmark.Client</mainClass>
+
<mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/dubbo-triple-client/pom.xml b/dubbo-triple-client/pom.xml
index 7ed9bcf..00f2db9 100644
--- a/dubbo-triple-client/pom.xml
+++ b/dubbo-triple-client/pom.xml
@@ -11,10 +11,6 @@
<artifactId>dubbo-triple-client</artifactId>
- <properties>
- <dubbo.version>3.1.0</dubbo.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-triple-server/pom.xml b/dubbo-triple-server/pom.xml
index 707da8b..6c403a8 100644
--- a/dubbo-triple-server/pom.xml
+++ b/dubbo-triple-server/pom.xml
@@ -10,11 +10,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-triple-server</artifactId>
- <properties>
- <dubbo.version>3.1.0</dubbo.version>
- <protoc.version>3.19.4</protoc.version>
- <grpc.version>1.44.1</grpc.version>
- </properties>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 0e07a0b..41028ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,11 @@
<properties>
<java.source>1.8</java.source>
<java.target>1.8</java.target>
- <dubbo.version>3.2.7</dubbo.version>
- <netty.version>4.1.25.Final</netty.version>
+ <dubbo.version>3.2.11</dubbo.version>
+ <netty.version>4.1.107.Final</netty.version>
<kryo.version>4.0.2</kryo.version>
+ <avro.version>1.11.3</avro.version>
+ <protostuff.version>1.8.0</protostuff.version>
<kryo-serializers.version>0.42</kryo-serializers.version>
<fst.version>2.48-jdk-6</fst.version>
<jmh.version>1.21</jmh.version>
@@ -96,8 +98,10 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <artifactId>netty-bom</artifactId>
<version>${netty.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>de.javakaffee</groupId>
@@ -109,6 +113,13 @@
<artifactId>dubbo-protobuf-json-server</artifactId>
<version>${dubbo.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.protostuff</groupId>
+ <artifactId>protostuff-bom</artifactId>
+ <version>${protostuff.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>com.esotericsoftware</groupId>
@@ -163,6 +174,11 @@
<artifactId>commons-cli</artifactId>
<version>${cli.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
