This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new bf4d9b91d ORC-870: Unpin and upgrade `jmh` to 1.37
bf4d9b91d is described below
commit bf4d9b91d009e9cf7517aea5ec796385f8d3fafa
Author: sychen <[email protected]>
AuthorDate: Thu Jan 11 01:38:39 2024 -0800
ORC-870: Unpin and upgrade `jmh` to 1.37
### What changes were proposed in this pull request?
This PR aims to unpin and upgrade `jmh` to 1.37.
### Why are the changes needed?
To use the latest bug fixed version.
### How was this patch tested?
```
cd java
./mvnw clean package -Pbenchmark -DskipTests
```
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #1740 from cxzl25/ORC-870.
Lead-authored-by: sychen <[email protected]>
Co-authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
(cherry picked from commit 683221a009b0b922f0386ce13acf2bac3df4c0e8)
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.github/dependabot.yml | 3 ---
.../bench/hive/rowfilter/BooleanRowFilterBenchmark.java | 14 +++++++++-----
.../bench/hive/rowfilter/DecimalRowFilterBenchmark.java | 14 +++++++++-----
.../orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java | 14 +++++++++-----
.../orc/bench/hive/rowfilter/StringRowFilterBenchmark.java | 14 +++++++++-----
.../bench/hive/rowfilter/TimestampRowFilterBenchmark.java | 14 +++++++++-----
java/bench/pom.xml | 2 +-
7 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5ab99502c..f84febd6e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -23,9 +23,6 @@ updates:
# Pin gson to 2.2.4 because of Hive
- dependency-name: "com.google.code.gson:gson"
versions: "[2.3,)"
- # Pin jmh to 1.20
- - dependency-name: "org.openjdk.jmh:jmh-core"
- versions: "[1.21,)"
# Pin scala-library to 2.12.15
- dependency-name: "org.scala-lang:scala-library"
versions: "[2.12.16,)"
diff --git
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/BooleanRowFilterBenchmark.java
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/BooleanRowFilterBenchmark.java
index 5307ea6db..81c8664f6 100644
---
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/BooleanRowFilterBenchmark.java
+++
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/BooleanRowFilterBenchmark.java
@@ -91,10 +91,14 @@ public class BooleanRowFilterBenchmark extends
org.openjdk.jmh.Main {
* Run this test:
* java -cp hive/target/orc-benchmarks-hive-*-uber.jar
org.apache.orc.bench.hive.rowfilter.BooleanRowFilterBenchmark
*/
- public static void main(String[] args) throws RunnerException {
- new Runner(new OptionsBuilder()
- .include(BooleanRowFilterBenchmark.class.getSimpleName())
- .forks(1)
- .build()).run();
+ public static void main(String[] args) {
+ try {
+ new Runner(new OptionsBuilder()
+ .include(BooleanRowFilterBenchmark.class.getSimpleName())
+ .forks(1)
+ .build()).run();
+ } catch (RunnerException e) {
+ throw new RuntimeException(e);
+ }
}
}
diff --git
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DecimalRowFilterBenchmark.java
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DecimalRowFilterBenchmark.java
index 6dd765209..b03794bbe 100644
---
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DecimalRowFilterBenchmark.java
+++
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DecimalRowFilterBenchmark.java
@@ -92,10 +92,14 @@ public class DecimalRowFilterBenchmark extends
org.openjdk.jmh.Main {
* Run this test:
* java -cp hive/target/orc-benchmarks-hive-*-uber.jar
org.apache.orc.bench.hive.rowfilter.DecimalRowFilterBenchmark
*/
- public static void main(String[] args) throws RunnerException {
- new Runner(new OptionsBuilder()
- .include(DecimalRowFilterBenchmark.class.getSimpleName())
- .forks(1)
- .build()).run();
+ public static void main(String[] args) {
+ try {
+ new Runner(new OptionsBuilder()
+ .include(DecimalRowFilterBenchmark.class.getSimpleName())
+ .forks(1)
+ .build()).run();
+ } catch (RunnerException e) {
+ throw new RuntimeException(e);
+ }
}
}
diff --git
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java
index bb59e9e10..02529bdb2 100644
---
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java
+++
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java
@@ -92,10 +92,14 @@ public class DoubleRowFilterBenchmark extends
org.openjdk.jmh.Main {
* Run this test:
* java -cp hive/target/orc-benchmarks-hive-*-uber.jar
org.apache.orc.bench.hive.rowfilter.DoubleRowFilterBenchmark
*/
- public static void main(String[] args) throws RunnerException {
- new Runner(new OptionsBuilder()
- .include(DoubleRowFilterBenchmark.class.getSimpleName())
- .forks(1)
- .build()).run();
+ public static void main(String[] args) {
+ try {
+ new Runner(new OptionsBuilder()
+ .include(DoubleRowFilterBenchmark.class.getSimpleName())
+ .forks(1)
+ .build()).run();
+ } catch (RunnerException e) {
+ throw new RuntimeException(e);
+ }
}
}
diff --git
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/StringRowFilterBenchmark.java
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/StringRowFilterBenchmark.java
index a61de4bc6..783f9ffbe 100644
---
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/StringRowFilterBenchmark.java
+++
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/StringRowFilterBenchmark.java
@@ -91,10 +91,14 @@ public class StringRowFilterBenchmark extends
org.openjdk.jmh.Main {
* Run this test:
* java -cp hive/target/orc-benchmarks-hive-*-uber.jar
org.apache.orc.bench.hive.rowfilter.StringRowFilterBenchmark
*/
- public static void main(String[] args) throws RunnerException {
- new Runner(new OptionsBuilder()
- .include(StringRowFilterBenchmark.class.getSimpleName())
- .forks(1)
- .build()).run();
+ public static void main(String[] args) {
+ try {
+ new Runner(new OptionsBuilder()
+ .include(StringRowFilterBenchmark.class.getSimpleName())
+ .forks(1)
+ .build()).run();
+ } catch (RunnerException e) {
+ throw new RuntimeException(e);
+ }
}
}
diff --git
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/TimestampRowFilterBenchmark.java
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/TimestampRowFilterBenchmark.java
index dee7fe706..a983b5f3a 100644
---
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/TimestampRowFilterBenchmark.java
+++
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/TimestampRowFilterBenchmark.java
@@ -95,10 +95,14 @@ public class TimestampRowFilterBenchmark extends
org.openjdk.jmh.Main {
* java -cp hive/target/orc-benchmarks-hive-*-uber.jar \
* org.apache.orc.bench.hive.rowfilter.TimestampRowFilterBenchmark
*/
- public static void main(String[] args) throws RunnerException {
- new Runner(new OptionsBuilder()
- .include(TimestampRowFilterBenchmark.class.getSimpleName())
- .forks(1)
- .build()).run();
+ public static void main(String[] args) {
+ try {
+ new Runner(new OptionsBuilder()
+ .include(TimestampRowFilterBenchmark.class.getSimpleName())
+ .forks(1)
+ .build()).run();
+ } catch (RunnerException e) {
+ throw new RuntimeException(e);
+ }
}
}
diff --git a/java/bench/pom.xml b/java/bench/pom.xml
index c8bf61bf8..5565f2793 100644
--- a/java/bench/pom.xml
+++ b/java/bench/pom.xml
@@ -35,7 +35,7 @@
<properties>
<avro.version>1.11.3</avro.version>
<hive.version>3.1.3</hive.version>
- <jmh.version>1.20</jmh.version>
+ <jmh.version>1.37</jmh.version>
<junit.version>5.10.1</junit.version>
<orc.version>${project.version}</orc.version>
<parquet.version>1.13.1</parquet.version>
