Revert "Update Iceberg from 1.3.1 to 1.4.1"

This reverts commit bb66918. Iceberg 1.4.x contains a silent correctness issue when concurrently committing writes to a table. See: apache/iceberg#9227
alexjo2144 · Dec 18, 2023 · 2b1b7a6 · 2b1b7a6
1 parent 0aa1f1b
commit 2b1b7a6
Show file tree

Hide file tree

Showing 9 changed files with 466 additions and 10 deletions.
diff --git a/plugin/trino-iceberg/pom.xml b/plugin/trino-iceberg/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
         <!-- Nessie version (matching to Iceberg release) must be bumped along with Iceberg version bump to avoid compatibility issues -->
-        <dep.nessie.version>0.71.0</dep.nessie.version>
+        <dep.nessie.version>0.59.0</dep.nessie.version>
     </properties>
 
     <dependencies>
@@ -230,6 +230,11 @@
             <artifactId>parquet-hadoop</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.jdbi</groupId>
             <artifactId>jdbi3-core</artifactId>

diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetFileWriter.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetFileWriter.java
@@ -37,7 +37,7 @@
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static org.apache.iceberg.parquet.ParquetUtil.footerMetrics;
+import static org.apache.iceberg.parquet.TrinoParquetUtil.footerMetrics;
 
 public final class IcebergParquetFileWriter
         implements IcebergFileWriter

diff --git a/...berg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogModule.java b/...berg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogModule.java
@@ -49,6 +49,7 @@ public static NessieIcebergClient createNessieIcebergClient(IcebergNessieCatalog
     {
         HttpClientBuilder builder = HttpClientBuilder.builder()
                 .withUri(icebergNessieCatalogConfig.getServerUri())
+                .withEnableApiCompatibilityCheck(false)
                 .withDisableCompression(!icebergNessieCatalogConfig.isCompressionEnabled())
                 .withReadTimeout(toIntExact(icebergNessieCatalogConfig.getReadTimeout().toMillis()))
                 .withConnectionTimeout(toIntExact(icebergNessieCatalogConfig.getConnectionTimeout().toMillis()));