Spark: Bump to 3.4.1 (#7881)

apache · Jun 27, 2023 · c96edfc · c96edfc
1 parent 4e6c7ba
commit c96edfc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/spark/v3.4/build.gradle b/spark/v3.4/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-String sparkVersion = '3.4.0'
+String sparkVersion = '3.4.1'
 String sparkMajorVersion = '3.4'
 String scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion")
 

diff --git a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkOrcReader.java b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkOrcReader.java
@@ -26,7 +26,6 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 import org.apache.iceberg.Files;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.io.CloseableIterable;
@@ -102,12 +101,6 @@ private void writeAndValidateRecords(Schema schema, Iterable<InternalRow> expect
         assertEquals(schema, expectedRows.next(), actualRows.next());
       }
       Assert.assertFalse("Should not have extra rows", actualRows.hasNext());
-    } catch (UnsupportedOperationException e) {
-      // Fixed in https://github.com/apache/spark/pull/41103
-      // Can be removed once Spark 3.4.1 is released
-      if (!Objects.equals(e.getMessage(), "Datatype not supported TimestampNTZType")) {
-        throw e;
-      }
     }
   }
 

diff --git a/...est/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetVectorizedReads.java b/...est/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetVectorizedReads.java
@@ -60,15 +60,7 @@ public class TestParquetVectorizedReads extends AvroDataTest {
 
   @Override
   protected void writeAndValidate(Schema schema) throws IOException {
-    try {
-      writeAndValidate(schema, getNumRows(), 0L, RandomData.DEFAULT_NULL_PERCENTAGE, true);
-    } catch (UnsupportedOperationException exc) {
-      // Fixed in https://github.com/apache/spark/pull/41103
-      // Can be removed once Spark 3.4.1 is released
-      if (!exc.getMessage().equals("Datatype not supported TimestampNTZType")) {
-        throw exc;
-      }
-    }
+    writeAndValidate(schema, getNumRows(), 0L, RandomData.DEFAULT_NULL_PERCENTAGE, true);
   }
 
   private void writeAndValidate(