This is an automated email from the ASF dual-hosted git repository.
chaokunyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-fury.git
The following commit(s) were added to refs/heads/main by this push:
new 1b0b93df fix(java): fix benchmark register class and create object
(#1495)
1b0b93df is described below
commit 1b0b93dfc4844cb7f476eee22871e98a3e84dba2
Author: Shawn Yang <[email protected]>
AuthorDate: Fri Apr 12 00:19:08 2024 +0800
fix(java): fix benchmark register class and create object (#1495)
<!--
**Thanks for contributing to Fury.**
**If this is your first time opening a PR on fury, you can refer to
[CONTRIBUTING.md](https://github.com/apache/incubator-fury/blob/main/CONTRIBUTING.md).**
Contribution Checklist
- The **Apache Fury (incubating)** community has restrictions on the
naming of pr titles. You can also find instructions in
[CONTRIBUTING.md](https://github.com/apache/incubator-fury/blob/main/CONTRIBUTING.md).
- Fury has a strong focus on performance. If the PR you submit will have
an impact on performance, please benchmark it first and provide the
benchmark result here.
-->
## What does this PR do?
fix benchmark register class and create object
<!-- Describe the purpose of this PR. -->
## Related issues
<!--
Is there any related issue? Please attach here.
- #xxxx0
- #xxxx1
- #xxxx2
-->
## Does this PR introduce any user-facing change?
<!--
If any user-facing interface changes, please [open an
issue](https://github.com/apache/incubator-fury/issues/new/choose)
describing the need to do so and update the document if necessary.
-->
- [ ] Does this PR introduce any public API change?
- [ ] Does this PR introduce any binary protocol compatibility change?
## Benchmark
<!--
When the PR has an impact on performance (if you don't know whether the
PR will have an impact on performance, you can submit the PR first, and
if it will have impact on performance, the code reviewer will explain
it), be sure to attach a benchmark data here.
-->
---
.../org/apache/fury/benchmark/state/FuryState.java | 2 +-
.../org/apache/fury/benchmark/state/HessionState.java | 18 +-----------------
.../org/apache/fury/benchmark/state/JDKState.java | 19 +------------------
.../org/apache/fury/benchmark/state/JsonbState.java | 18 +-----------------
.../apache/fury/benchmark/state/ProtostuffState.java | 19 +------------------
5 files changed, 5 insertions(+), 71 deletions(-)
diff --git
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java
index 7b0605d3..eaa01914 100644
---
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java
+++
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java
@@ -131,7 +131,7 @@ public class FuryState {
furyBuilder.withCompatibleMode(CompatibleMode.COMPATIBLE);
}
fury = furyBuilder.build();
- switch (ObjectType.MEDIA_CONTENT) {
+ switch (objectType) {
case SAMPLE:
case STRUCT:
case STRUCT2:
diff --git
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java
index fa9322ed..81abe89a 100644
---
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java
+++
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java
@@ -29,8 +29,6 @@ import org.apache.fury.benchmark.LongStringSerializationSuite;
import org.apache.fury.benchmark.LongsSerializationSuite;
import org.apache.fury.benchmark.StringSerializationSuite;
import org.apache.fury.benchmark.data.Data;
-import org.apache.fury.benchmark.data.MediaContent;
-import org.apache.fury.benchmark.data.Sample;
import org.apache.fury.benchmark.data.Struct;
import org.apache.fury.logging.Logger;
import org.apache.fury.logging.LoggerFactory;
@@ -106,21 +104,7 @@ public class HessionState {
@Override
public void setup() {
super.setup();
- switch (objectType) {
- case SAMPLE:
- object = new Sample().populate(references);
- break;
- case MEDIA_CONTENT:
- object = new MediaContent().populate(references);
- break;
- case STRUCT:
- object = Struct.create(false);
- break;
- case STRUCT2:
- object = Struct.create(true);
- break;
- }
-
+ object = ObjectType.createObject(objectType, references);
bos.reset();
out.reset();
serialize(out, object);
diff --git
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java
index 45c98f0d..553006da 100644
--- a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java
+++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java
@@ -29,9 +29,6 @@ import org.apache.fury.benchmark.LongStringSerializationSuite;
import org.apache.fury.benchmark.LongsSerializationSuite;
import org.apache.fury.benchmark.StringSerializationSuite;
import org.apache.fury.benchmark.data.Data;
-import org.apache.fury.benchmark.data.MediaContent;
-import org.apache.fury.benchmark.data.Sample;
-import org.apache.fury.benchmark.data.Struct;
import org.apache.fury.io.ClassLoaderObjectInputStream;
import org.apache.fury.util.Preconditions;
import org.openjdk.jmh.annotations.Level;
@@ -61,21 +58,7 @@ public class JDKState {
@Override
public void setup() {
super.setup();
- switch (objectType) {
- case SAMPLE:
- object = new Sample().populate(references);
- break;
- case MEDIA_CONTENT:
- object = new MediaContent().populate(references);
- break;
- case STRUCT:
- object = Struct.create(false);
- break;
- case STRUCT2:
- object = Struct.create(true);
- break;
- }
-
+ object = ObjectType.createObject(objectType, references);
bos.reset();
serialize(bos, object);
serializedLength = bos.size();
diff --git
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java
index 55a3db63..eddcd34c 100644
---
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java
+++
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java
@@ -36,9 +36,6 @@ import java.util.List;
import java.util.function.Function;
import org.apache.fury.Fury;
import org.apache.fury.benchmark.data.CustomJDKSerialization;
-import org.apache.fury.benchmark.data.MediaContent;
-import org.apache.fury.benchmark.data.Sample;
-import org.apache.fury.benchmark.data.Struct;
import org.apache.fury.logging.Logger;
import org.apache.fury.logging.LoggerFactory;
import org.apache.fury.util.Platform;
@@ -85,20 +82,7 @@ public class JsonbState {
@Override
public void setup() {
super.setup();
- switch (ObjectType.MEDIA_CONTENT) {
- case SAMPLE:
- object = new Sample().populate(references);
- break;
- case MEDIA_CONTENT:
- object = new MediaContent().populate(references);
- break;
- case STRUCT:
- object = Struct.create(false);
- break;
- case STRUCT2:
- object = Struct.create(true);
- break;
- }
+ object = ObjectType.createObject(objectType, references);
Thread.currentThread().setContextClassLoader(object.getClass().getClassLoader());
JSONFactory.setContextObjectReaderProvider(new ObjectReaderProvider());
buffer = serialize(null, this, object);
diff --git
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java
index 6c0cd31e..59bf3508 100644
---
a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java
+++
b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java
@@ -28,9 +28,6 @@ import org.apache.fury.benchmark.LongStringSerializationSuite;
import org.apache.fury.benchmark.LongsSerializationSuite;
import org.apache.fury.benchmark.StringSerializationSuite;
import org.apache.fury.benchmark.data.Data;
-import org.apache.fury.benchmark.data.MediaContent;
-import org.apache.fury.benchmark.data.Sample;
-import org.apache.fury.benchmark.data.Struct;
import org.apache.fury.util.Preconditions;
import org.openjdk.jmh.annotations.CompilerControl;
import org.openjdk.jmh.annotations.Fork;
@@ -95,21 +92,7 @@ public class ProtostuffState {
@Override
public void setup() {
super.setup();
-
- switch (objectType) {
- case SAMPLE:
- object = new Sample().populate(references);
- break;
- case MEDIA_CONTENT:
- object = new MediaContent().populate(references);
- break;
- case STRUCT:
- object = Struct.create(false);
- break;
- case STRUCT2:
- object = Struct.create(true);
- break;
- }
+ object = ObjectType.createObject(objectType, references);
schema = RuntimeSchema.getSchema(object.getClass());
protoStuff = serialize(object, schema, buffer);
Preconditions.checkArgument(object.equals(deserialize(schema,
protoStuff)));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
