test spark 4.0.0-snapshot

apache · Apr 25, 2024 · 68f02f7 · 68f02f7
1 parent dc634cb
commit 68f02f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/java/bench/pom.xml b/java/bench/pom.xml
@@ -41,7 +41,7 @@
     <parquet.version>1.13.1</parquet.version>
     <scala.binary.version>2.13</scala.binary.version>
     <scala.version>2.13.8</scala.version>
-    <spark.version>3.5.1</spark.version>
+    <spark.version>4.0.0-SNAPSHOT</spark.version>
   </properties>
 
   <dependencyManagement>

diff --git a/java/bench/spark/pom.xml b/java/bench/spark/pom.xml
@@ -171,8 +171,9 @@
                     <exclude>META-INF/NOTICE-binary</exclude>
                     <exclude>META-INF/NOTICE.md</exclude>
                     <exclude>META-INF/NOTICE.txt</exclude>
-                    <exclude>META-INF/DUMMY.SF</exclude>
-                    <exclude>META-INF/DUMMY.DSA</exclude>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
                     <exclude>LICENSE</exclude>
                     <exclude>NOTICE</exclude>
                     <exclude>THIRD-PARTY</exclude>

diff --git a/java/bench/spark/src/java/org/apache/orc/bench/spark/SparkBenchmark.java b/java/bench/spark/src/java/org/apache/orc/bench/spark/SparkBenchmark.java
@@ -74,7 +74,8 @@
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @AutoService(OrcBenchmark.class)
-@Fork(jvmArgsAppend = "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED")
+@Fork(jvmArgsAppend = {"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
+    "--add-opens=java.base/sun.util.calendar=ALL-UNNAMED"})
 public class SparkBenchmark implements OrcBenchmark {
 
   private static final Path root = Utilities.getBenchmarkRoot();
@@ -201,7 +202,7 @@ public void fullRead(InputSource source,
       default:
         break;
     }
-    Seq<Tuple2<String,String>> optionsScala = JavaConverters
+    Seq<Tuple2<String, String>> optionsScala = JavaConverters
         .asScalaBufferConverter(options).asScala().toSeq();
     @SuppressWarnings("unchecked")
     Map<String,String> scalaMap = (Map<String, String>)Map$.MODULE$.apply(optionsScala);