Update Iceberg to 1.10.0

ebyhr · ebyhr · commit bccc40e9cbf4 · 2025-09-04T07:51:36.000+09:00
diff --git a/plugin/trino-iceberg/pom.xml b/plugin/trino-iceberg/pom.xml
@@ -49,12 +49,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jspecify</groupId>
-                    <artifactId>jspecify</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -224,12 +218,6 @@
         <dependency>
             <groupId>org.apache.iceberg</groupId>
             <artifactId>iceberg-aws</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jspecify</groupId>
-                    <artifactId>jspecify</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -451,6 +439,12 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>kms</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
@@ -1076,10 +1076,10 @@ public void testCreateTableWithUnsupportedNestedFieldPartitioning()
                 "\\QUnable to parse partitioning value: Cannot partition by non-primitive source field: struct<3: child: optional string>");
         assertQueryFails(
                 "CREATE TABLE test_partitioned_table_nested_field_inside_array (parent ARRAY(ROW(child VARCHAR))) WITH (partitioning = ARRAY['\"parent.child\"'])",
-                "\\QPartitioning field [parent.element.child] cannot be contained in a array");
+                "\\QUnable to parse partitioning value: Invalid partition field parent: list<struct<3: child: optional string>>");
         assertQueryFails(
                 "CREATE TABLE test_partitioned_table_nested_field_inside_map (parent MAP(ROW(child INTEGER), ARRAY(VARCHAR))) WITH (partitioning = ARRAY['\"parent.key.child\"'])",
-                "\\QPartitioning field [parent.key.child] cannot be contained in a map");
+                "\\QUnable to parse partitioning value: Invalid partition field parent: map<struct<4: child: optional int>, list<string>>");
         assertQueryFails(
                 "CREATE TABLE test_partitioned_table_nested_field_year_transform_in_string (parent ROW(child VARCHAR)) WITH (partitioning = ARRAY['year(\"parent.child\")'])",
                 "\\QUnable to parse partitioning value: Invalid source type string for transform: year");
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergRestCatalogNestedNamespaceConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergRestCatalogNestedNamespaceConnectorSmokeTest.java
@@ -236,8 +236,7 @@ public void testDropTableWithMissingSnapshotFile()
                 .isInstanceOf(QueryFailedException.class)
                 .cause()
                 .hasMessageContaining("Failed to drop table")
-                .cause()
-                .hasMessageMatching("Server error: NotFoundException: Failed to open input stream for file: (.*)");
+                .hasNoCause();
     }
 
     @Test
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergTrinoRestCatalogConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergTrinoRestCatalogConnectorSmokeTest.java
@@ -232,8 +232,7 @@ public void testDropTableWithMissingSnapshotFile()
                 .isInstanceOf(QueryFailedException.class)
                 .cause()
                 .hasMessageContaining("Failed to drop table")
-                .cause()
-                .hasMessageMatching("Server error: NotFoundException: Failed to open input stream for file: (.*)");
+                .hasNoCause();
     }
 
     @Test
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergVendingRestCatalogConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergVendingRestCatalogConnectorSmokeTest.java
@@ -292,8 +292,7 @@ public void testDropTableWithMissingSnapshotFile()
                 .isInstanceOf(QueryFailedException.class)
                 .cause()
                 .hasMessageContaining("Failed to drop table")
-                .cause()
-                .hasMessageMatching("Server error: NoSuchKeyException:.*");
+                .hasNoCause();
     }
 
     @Test
diff --git a/plugin/trino-lakehouse/pom.xml b/plugin/trino-lakehouse/pom.xml
@@ -18,12 +18,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jspecify</groupId>
-                    <artifactId>jspecify</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -65,12 +59,6 @@
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-hudi</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jspecify</groupId>
-                    <artifactId>jspecify</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
@@ -197,7 +197,7 @@
         <dep.frontend-npm.version>11.2.0</dep.frontend-npm.version>
         <dep.gib.version>4.5.4</dep.gib.version>
         <dep.httpcore5.version>5.3.5</dep.httpcore5.version>
-        <dep.iceberg.version>1.9.2</dep.iceberg.version>
+        <dep.iceberg.version>1.10.0</dep.iceberg.version>
         <dep.jna.version>5.17.0</dep.jna.version>
         <dep.jsonwebtoken.version>0.13.0</dep.jsonwebtoken.version>
         <dep.jts.version>1.20.0</dep.jts.version>
@@ -2449,6 +2449,14 @@
         </dependencies>
     </dependencyManagement>
 
+    <repositories>
+        <repository>
+            <id>iceberg-release-candidate</id>
+            <name>Iceberg Release Candidate</name>
+            <url>https://repository.apache.org/content/repositories/orgapacheiceberg-1268/</url>
+        </repository>
+    </repositories>
+
     <build>
         <pluginManagement>
             <plugins>
diff --git a/testing/trino-faulttolerant-tests/pom.xml b/testing/trino-faulttolerant-tests/pom.xml
@@ -24,12 +24,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jspecify</groupId>
-                    <artifactId>jspecify</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/testing/trino-tests/pom.xml b/testing/trino-tests/pom.xml
@@ -36,12 +36,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jspecify</groupId>
-                    <artifactId>jspecify</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -344,12 +338,6 @@
             <groupId>org.apache.iceberg</groupId>
             <artifactId>iceberg-core</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jspecify</groupId>
-                    <artifactId>jspecify</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -236,8 +236,7 @@ public void testDropTableWithMissingSnapshotFile()`
`236`	`236`	`.isInstanceOf(QueryFailedException.class)`
`237`	`237`	`.cause()`
`238`	`238`	`.hasMessageContaining("Failed to drop table")`
`239`		`- .cause()`
`240`		`- .hasMessageMatching("Server error: NotFoundException: Failed to open input stream for file: (.*)");`
	`239`	`+ .hasNoCause();`
`241`	`240`	`}`
`242`	`241`
`243`	`242`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,7 @@ public void testDropTableWithMissingSnapshotFile()`
`232`	`232`	`.isInstanceOf(QueryFailedException.class)`
`233`	`233`	`.cause()`
`234`	`234`	`.hasMessageContaining("Failed to drop table")`
`235`		`- .cause()`
`236`		`- .hasMessageMatching("Server error: NotFoundException: Failed to open input stream for file: (.*)");`
	`235`	`+ .hasNoCause();`
`237`	`236`	`}`
`238`	`237`
`239`	`238`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,7 @@ public void testDropTableWithMissingSnapshotFile()`
`292`	`292`	`.isInstanceOf(QueryFailedException.class)`
`293`	`293`	`.cause()`
`294`	`294`	`.hasMessageContaining("Failed to drop table")`
`295`		`- .cause()`
`296`		`- .hasMessageMatching("Server error: NoSuchKeyException:.*");`
	`295`	`+ .hasNoCause();`
`297`	`296`	`}`
`298`	`297`
`299`	`298`	`@Test`