Skip to content

Add location properties from TableMetadata into Table entity internalProps #3226

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
singhpk234 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add location properties from TableMetadata into Table entity internalProps #3226

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
11 changes: 11 additions & 0 deletions runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,7 +1657,18 @@ private String newTableMetadataFilePath(TableMetadata meta, int newVersion) {

private static Map<String, String> buildTableMetadataPropertiesMap(TableMetadata metadata) {
Map<String, String> storedProperties = new HashMap<>();
// Location specific properties
storedProperties.put(IcebergTableLikeEntity.LOCATION, metadata.location());
if (metadata.properties().containsKey(TableProperties.WRITE_DATA_LOCATION)) {
storedProperties.put(
IcebergTableLikeEntity.USER_SPECIFIED_WRITE_DATA_LOCATION_KEY,
metadata.properties().get(TableProperties.WRITE_DATA_LOCATION));
}
if (metadata.properties().containsKey(TableProperties.WRITE_METADATA_LOCATION)) {
storedProperties.put(
IcebergTableLikeEntity.USER_SPECIFIED_WRITE_METADATA_LOCATION_KEY,
metadata.properties().get(TableProperties.WRITE_METADATA_LOCATION));
}
storedProperties.put(
IcebergTableLikeEntity.FORMAT_VERSION, String.valueOf(metadata.formatVersion()));
storedProperties.put(IcebergTableLikeEntity.TABLE_UUID, metadata.uuid());
Expand Down
17 changes: 17 additions & 0 deletions .../src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import org.apache.iceberg.TableMetadata;
import org.apache.iceberg.TableMetadataParser;
import org.apache.iceberg.TableOperations;
import org.apache.iceberg.TableProperties;
import org.apache.iceberg.UpdateRequirement;
import org.apache.iceberg.UpdateRequirements;
import org.apache.iceberg.UpdateSchema;
Expand Down Expand Up @@ -2269,6 +2270,16 @@ public void testTableInternalPropertiesStoredOnCommit() {
catalog.createNamespace(NS);
catalog.buildTable(TABLE, SCHEMA).create();
catalog.loadTable(TABLE).newFastAppend().appendFile(FILE_A).commit();
catalog
.loadTable(TABLE)
.updateProperties()
.set(
TableProperties.WRITE_DATA_LOCATION,
"s3://my-bucket/path/to/data/newdb/newtable/my-data")
.set(
TableProperties.WRITE_METADATA_LOCATION,
"s3://my-bucket/path/to/data/newdb/newtable/my-metadata")
.commit();
Table afterAppend = catalog.loadTable(TABLE);
EntityResult schemaResult =
metaStoreManager.readEntityByName(
Expand All @@ -2295,6 +2306,12 @@ public void testTableInternalPropertiesStoredOnCommit() {
IcebergTableLikeEntity.CURRENT_SNAPSHOT_ID,
String.valueOf(afterAppend.currentSnapshot().snapshotId()))
.containsEntry(IcebergTableLikeEntity.LOCATION, afterAppend.location())
.containsEntry(
IcebergTableLikeEntity.USER_SPECIFIED_WRITE_DATA_LOCATION_KEY,
afterAppend.properties().get(TableProperties.WRITE_DATA_LOCATION))
.containsEntry(
IcebergTableLikeEntity.USER_SPECIFIED_WRITE_METADATA_LOCATION_KEY,
afterAppend.properties().get(TableProperties.WRITE_METADATA_LOCATION))
.containsEntry(IcebergTableLikeEntity.TABLE_UUID, afterAppend.uuid().toString())
.containsEntry(
IcebergTableLikeEntity.CURRENT_SCHEMA_ID,
Expand Down