Upgrade Iceberg 1.7.0

apache · Nov 9, 2024 · de8eed5 · de8eed5
1 parent 753f453
commit de8eed5
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 74 deletions.
diff --git a/LICENSE b/LICENSE
@@ -277,6 +277,7 @@ commons-collections:commons-collections
 commons-io:commons-io
 commons-logging:commons-logging
 commons-net:commons-net
+dev.failsafe:failsafe
 io.airlift:aircompressor
 io.dropwizard.logback:logback-throttling-appender
 io.dropwizard.metrics:metrics-annotation

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@
 
 [versions]
 hadoop = "3.4.0"
-iceberg = "1.6.1"
+iceberg = "1.7.0"
 dropwizard = "4.0.8"
 slf4j = "2.0.13"
 swagger = "1.6.14"

diff --git a/...-core/src/main/java/org/apache/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java b/...-core/src/main/java/org/apache/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java
@@ -99,7 +99,6 @@
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 import org.apache.polaris.core.storage.PolarisStorageIntegration;
 import org.apache.polaris.core.storage.StorageLocation;
-import org.apache.polaris.core.storage.aws.PolarisS3FileIOClientFactory;
 import org.apache.polaris.service.catalog.io.FileIOFactory;
 import org.apache.polaris.service.exception.IcebergExceptionMapper;
 import org.apache.polaris.service.task.TaskExecutor;
@@ -2055,8 +2054,6 @@ private List<TableIdentifier> listTableLike(PolarisEntitySubType subType, Namesp
    */
   private FileIO loadFileIO(String ioImpl, Map<String, String> properties) {
     Map<String, String> propertiesWithS3CustomizedClientFactory = new HashMap<>(properties);
-    propertiesWithS3CustomizedClientFactory.put(
-        S3FileIOProperties.CLIENT_FACTORY, PolarisS3FileIOClientFactory.class.getName());
     return fileIOFactory.loadFileIO(ioImpl, propertiesWithS3CustomizedClientFactory);
   }
 

diff --git a/regtests/setup.sh b/regtests/setup.sh
@@ -31,7 +31,7 @@ if [ -z "${SPARK_HOME}" ]; then
 fi
 SPARK_CONF="${SPARK_HOME}/conf/spark-defaults.conf"
 DERBY_HOME="/tmp/derby"
-ICEBERG_VERSION="1.6.1"
+ICEBERG_VERSION="1.7.0"
 export PYTHONPATH="${SPARK_HOME}/python/:${SPARK_HOME}/python/lib/py4j-0.10.9.7-src.zip:$PYTHONPATH"
 
 # Ensure binaries are downloaded locally

diff --git a/regtests/t_pyspark/src/iceberg_spark.py b/regtests/t_pyspark/src/iceberg_spark.py
@@ -72,7 +72,7 @@ def __enter__(self):
     """Initial method for Iceberg Spark session. Creates a Spark session with specified configs.
     """
     packages = [
-      "org.apache.iceberg:iceberg-spark-runtime-3.5_2.12:1.6.1",
+      "org.apache.iceberg:iceberg-spark-runtime-3.5_2.12:1.7.0",
       "org.apache.hadoop:hadoop-aws:3.4.0",
       "software.amazon.awssdk:bundle:2.23.19",
       "software.amazon.awssdk:url-connection-client:2.23.19",