Upgrade Iceberg version to 1.6.1

Author: hantangwangd

presto-iceberg/pom.xml

@@ -14,7 +14,7 @@
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
         <project.build.targetJdk>17</project.build.targetJdk>
-        <dep.iceberg.version>1.5.0</dep.iceberg.version>
+        <dep.iceberg.version>1.6.1</dep.iceberg.version>
         <dep.nessie.version>0.95.0</dep.nessie.version>
         <air.check.skip-modernizer>true</air.check.skip-modernizer>
     </properties>

presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/TestIcebergDistributedRest.java

@@ -36,7 +36,6 @@
 import static com.facebook.presto.testing.TestingSession.testSessionBuilder;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @Test
 public class TestIcebergDistributedRest
@@ -98,15 +97,6 @@ protected QueryRunner createQueryRunner()
                 .getQueryRunner();
     }
 
-    @Test
-    public void testDeleteOnV1Table()
-    {
-        // v1 table create fails due to Iceberg REST catalog bug (see: https://github.com/apache/iceberg/issues/8756)
-        assertThatThrownBy(super::testDeleteOnV1Table)
-                .isInstanceOf(RuntimeException.class)
-                .hasMessageMatching("Cannot downgrade v2 table to v1");
-    }
-
     @Test
     public void testRestUserSessionAuthorization()
     {

presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/TestIcebergSmokeRest.java

@@ -47,7 +47,6 @@
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static java.lang.String.format;
 import static org.apache.iceberg.rest.auth.OAuth2Properties.OAUTH2_SERVER_URI;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 @Test
@@ -128,69 +127,6 @@ protected Table getIcebergTable(ConnectorSession session, String schema, String
                 SchemaTableName.valueOf(schema + "." + tableName));
     }
 
-    @Test
-    public void testDeleteOnPartitionedV1Table()
-    {
-        // v1 table create fails due to Iceberg REST catalog bug (see: https://github.com/apache/iceberg/issues/8756)
-        assertThatThrownBy(super::testDeleteOnPartitionedV1Table)
-                .isInstanceOf(RuntimeException.class)
-                .hasMessageMatching("Cannot downgrade v2 table to v1");
-    }
-
-    @Test
-    public void testCreateTableWithFormatVersion()
-    {
-        // v1 table create fails due to Iceberg REST catalog bug (see: https://github.com/apache/iceberg/issues/8756)
-        assertThatThrownBy(() -> super.testMetadataDeleteOnNonIdentityPartitionColumn("1", "copy-on-write"))
-                .isInstanceOf(RuntimeException.class)
-                .hasMessageMatching("Cannot downgrade v2 table to v1");
-
-        // v2 succeeds
-        super.testCreateTableWithFormatVersion("2", "merge-on-read");
-    }
-
-    @Test(dataProvider = "version_and_mode")
-    public void testMetadataDeleteOnNonIdentityPartitionColumn(String version, String mode)
-    {
-        if (version.equals("1")) {
-            // v1 table create fails due to Iceberg REST catalog bug (see: https://github.com/apache/iceberg/issues/8756)
-            assertThatThrownBy(() -> super.testMetadataDeleteOnNonIdentityPartitionColumn(version, mode))
-                    .isInstanceOf(RuntimeException.class);
-        }
-        else {
-            // v2 succeeds
-            super.testMetadataDeleteOnNonIdentityPartitionColumn(version, mode);
-        }
-    }
-
-    @Test(dataProvider = "version_and_mode")
-    public void testMetadataDeleteOnTableWithUnsupportedSpecsIncludingNoData(String version, String mode)
-    {
-        if (version.equals("1")) {
-            // v1 table create fails due to Iceberg REST catalog bug (see: https://github.com/apache/iceberg/issues/8756)
-            assertThatThrownBy(() -> super.testMetadataDeleteOnTableWithUnsupportedSpecsIncludingNoData(version, mode))
-                    .isInstanceOf(RuntimeException.class);
-        }
-        else {
-            // v2 succeeds
-            super.testMetadataDeleteOnTableWithUnsupportedSpecsIncludingNoData(version, mode);
-        }
-    }
-
-    @Test(dataProvider = "version_and_mode")
-    public void testMetadataDeleteOnTableWithUnsupportedSpecsWhoseDataAllDeleted(String version, String mode)
-    {
-        if (version.equals("1")) {
-            // v1 table create fails due to Iceberg REST catalog bug (see: https://github.com/apache/iceberg/issues/8756)
-            assertThatThrownBy(() -> super.testMetadataDeleteOnTableWithUnsupportedSpecsWhoseDataAllDeleted(version, mode))
-                    .isInstanceOf(RuntimeException.class);
-        }
-        else {
-            // v2 succeeds
-            super.testMetadataDeleteOnTableWithUnsupportedSpecsWhoseDataAllDeleted(version, mode);
-        }
-    }
-
     @Test
     public void testSetOauth2ServerUriPropertyI()
     {

presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/TestIcebergSmokeRestNestedNamespace.java

@@ -53,7 +53,6 @@
 import static java.nio.file.Files.createTempDirectory;
 import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @Test
 public class TestIcebergSmokeRestNestedNamespace
@@ -263,19 +262,6 @@ protected void testCreatePartitionedTableAs(Session session, FileFormat fileForm
         dropTable(session, "test_create_partitioned_table_as_" + fileFormatString);
     }
 
-    @Test
-    @Override
-    public void testCreateTableWithFormatVersion()
-    {
-        // v1 table create fails due to Iceberg REST catalog bug (see: https://github.com/apache/iceberg/issues/8756)
-        assertThatThrownBy(() -> testCreateTableWithFormatVersion("1", "copy-on-write"))
-                .hasCauseInstanceOf(RuntimeException.class)
-                .hasStackTraceContaining("Cannot downgrade v2 table to v1");
-
-        // v2 succeeds
-        testCreateTableWithFormatVersion("2", "merge-on-read");
-    }
-
     @Override // override due to double quotes around nested namespace
     protected void testCreateTableWithFormatVersion(String formatVersion, String defaultDeleteMode)
     {