Skip to content

Core: Use properties while initializing default HadoopFileIO for Hadoop catalog. #9283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amogh-jahagirdar merged 1 commit into from
Dec 19, 2023
Merged

Core: Use properties while initializing default HadoopFileIO for Hadoop catalog. #9283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions core/src/main/java/org/apache/iceberg/hadoop/HadoopCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ public void initialize(String name, Map<String, String> properties) {
this.warehouseLocation = LocationUtil.stripTrailingSlash(inputWarehouseLocation);
this.fs = Util.getFs(new Path(warehouseLocation), conf);

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, "org.apache.iceberg.hadoop.HadoopFileIO");

this.fileIO = CatalogUtil.loadFileIO(fileIOImpl, properties, conf);

this.lockManager = LockManagers.from(properties);

Expand Down
17 changes: 17 additions & 0 deletions core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,23 @@ public void testBasicCatalog() throws Exception {
Assertions.assertThat(fs.isDirectory(new Path(metaLocation))).isFalse();
}

@Test
public void testHadoopFileIOProperties() {
TableIdentifier tableIdent = TableIdentifier.of("db", "ns1", "ns2", "tbl");
ImmutableMap<String, String> catalogProps =
ImmutableMap.of(
"warehouse", "/hive/testwarehouse",
"io.manifest.cache-enabled", "true");

HadoopCatalog catalog = new HadoopCatalog();
catalog.setConf(new Configuration());
catalog.initialize("hadoop", catalogProps);
FileIO fileIO = catalog.newTableOps(tableIdent).io();

Assertions.assertThat(fileIO.properties()).containsEntry("warehouse", "/hive/testwarehouse");
Assertions.assertThat(fileIO.properties()).containsEntry("io.manifest.cache-enabled", "true");
}

@Test
public void testCreateAndDropTableWithoutNamespace() throws Exception {
HadoopCatalog catalog = hadoopCatalog();
Expand Down