perf(java): rename fury-benchmark to benchmark (apache#1319)

This PR renames fury-benchmark to benchmark to keep benchmark module naming consisitent with other languages
pandalee99 · Jan 7, 2024 · bf092cf · bf092cf
1 parent bcd3665
commit bf092cf
Show file tree

Hide file tree

Showing 68 changed files with 25 additions and 29 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-java/fury-benchmark export-ignore
+java/benchmark export-ignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -102,10 +102,6 @@ jobs:
         with:
           java-version: 8
           distribution: 'temurin'
-      - name: Install fury-benchmark jar
-        run: |
-          cd java && mvn -T10 -B --no-transfer-progress clean install -DskipTests && cd -
-          cd java/fury-benchmark && mvn -T10 -B --no-transfer-progress clean install -DskipTests -Pjmh && cd -
       - name: Run CI
         run: ./ci/run_ci.sh integration_tests
 

diff --git a/NOTICE b/NOTICE
@@ -39,7 +39,7 @@ The text of each license is the standard Apache 2.0 license.
 
 * fast-serialization (https://github.com/RuedigerMoeller/fast-serialization)
     Files:
-      java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java
+      java/benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java
 
 * ray (https://github.com/ray-project/ray)
     Files:
@@ -54,13 +54,13 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
 
 * kryo (https://github.com/EsotericSoftware/kryo)
     Files:
-      java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java
-      java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java
-      java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java
-      java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java
-      java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java
-      java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java
-      java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java
+      java/benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java
+      java/benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java
+      java/benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java
+      java/benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java
+      java/benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java
+      java/benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java
+      java/benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java
       java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java
       java/fury-core/src/main/java/org/apache/fury/collection/IdentityMap.java
       java/fury-core/src/main/java/org/apache/fury/collection/IdentityObjectIntMap.java

diff --git a/ci/deploy.sh b/ci/deploy.sh
@@ -84,7 +84,7 @@ bump_java_version() {
   cd "$ROOT/java"
   echo "Set fury java version to $version"
   mvn versions:set -DnewVersion="$version"
-  cd "$ROOT/java/fury-benchmark"
+  cd "$ROOT/java/benchmark"
   mvn versions:set -DnewVersion="$version"
   echo "Set fury integration_tests version to $version"
   cd "$ROOT/integration_tests/jdk_compatibility_tests"

diff --git a/ci/format.sh b/ci/format.sh
@@ -185,7 +185,7 @@ format_java() {
       cd "$ROOT/java"
       mvn -T10 --no-transfer-progress spotless:apply
       mvn -T10 --no-transfer-progress checkstyle:check
-      cd "$ROOT/java/fury-benchmark"
+      cd "$ROOT/java/benchmark"
       mvn -T10 --no-transfer-progress spotless:apply
       cd "$ROOT/integration_tests"
       dirs=("graalvm_tests" "jdk_compatibility_tests" "latest_jdk_tests")

diff --git a/ci/run_ci.sh b/ci/run_ci.sh
@@ -110,8 +110,8 @@ integration_tests() {
   cd "$ROOT"/java
   mvn -T10 -B --no-transfer-progress clean install -DskipTests
   echo "benchmark tests"
-  cd "$ROOT"/java/fury-benchmark
-  mvn -T10 -B --no-transfer-progress clean test -Pjmh
+  cd "$ROOT"/java/benchmark
+  mvn -T10 -B --no-transfer-progress clean test install -Pjmh
   echo "Start latest jdk tests"
   cd "$ROOT"/integration_tests/latest_jdk_tests
   echo "latest_jdk_tests: JDK 21"

diff --git a/integration_tests/jdk_compatibility_tests/pom.xml b/integration_tests/jdk_compatibility_tests/pom.xml
@@ -40,7 +40,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.fury</groupId>
-      <artifactId>fury-benchmark</artifactId>
+      <artifactId>benchmark</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
@@ -66,4 +66,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/java/fury-benchmark/README.md → java/benchmark/README.md b/java/fury-benchmark/README.md → java/benchmark/README.md
diff --git a/java/fury-benchmark/analyze.py → java/benchmark/analyze.py b/java/fury-benchmark/analyze.py → java/benchmark/analyze.py
diff --git a/java/fury-benchmark/pom.xml → java/benchmark/pom.xml b/java/fury-benchmark/pom.xml → java/benchmark/pom.xml
@@ -29,7 +29,7 @@
     <version>0.5.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>fury-benchmark</artifactId>
+  <artifactId>benchmark</artifactId>
   <packaging>jar</packaging>
 
   <prerequisites>

diff --git a/java/fury-benchmark/runtest.sh → java/benchmark/runtest.sh b/java/fury-benchmark/runtest.sh → java/benchmark/runtest.sh
diff --git a/java/fury-benchmark/runtest_jdk11.sh → java/benchmark/runtest_jdk11.sh b/java/fury-benchmark/runtest_jdk11.sh → java/benchmark/runtest_jdk11.sh
diff --git a/...org/apache/fury/benchmark/ArraySuite.java → ...org/apache/fury/benchmark/ArraySuite.java b/...org/apache/fury/benchmark/ArraySuite.java → ...org/apache/fury/benchmark/ArraySuite.java
diff --git a/.../org/apache/fury/benchmark/Benchmark.java → .../org/apache/fury/benchmark/Benchmark.java b/.../org/apache/fury/benchmark/Benchmark.java → .../org/apache/fury/benchmark/Benchmark.java
diff --git a/...pache/fury/benchmark/CollectionSuite.java → ...pache/fury/benchmark/CollectionSuite.java b/...pache/fury/benchmark/CollectionSuite.java → ...pache/fury/benchmark/CollectionSuite.java
diff --git a/...e/fury/benchmark/CompressStringSuite.java → ...e/fury/benchmark/CompressStringSuite.java b/...e/fury/benchmark/CompressStringSuite.java → ...e/fury/benchmark/CompressStringSuite.java
diff --git a/...apache/fury/benchmark/Identity2IdMap.java → ...apache/fury/benchmark/Identity2IdMap.java b/...apache/fury/benchmark/Identity2IdMap.java → ...apache/fury/benchmark/Identity2IdMap.java
diff --git a/...y/benchmark/IntsDeserializationSuite.java → ...y/benchmark/IntsDeserializationSuite.java b/...y/benchmark/IntsDeserializationSuite.java → ...y/benchmark/IntsDeserializationSuite.java
diff --git a/...ury/benchmark/IntsSerializationSuite.java → ...ury/benchmark/IntsSerializationSuite.java b/...ury/benchmark/IntsSerializationSuite.java → ...ury/benchmark/IntsSerializationSuite.java
diff --git a/...hmark/LongStringDeserializationSuite.java → ...hmark/LongStringDeserializationSuite.java b/...hmark/LongStringDeserializationSuite.java → ...hmark/LongStringDeserializationSuite.java
diff --git a/...nchmark/LongStringSerializationSuite.java → ...nchmark/LongStringSerializationSuite.java b/...nchmark/LongStringSerializationSuite.java → ...nchmark/LongStringSerializationSuite.java
diff --git a/.../benchmark/LongsDeserializationSuite.java → .../benchmark/LongsDeserializationSuite.java b/.../benchmark/LongsDeserializationSuite.java → .../benchmark/LongsDeserializationSuite.java
diff --git a/...ry/benchmark/LongsSerializationSuite.java → ...ry/benchmark/LongsSerializationSuite.java b/...ry/benchmark/LongsSerializationSuite.java → ...ry/benchmark/LongsSerializationSuite.java
diff --git a/...a/org/apache/fury/benchmark/MapSuite.java → ...a/org/apache/fury/benchmark/MapSuite.java b/...a/org/apache/fury/benchmark/MapSuite.java → ...a/org/apache/fury/benchmark/MapSuite.java
diff --git a/...rg/apache/fury/benchmark/MemorySuite.java → ...rg/apache/fury/benchmark/MemorySuite.java b/...rg/apache/fury/benchmark/MemorySuite.java → ...rg/apache/fury/benchmark/MemorySuite.java
diff --git a/.../fury/benchmark/NewJava11StringSuite.java → .../fury/benchmark/NewJava11StringSuite.java b/.../fury/benchmark/NewJava11StringSuite.java → .../fury/benchmark/NewJava11StringSuite.java
diff --git a/...apache/fury/benchmark/NewStringSuite.java → ...apache/fury/benchmark/NewStringSuite.java b/...apache/fury/benchmark/NewStringSuite.java → ...apache/fury/benchmark/NewStringSuite.java
diff --git a/...a/org/apache/fury/benchmark/RowSuite.java → ...a/org/apache/fury/benchmark/RowSuite.java b/...a/org/apache/fury/benchmark/RowSuite.java → ...a/org/apache/fury/benchmark/RowSuite.java
diff --git a/...benchmark/StringDeserializationSuite.java → ...benchmark/StringDeserializationSuite.java b/...benchmark/StringDeserializationSuite.java → ...benchmark/StringDeserializationSuite.java
diff --git a/...y/benchmark/StringSerializationSuite.java → ...y/benchmark/StringSerializationSuite.java b/...y/benchmark/StringSerializationSuite.java → ...y/benchmark/StringSerializationSuite.java
diff --git a/...y/benchmark/UserTypeDeserializeSuite.java → ...y/benchmark/UserTypeDeserializeSuite.java b/...y/benchmark/UserTypeDeserializeSuite.java → ...y/benchmark/UserTypeDeserializeSuite.java
diff --git a/...ury/benchmark/UserTypeSerializeSuite.java → ...ury/benchmark/UserTypeSerializeSuite.java b/...ury/benchmark/UserTypeSerializeSuite.java → ...ury/benchmark/UserTypeSerializeSuite.java
diff --git a/.../apache/fury/benchmark/ZeroCopySuite.java → .../apache/fury/benchmark/ZeroCopySuite.java b/.../apache/fury/benchmark/ZeroCopySuite.java → .../apache/fury/benchmark/ZeroCopySuite.java
diff --git a/...y/benchmark/data/ComparableByteArray.java → ...y/benchmark/data/ComparableByteArray.java b/...y/benchmark/data/ComparableByteArray.java → ...y/benchmark/data/ComparableByteArray.java
diff --git a/...enchmark/data/CustomJDKSerialization.java → ...enchmark/data/CustomJDKSerialization.java b/...enchmark/data/CustomJDKSerialization.java → ...enchmark/data/CustomJDKSerialization.java
diff --git a/.../org/apache/fury/benchmark/data/Data.java → .../org/apache/fury/benchmark/data/Data.java b/.../org/apache/fury/benchmark/data/Data.java → .../org/apache/fury/benchmark/data/Data.java
diff --git a/...org/apache/fury/benchmark/data/Image.java → ...org/apache/fury/benchmark/data/Image.java b/...org/apache/fury/benchmark/data/Image.java → ...org/apache/fury/benchmark/data/Image.java
diff --git a/...org/apache/fury/benchmark/data/Media.java → ...org/apache/fury/benchmark/data/Media.java b/...org/apache/fury/benchmark/data/Media.java → ...org/apache/fury/benchmark/data/Media.java
diff --git a/...che/fury/benchmark/data/MediaContent.java → ...che/fury/benchmark/data/MediaContent.java b/...che/fury/benchmark/data/MediaContent.java → ...che/fury/benchmark/data/MediaContent.java
diff --git a/...rg/apache/fury/benchmark/data/Sample.java → ...rg/apache/fury/benchmark/data/Sample.java b/...rg/apache/fury/benchmark/data/Sample.java → ...rg/apache/fury/benchmark/data/Sample.java
diff --git a/...enchmark/data/SerializableByteBuffer.java → ...enchmark/data/SerializableByteBuffer.java b/...enchmark/data/SerializableByteBuffer.java → ...enchmark/data/SerializableByteBuffer.java
diff --git a/...rg/apache/fury/benchmark/data/Struct.java → ...rg/apache/fury/benchmark/data/Struct.java b/...rg/apache/fury/benchmark/data/Struct.java → ...rg/apache/fury/benchmark/data/Struct.java
diff --git a/.../fury/benchmark/state/BenchmarkState.java → .../fury/benchmark/state/BenchmarkState.java b/.../fury/benchmark/state/BenchmarkState.java → .../fury/benchmark/state/BenchmarkState.java
diff --git a/...ache/fury/benchmark/state/BufferType.java → ...ache/fury/benchmark/state/BufferType.java b/...ache/fury/benchmark/state/BufferType.java → ...ache/fury/benchmark/state/BufferType.java
diff --git a/.../apache/fury/benchmark/state/Example.java → .../apache/fury/benchmark/state/Example.java b/.../apache/fury/benchmark/state/Example.java → .../apache/fury/benchmark/state/Example.java
diff --git a/...ury/benchmark/state/FlatBuffersState.java → ...ury/benchmark/state/FlatBuffersState.java b/...ury/benchmark/state/FlatBuffersState.java → ...ury/benchmark/state/FlatBuffersState.java
diff --git a/...apache/fury/benchmark/state/FstState.java → ...apache/fury/benchmark/state/FstState.java b/...apache/fury/benchmark/state/FstState.java → ...apache/fury/benchmark/state/FstState.java
diff --git a/...pache/fury/benchmark/state/FuryState.java → ...pache/fury/benchmark/state/FuryState.java b/...pache/fury/benchmark/state/FuryState.java → ...pache/fury/benchmark/state/FuryState.java
diff --git a/...he/fury/benchmark/state/HessionState.java → ...he/fury/benchmark/state/HessionState.java b/...he/fury/benchmark/state/HessionState.java → ...he/fury/benchmark/state/HessionState.java
diff --git a/...apache/fury/benchmark/state/JDKState.java → ...apache/fury/benchmark/state/JDKState.java b/...apache/fury/benchmark/state/JDKState.java → ...apache/fury/benchmark/state/JDKState.java
diff --git a/...ache/fury/benchmark/state/JsonbState.java → ...ache/fury/benchmark/state/JsonbState.java b/...ache/fury/benchmark/state/JsonbState.java → ...ache/fury/benchmark/state/JsonbState.java
diff --git a/...pache/fury/benchmark/state/KryoState.java → ...pache/fury/benchmark/state/KryoState.java b/...pache/fury/benchmark/state/KryoState.java → ...pache/fury/benchmark/state/KryoState.java
diff --git a/...ache/fury/benchmark/state/ObjectType.java → ...ache/fury/benchmark/state/ObjectType.java b/...ache/fury/benchmark/state/ObjectType.java → ...ache/fury/benchmark/state/ObjectType.java
diff --git a/...ry/benchmark/state/ProtoBuffersState.java → ...ry/benchmark/state/ProtoBuffersState.java b/...ry/benchmark/state/ProtoBuffersState.java → ...ry/benchmark/state/ProtoBuffersState.java
diff --git a/...fury/benchmark/state/ProtostuffState.java → ...fury/benchmark/state/ProtostuffState.java b/...fury/benchmark/state/ProtostuffState.java → ...fury/benchmark/state/ProtostuffState.java
diff --git a/...org/apache/fury/benchmark/state/bench.fbs → ...org/apache/fury/benchmark/state/bench.fbs b/...org/apache/fury/benchmark/state/bench.fbs → ...org/apache/fury/benchmark/state/bench.fbs
diff --git a/...ury/benchmark/state/generated/FBSBar.java → ...ury/benchmark/state/generated/FBSBar.java b/...ury/benchmark/state/generated/FBSBar.java → ...ury/benchmark/state/generated/FBSBar.java
diff --git a/...ury/benchmark/state/generated/FBSFoo.java → ...ury/benchmark/state/generated/FBSFoo.java b/...ury/benchmark/state/generated/FBSFoo.java → ...ury/benchmark/state/generated/FBSFoo.java
diff --git a/...y/benchmark/state/generated/FBSImage.java → ...y/benchmark/state/generated/FBSImage.java b/...y/benchmark/state/generated/FBSImage.java → ...y/benchmark/state/generated/FBSImage.java
diff --git a/...y/benchmark/state/generated/FBSMedia.java → ...y/benchmark/state/generated/FBSMedia.java b/...y/benchmark/state/generated/FBSMedia.java → ...y/benchmark/state/generated/FBSMedia.java
diff --git a/...mark/state/generated/FBSMediaContent.java → ...mark/state/generated/FBSMediaContent.java b/...mark/state/generated/FBSMediaContent.java → ...mark/state/generated/FBSMediaContent.java
diff --git a/.../benchmark/state/generated/FBSPlayer.java → .../benchmark/state/generated/FBSPlayer.java b/.../benchmark/state/generated/FBSPlayer.java → .../benchmark/state/generated/FBSPlayer.java
diff --git a/.../benchmark/state/generated/FBSSample.java → .../benchmark/state/generated/FBSSample.java b/.../benchmark/state/generated/FBSSample.java → .../benchmark/state/generated/FBSSample.java
diff --git a/...ry/benchmark/state/generated/FBSSize.java → ...ry/benchmark/state/generated/FBSSize.java b/...ry/benchmark/state/generated/FBSSize.java → ...ry/benchmark/state/generated/FBSSize.java
diff --git a/...fury-benchmark/src/main/proto/bench.proto → java/benchmark/src/main/proto/bench.proto b/...fury-benchmark/src/main/proto/bench.proto → java/benchmark/src/main/proto/bench.proto
diff --git a/...benchmark/state/FlatBuffersStateTest.java → ...benchmark/state/FlatBuffersStateTest.java b/...benchmark/state/FlatBuffersStateTest.java → ...benchmark/state/FlatBuffersStateTest.java
diff --git a/...enchmark/state/ProtoBuffersStateTest.java → ...enchmark/state/ProtoBuffersStateTest.java b/...enchmark/state/ProtoBuffersStateTest.java → ...enchmark/state/ProtoBuffersStateTest.java
diff --git a/licenserc.toml b/licenserc.toml
@@ -23,18 +23,18 @@ excludes = [
     "go.sum",
 
     # Generated
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/generated/**",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/state/generated/**",
 
     # Derived
     "ci/format.sh",
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java",
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java",
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java",
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java",
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java",
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java",
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java",
-    "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java",
+    "java/benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java",
     "java/fury-core/src/main/java/org/apache/fury/codegen/Code.java",
     "java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java",
     "java/fury-core/src/main/java/org/apache/fury/collection/IdentityMap.java",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		java/fury-benchmark export-ignore
		java/benchmark export-ignore