You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2022/02/22 17:33:22 UTC
[iceberg] branch master updated: Spark 3.2: Fix JMH Spark parquet benchmark (#3910)
This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 2a2817c Spark 3.2: Fix JMH Spark parquet benchmark (#3910)
2a2817c is described below
commit 2a2817ccc915a9ee7f62bbc249307fca3e8a7620
Author: ZhongYujiang <42...@users.noreply.github.com>
AuthorDate: Wed Feb 23 01:33:00 2022 +0800
Spark 3.2: Fix JMH Spark parquet benchmark (#3910)
Co-authored-by: zhongyujiang <zh...@xiaomi.com>
---
.github/workflows/jmh-bechmarks.yml | 3 +++
.../spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java | 3 ++-
.../spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java | 3 ++-
.../spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java | 3 ++-
.../spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java | 3 ++-
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/jmh-bechmarks.yml b/.github/workflows/jmh-bechmarks.yml
index fb3bb66..4d10834 100644
--- a/.github/workflows/jmh-bechmarks.yml
+++ b/.github/workflows/jmh-bechmarks.yml
@@ -76,6 +76,9 @@ jobs:
SPARK_LOCAL_IP: localhost
steps:
- uses: actions/checkout@v2
+ with:
+ repository: ${{ github.event.inputs.repo }}
+ ref: ${{ github.event.inputs.ref }}
- uses: actions/setup-java@v1
with:
java-version: 11
diff --git a/spark/v2.4/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java b/spark/v2.4/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
index 232d33c..74bae80 100644
--- a/spark/v2.4/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
+++ b/spark/v2.4/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
@@ -35,6 +35,7 @@ import org.apache.spark.sql.types.StructType;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.Scope;
@@ -84,7 +85,7 @@ public class SparkParquetWritersNestedDataBenchmark {
dataFile.delete();
}
- @TearDown
+ @TearDown(Level.Iteration)
public void tearDownBenchmark() {
if (dataFile != null) {
dataFile.delete();
diff --git a/spark/v3.0/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java b/spark/v3.0/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
index 232d33c..74bae80 100644
--- a/spark/v3.0/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
+++ b/spark/v3.0/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
@@ -35,6 +35,7 @@ import org.apache.spark.sql.types.StructType;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.Scope;
@@ -84,7 +85,7 @@ public class SparkParquetWritersNestedDataBenchmark {
dataFile.delete();
}
- @TearDown
+ @TearDown(Level.Iteration)
public void tearDownBenchmark() {
if (dataFile != null) {
dataFile.delete();
diff --git a/spark/v3.1/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java b/spark/v3.1/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
index 232d33c..74bae80 100644
--- a/spark/v3.1/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
+++ b/spark/v3.1/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
@@ -35,6 +35,7 @@ import org.apache.spark.sql.types.StructType;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.Scope;
@@ -84,7 +85,7 @@ public class SparkParquetWritersNestedDataBenchmark {
dataFile.delete();
}
- @TearDown
+ @TearDown(Level.Iteration)
public void tearDownBenchmark() {
if (dataFile != null) {
dataFile.delete();
diff --git a/spark/v3.2/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java b/spark/v3.2/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
index 232d33c..74bae80 100644
--- a/spark/v3.2/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
+++ b/spark/v3.2/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetWritersNestedDataBenchmark.java
@@ -35,6 +35,7 @@ import org.apache.spark.sql.types.StructType;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.Scope;
@@ -84,7 +85,7 @@ public class SparkParquetWritersNestedDataBenchmark {
dataFile.delete();
}
- @TearDown
+ @TearDown(Level.Iteration)
public void tearDownBenchmark() {
if (dataFile != null) {
dataFile.delete();