This is an automated email from the ASF dual-hosted git repository.
mbutrovich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/main by this push:
new 8324fe97a9 fix: apply 1.11 Iceberg diff changes from #4991 to other
versions (#5020)
8324fe97a9 is described below
commit 8324fe97a9a3d40ffc52ec34a27545a97dc8afe0
Author: Matt Butrovich <[email protected]>
AuthorDate: Fri Jul 24 12:03:04 2026 -0400
fix: apply 1.11 Iceberg diff changes from #4991 to other versions (#5020)
---
dev/diffs/iceberg/1.10.0.diff | 25 +++++++++++++++++++++++++
dev/diffs/iceberg/1.8.1.diff | 25 +++++++++++++++++++++++++
dev/diffs/iceberg/1.9.1.diff | 25 +++++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/dev/diffs/iceberg/1.10.0.diff b/dev/diffs/iceberg/1.10.0.diff
index 5ea31e8e1b..b7c5ce8a84 100644
--- a/dev/diffs/iceberg/1.10.0.diff
+++ b/dev/diffs/iceberg/1.10.0.diff
@@ -2513,6 +2513,31 @@ index daf4e29ac0..0c7d376f80 100644
.enableHiveSupport()
.getOrCreate();
+diff --git
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTestBase.java
b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTestBase.java
+index 0db6a65fd3..9ee8b9e084 100644
+---
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTestBase.java
++++
b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTestBase.java
+@@ -47,7 +47,6 @@ import org.apache.iceberg.types.Types.LongType;
+ import org.apache.iceberg.types.Types.MapType;
+ import org.apache.iceberg.types.Types.StructType;
+ import org.apache.iceberg.util.DateTimeUtil;
+-import org.assertj.core.api.Condition;
+ import org.junit.jupiter.api.Test;
+ import org.junit.jupiter.api.io.TempDir;
+ import org.junit.jupiter.params.ParameterizedTest;
+@@ -307,12 +306,6 @@ public abstract class AvroDataTestBase {
+ .build());
+
+ assertThatThrownBy(() -> writeAndValidate(writeSchema, expectedSchema))
+- .has(
+- new Condition<>(
+- t ->
+- IllegalArgumentException.class.isInstance(t)
+- ||
IllegalArgumentException.class.isInstance(t.getCause()),
+- "Expecting a throwable or cause that is an instance of
IllegalArgumentException"))
+ .hasMessageContaining("Missing required field: missing_str");
+ }
+
diff --git
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/vectorized/parquet/TestParquetDictionaryEncodedVectorizedReads.java
b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/vectorized/parquet/TestParquetDictionaryEncodedVectorizedReads.java
index 973a17c9a3..d7402c1409 100644
---
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/vectorized/parquet/TestParquetDictionaryEncodedVectorizedReads.java
diff --git a/dev/diffs/iceberg/1.8.1.diff b/dev/diffs/iceberg/1.8.1.diff
index 5267b7694b..7c951c7f5b 100644
--- a/dev/diffs/iceberg/1.8.1.diff
+++ b/dev/diffs/iceberg/1.8.1.diff
@@ -1050,6 +1050,31 @@ index 3e8953fb95..65a8d8ca35 100644
.enableHiveSupport()
.getOrCreate();
+diff --git
a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTest.java
b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTest.java
+index ad969384c5..f3c2b833e3 100644
+---
a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTest.java
++++
b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTest.java
+@@ -41,7 +41,6 @@ import org.apache.iceberg.types.Types.MapType;
+ import org.apache.iceberg.types.Types.StructType;
+ import org.apache.iceberg.util.DateTimeUtil;
+ import org.assertj.core.api.Assumptions;
+-import org.assertj.core.api.Condition;
+ import org.junit.jupiter.api.Test;
+ import org.junit.jupiter.api.io.TempDir;
+ import org.junit.jupiter.params.ParameterizedTest;
+@@ -283,12 +282,6 @@ public abstract class AvroDataTest {
+ .build());
+
+ assertThatThrownBy(() -> writeAndValidate(writeSchema, expectedSchema))
+- .has(
+- new Condition<>(
+- t ->
+- IllegalArgumentException.class.isInstance(t)
+- ||
IllegalArgumentException.class.isInstance(t.getCause()),
+- "Expecting a throwable or cause that is an instance of
IllegalArgumentException"))
+ .hasMessageContaining("Missing required field: missing_str");
+ }
+
diff --git
a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/ScanTestBase.java
b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/ScanTestBase.java
index 3a269740b7..2035edf93a 100644
---
a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/ScanTestBase.java
diff --git a/dev/diffs/iceberg/1.9.1.diff b/dev/diffs/iceberg/1.9.1.diff
index a20b6aac80..e086b43a30 100644
--- a/dev/diffs/iceberg/1.9.1.diff
+++ b/dev/diffs/iceberg/1.9.1.diff
@@ -2625,6 +2625,31 @@ index 3e9f3334ef..fbc33dc157 100644
.enableHiveSupport()
.getOrCreate();
+diff --git
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTest.java
b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTest.java
+index a31138ae01..501c8ac93e 100644
+---
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTest.java
++++
b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/AvroDataTest.java
+@@ -47,7 +47,6 @@ import org.apache.iceberg.types.Types.MapType;
+ import org.apache.iceberg.types.Types.StructType;
+ import org.apache.iceberg.util.DateTimeUtil;
+ import org.assertj.core.api.Assumptions;
+-import org.assertj.core.api.Condition;
+ import org.junit.jupiter.api.Test;
+ import org.junit.jupiter.api.io.TempDir;
+ import org.junit.jupiter.params.ParameterizedTest;
+@@ -307,12 +306,6 @@ public abstract class AvroDataTest {
+ .build());
+
+ assertThatThrownBy(() -> writeAndValidate(writeSchema, expectedSchema))
+- .has(
+- new Condition<>(
+- t ->
+- IllegalArgumentException.class.isInstance(t)
+- ||
IllegalArgumentException.class.isInstance(t.getCause()),
+- "Expecting a throwable or cause that is an instance of
IllegalArgumentException"))
+ .hasMessageContaining("Missing required field: missing_str");
+ }
+
diff --git
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetDictionaryEncodedVectorizedReads.java
b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetDictionaryEncodedVectorizedReads.java
index bc4e722bc8..c7a417e105 100644
---
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetDictionaryEncodedVectorizedReads.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
