Skip to content

[Bugfix] Populate table name from the identifier in Iceberg conversion #630

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Bugfix] Populate table name from the identifier in Iceberg conversion #630

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: 9 additions & 1 deletion xtable-core/src/main/java/org/apache/xtable/iceberg/IcebergConversionSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,18 @@ public InternalTable getTable(Snapshot snapshot) {
irPartitionFields.size() > 0
? DataLayoutStrategy.HIVE_STYLE_PARTITION
: DataLayoutStrategy.FLAT;
// When the table name is not explicitly specified, Iceberg assumes the table is HDFS-based,
// treating the table name as the location in HDFS. This assumption can lead to mismatches
// during metadata conversion. To mitigate this issue, we rely on the table name provided in the
// source configuration of the conversation so target matches the user's expectations.
// See https://github.com/apache/incubator-xtable/issues/494
return InternalTable.builder()
.tableFormat(TableFormat.ICEBERG)
.basePath(iceTable.location())
.name(iceTable.name())
.name(
iceTable.name().contains(iceTable.location())
? sourceTableConfig.getName()
: iceTable.name())
.partitioningFields(irPartitionFields)
.latestCommitTime(Instant.ofEpochMilli(snapshot.timestampMillis()))
.readSchema(irSchema)
Expand Down
95 changes: 95 additions & 0 deletions xtable-core/src/test/java/org/apache/xtable/iceberg/ITIcebergConversionSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,25 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import java.nio.file.Path;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import lombok.SneakyThrows;

import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.Table;
import org.apache.iceberg.catalog.Catalog;
import org.apache.iceberg.catalog.TableIdentifier;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
Expand All @@ -61,6 +67,7 @@
import org.apache.xtable.model.schema.PartitionTransformType;
import org.apache.xtable.model.storage.DataLayoutStrategy;
import org.apache.xtable.model.storage.TableFormat;
import org.mockito.Mockito;

public class ITIcebergConversionSource {
private static final Configuration hadoopConf = new Configuration();
Expand Down Expand Up @@ -126,7 +133,95 @@ void getCurrentTableTest() {
.build();
validateTable(
internalTable,
testIcebergTable.getTableName(),
TableFormat.ICEBERG,
internalSchema,
DataLayoutStrategy.FLAT,
testIcebergTable.getBasePath(),
Collections.emptyList());
}
}

@Test
void getCurrentTableWithCatalogConfigTest() {
String tableName = getTableName();
try (TestIcebergTable testIcebergTable =
new TestIcebergTable(
tableName,
tempDir,
hadoopConf,
"field1",
Collections.singletonList(null),
TestIcebergDataHelper.SchemaType.BASIC)) {
testIcebergTable.insertRows(50);

// create resources
Map<String, String> OPTIONS = Collections.singletonMap("key", "value");
Catalog mockCatalog = mock(Catalog.class);
String catalogName = "catalog1";
StubCatalog.registerMock(catalogName, mockCatalog);
IcebergCatalogConfig catalogConfig =
IcebergCatalogConfig.builder()
.catalogImpl(StubCatalog.class.getName())
.catalogName(catalogName)
.catalogOptions(OPTIONS)
.build();
Map<Integer, org.apache.iceberg.Schema> map = new HashMap<>();
map.put(0, testIcebergTable.getSchema());
Table mockTable = mock(Table.class, Mockito.RETURNS_DEEP_STUBS);
when(mockTable.name()).thenReturn(tableName);
when(mockTable.location()).thenReturn(testIcebergTable.getBasePath());
when(mockTable.schemas()).thenReturn(map);

when(mockCatalog.loadTable(Mockito.any(TableIdentifier.class)))
.thenReturn(mockTable);

// begin test
SourceTable tableConfig =
SourceTable.builder()
.name(testIcebergTable.getTableName())
.basePath(testIcebergTable.getBasePath())
.formatName(TableFormat.ICEBERG)
.catalogConfig(catalogConfig)
.build();
IcebergConversionSource conversionSource =
sourceProvider.getConversionSourceInstance(tableConfig);
InternalTable internalTable = conversionSource.getCurrentTable();

// expectations
InternalSchema internalSchema =
InternalSchema.builder()
.name("record")
.dataType(InternalType.RECORD)
.fields(
Arrays.asList(
InternalField.builder()
.name("field1")
.fieldId(1)
.schema(
InternalSchema.builder()
.name("string")
.dataType(InternalType.STRING)
.isNullable(true)
.build())
.defaultValue(InternalField.Constants.NULL_DEFAULT_VALUE)
.build(),
InternalField.builder()
.name("field2")
.fieldId(2)
.schema(
InternalSchema.builder()
.name("string")
.dataType(InternalType.STRING)
.isNullable(true)
.build())
.defaultValue(InternalField.Constants.NULL_DEFAULT_VALUE)
.build()))
.build();

validateTable(
internalTable,
testIcebergTable.getTableName(),
TableFormat.ICEBERG,
internalSchema,
DataLayoutStrategy.FLAT,
Expand Down
Loading