Core, Hive, Nessie: Use ResolvingFileIO as default instead of HadoopFileIO

Author: nastra

core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java

@@ -67,6 +67,7 @@ public class JdbcCatalog extends BaseMetastoreCatalog
   private static final String NAMESPACE_EXISTS_PROPERTY = "exists";
   private static final Logger LOG = LoggerFactory.getLogger(JdbcCatalog.class);
   private static final Joiner SLASH = Joiner.on("/");
+  private static final String DEFAULT_FILE_IO_IMPL = "org.apache.iceberg.io.ResolvingFileIO";
 
   private FileIO io;
   private String catalogName = "jdbc";
@@ -112,9 +113,7 @@ public void initialize(String name, Map<String, String> properties) {
     if (null != ioBuilder) {
       this.io = ioBuilder.apply(properties);
     } else {
-      String ioImpl =
-          properties.getOrDefault(
-              CatalogProperties.FILE_IO_IMPL, "org.apache.iceberg.hadoop.HadoopFileIO");
+      String ioImpl = properties.getOrDefault(CatalogProperties.FILE_IO_IMPL, DEFAULT_FILE_IO_IMPL);
       this.io = CatalogUtil.loadFileIO(ioImpl, properties, conf);
     }
 

hive-metastore/src/main/java/org/apache/iceberg/hive/HiveCatalog.java

@@ -47,7 +47,6 @@
 import org.apache.iceberg.exceptions.NoSuchNamespaceException;
 import org.apache.iceberg.exceptions.NoSuchTableException;
 import org.apache.iceberg.exceptions.NotFoundException;
-import org.apache.iceberg.hadoop.HadoopFileIO;
 import org.apache.iceberg.io.FileIO;
 import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting;
 import org.apache.iceberg.relocated.com.google.common.base.MoreObjects;
@@ -72,6 +71,7 @@ public class HiveCatalog extends BaseMetastoreCatalog implements SupportsNamespa
   static final String HIVE_CONF_CATALOG = "metastore.catalog.default";
 
   private static final Logger LOG = LoggerFactory.getLogger(HiveCatalog.class);
+  private static final String DEFAULT_FILE_IO_IMPL = "org.apache.iceberg.io.ResolvingFileIO";
 
   private String name;
   private Configuration conf;
@@ -104,11 +104,9 @@ public void initialize(String inputName, Map<String, String> properties) {
     this.listAllTables =
         Boolean.parseBoolean(properties.getOrDefault(LIST_ALL_TABLES, LIST_ALL_TABLES_DEFAULT));
 
-    String fileIOImpl = properties.get(CatalogProperties.FILE_IO_IMPL);
-    this.fileIO =
-        fileIOImpl == null
-            ? new HadoopFileIO(conf)
-            : CatalogUtil.loadFileIO(fileIOImpl, properties, conf);
+    String fileIOImpl =
+        properties.getOrDefault(CatalogProperties.FILE_IO_IMPL, DEFAULT_FILE_IO_IMPL);
+    this.fileIO = CatalogUtil.loadFileIO(fileIOImpl, properties, conf);
 
     this.clients = new CachedClientPool(conf, properties);
   }

nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java

@@ -63,6 +63,7 @@ public class NessieCatalog extends BaseMetastoreCatalog
     implements AutoCloseable, SupportsNamespaces, Configurable<Object> {
 
   private static final Logger LOG = LoggerFactory.getLogger(NessieCatalog.class);
+  private static final String DEFAULT_FILE_IO_IMPL = "org.apache.iceberg.io.ResolvingFileIO";
   private static final Joiner SLASH = Joiner.on("/");
   private static final String NAMESPACE_LOCATION_PROPS = "location";
   private NessieIcebergClient client;
@@ -79,9 +80,7 @@ public NessieCatalog() {}
   @Override
   public void initialize(String name, Map<String, String> options) {
     Map<String, String> catalogOptions = ImmutableMap.copyOf(options);
-    String fileIOImpl =
-        options.getOrDefault(
-            CatalogProperties.FILE_IO_IMPL, "org.apache.iceberg.hadoop.HadoopFileIO");
+    String fileIOImpl = options.getOrDefault(CatalogProperties.FILE_IO_IMPL, DEFAULT_FILE_IO_IMPL);
     // remove nessie prefix
     final Function<String, String> removePrefix =
         x -> x.replace(NessieUtil.NESSIE_CONFIG_PREFIX, "");