Skip to content

[Iceberg AddFiles] Attach name-mapping to table #38189

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
ahmedabu98 wants to merge 2 commits into
base: master
Choose a base branch
from
+37 −7
Open

[Iceberg AddFiles] Attach name-mapping to table #38189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
088b88e
Attach name-mapping to table
ahmedabu98 Apr 14, 2026
d24e3db
add to tests
ahmedabu98 Apr 14, 2026
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
31 changes: 24 additions & 7 deletions sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/AddFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.Snapshot;
import org.apache.iceberg.Table;
import org.apache.iceberg.TableProperties;
import org.apache.iceberg.avro.Avro;
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.exceptions.AlreadyExistsException;
Expand All @@ -102,6 +103,7 @@
import org.apache.iceberg.io.OutputFile;
import org.apache.iceberg.mapping.MappingUtil;
import org.apache.iceberg.mapping.NameMapping;
import org.apache.iceberg.mapping.NameMappingParser;
import org.apache.iceberg.orc.OrcMetrics;
import org.apache.iceberg.parquet.ParquetSchemaUtil;
import org.apache.iceberg.parquet.ParquetUtil;
Expand Down Expand Up @@ -514,22 +516,37 @@ static <W, T> T transformValue(Transform<W, T> transform, Type type, ByteBuffer

private Table getOrCreateTable(String filePath, FileFormat format) throws IOException {
TableIdentifier tableId = TableIdentifier.parse(identifier);
@Nullable Table t;
try {
return catalogConfig.catalog().loadTable(tableId);
t = catalogConfig.catalog().loadTable(tableId);
} catch (NoSuchTableException e) {
try {
org.apache.iceberg.Schema schema = getSchema(filePath, format);
PartitionSpec spec = PartitionUtils.toPartitionSpec(partitionFields, schema);

return tableProps == null
? catalogConfig.catalog().createTable(TableIdentifier.parse(identifier), schema, spec)
: catalogConfig
.catalog()
.createTable(TableIdentifier.parse(identifier), schema, spec, tableProps);
t =
tableProps == null
? catalogConfig
.catalog()
.createTable(TableIdentifier.parse(identifier), schema, spec)
: catalogConfig
.catalog()
.createTable(TableIdentifier.parse(identifier), schema, spec, tableProps);
} catch (AlreadyExistsException e2) { // if table already exists, just load it
return catalogConfig.catalog().loadTable(TableIdentifier.parse(identifier));
t = catalogConfig.catalog().loadTable(TableIdentifier.parse(identifier));
}
}
ensureNameMappingPresent(t);
return t;
}

private static void ensureNameMappingPresent(Table table) {
if (table.properties().get(TableProperties.DEFAULT_NAME_MAPPING) == null) {
// Forces Name based resolution instead of position based resolution
NameMapping mapping = MappingUtil.create(table.schema());
String mappingJson = NameMappingParser.toJson(mapping);
table.updateProperties().set(TableProperties.DEFAULT_NAME_MAPPING, mappingJson).commit();
}
}

/**
Expand Down
13 changes: 13 additions & 0 deletions sdks/java/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/AddFilesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import org.apache.iceberg.Snapshot;
import org.apache.iceberg.StructLike;
import org.apache.iceberg.Table;
import org.apache.iceberg.TableProperties;
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.data.GenericRecord;
import org.apache.iceberg.data.Record;
Expand All @@ -72,6 +73,7 @@
import org.apache.iceberg.io.DataWriter;
import org.apache.iceberg.io.InputFile;
import org.apache.iceberg.mapping.MappingUtil;
import org.apache.iceberg.mapping.NameMappingParser;
import org.apache.iceberg.parquet.Parquet;
import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
Expand Down Expand Up @@ -219,6 +221,12 @@ public void testAddFilesWithPartitionPath(boolean isPartitioned) throws Exceptio
// check partition metadata is preserved
assertEquals(writtenDf1.partition(), addedDf1.partition());
assertEquals(writtenDf2.partition(), addedDf2.partition());

// check that mapping util was added
assertEquals(
MappingUtil.create(icebergSchema).asMappedFields(),
NameMappingParser.fromJson(table.properties().get(TableProperties.DEFAULT_NAME_MAPPING))
.asMappedFields());
}

@Test
Expand Down Expand Up @@ -319,6 +327,11 @@ && checkStateNotNull(errorRow.getString(1))
// check partition metadata is preserved
assertEquals(expectedPartition1, addedDf1.partition());
assertEquals(expectedPartition2, addedDf2.partition());

assertEquals(
MappingUtil.create(icebergSchema).asMappedFields(),
NameMappingParser.fromJson(table.properties().get(TableProperties.DEFAULT_NAME_MAPPING))
.asMappedFields());
}

@Test
Expand Down
Loading