Skip to content

Retain Delta metadata properties after schema changes #13368

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
ebyhr merged 1 commit into from
Jul 27, 2022
Merged

Retain Delta metadata properties after schema changes #13368

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
18 changes: 6 additions & 12 deletions plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeSchemaAsJson;
import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeStatsAsJson;
import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.validateType;
import static io.trino.plugin.deltalake.transactionlog.MetadataEntry.buildDeltaMetadataConfiguration;
import static io.trino.plugin.deltalake.transactionlog.MetadataEntry.configurationForNewTable;
import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.getMandatoryCurrentVersion;
import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
Expand Down Expand Up @@ -682,7 +682,7 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
deltaLakeColumns,
partitionColumns,
columnComments,
buildDeltaMetadataConfiguration(checkpointInterval),
configurationForNewTable(checkpointInterval),
CREATE_TABLE_OPERATION,
session,
nodeVersion,
Expand Down Expand Up @@ -948,7 +948,7 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(
handle.getInputColumns(),
handle.getPartitionedBy(),
ImmutableMap.of(),
buildDeltaMetadataConfiguration(handle.getCheckpointInterval()),
configurationForNewTable(handle.getCheckpointInterval()),
CREATE_TABLE_AS_OPERATION,
session,
nodeVersion,
Expand Down Expand Up @@ -1017,8 +1017,6 @@ public void setTableComment(ConnectorSession session, ConnectorTableHandle table
.map(column -> toColumnHandle(column, column.getName(), column.getType(), partitionColumns))
.collect(toImmutableList());

Optional<Long> checkpointInterval = DeltaLakeTableProperties.getCheckpointInterval(tableMetadata.getProperties());

TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, handle.getLocation());
appendTableEntries(
commitVersion,
Expand All @@ -1027,7 +1025,7 @@ public void setTableComment(ConnectorSession session, ConnectorTableHandle table
columns,
partitionColumns,
getColumnComments(handle.getMetadataEntry()),
buildDeltaMetadataConfiguration(checkpointInterval),
handle.getMetadataEntry().getConfiguration(),
SET_TBLPROPERTIES_OPERATION,
session,
nodeVersion,
Expand Down Expand Up @@ -1064,8 +1062,6 @@ public void setColumnComment(ConnectorSession session, ConnectorTableHandle tabl
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
comment.ifPresent(s -> columnComments.put(deltaLakeColumnHandle.getName(), s));

Optional<Long> checkpointInterval = DeltaLakeTableProperties.getCheckpointInterval(tableMetadata.getProperties());

TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, deltaLakeTableHandle.getLocation());
appendTableEntries(
commitVersion,
Expand All @@ -1074,7 +1070,7 @@ public void setColumnComment(ConnectorSession session, ConnectorTableHandle tabl
columns,
partitionColumns,
columnComments.buildOrThrow(),
buildDeltaMetadataConfiguration(checkpointInterval),
deltaLakeTableHandle.getMetadataEntry().getConfiguration(),
CHANGE_COLUMN_OPERATION,
session,
nodeVersion,
Expand Down Expand Up @@ -1111,8 +1107,6 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
columnComments.put(newColumnMetadata.getName(), newColumnMetadata.getComment());
}

Optional<Long> checkpointInterval = DeltaLakeTableProperties.getCheckpointInterval(tableMetadata.getProperties());

TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, handle.getLocation());
appendTableEntries(
commitVersion,
Expand All @@ -1121,7 +1115,7 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
columnsBuilder.build(),
partitionColumns,
columnComments.buildOrThrow(),
buildDeltaMetadataConfiguration(checkpointInterval),
handle.getMetadataEntry().getConfiguration(),
ADD_COLUMN_OPERATION,
session,
nodeVersion,
Expand Down
2 changes: 1 addition & 1 deletion ...rino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/MetadataEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public Optional<Long> getCheckpointInterval()
}
}

public static Map<String, String> buildDeltaMetadataConfiguration(Optional<Long> checkpointInterval)
public static Map<String, String> configurationForNewTable(Optional<Long> checkpointInterval)
{
return checkpointInterval
.map(value -> ImmutableMap.of(DELTA_CHECKPOINT_INTERVAL_PROPERTY, String.valueOf(value)))
Expand Down
30 changes: 30 additions & 0 deletions .../src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

import org.testng.annotations.Test;

import java.util.List;

import static com.google.common.collect.Iterables.getOnlyElement;
import static io.trino.tempto.assertions.QueryAssert.Row.row;
import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
import static io.trino.tempto.assertions.QueryAssert.assertThat;
Expand All @@ -30,6 +33,7 @@
import static io.trino.tests.product.utils.QueryExecutors.onTrino;
import static java.lang.String.format;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;

public class TestDeltaLakeAlterTableCompatibility
extends BaseTestDeltaLakeS3Storage
Expand Down Expand Up @@ -167,4 +171,30 @@ public void testCommentOnColumnUnsupportedWriterVersion()
onTrino().executeQuery("DROP TABLE delta.default." + tableName);
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
public void testTrinoAlterTablePreservesTableMetadata()
{
String tableName = "test_trino_alter_table_preserves_table_metadata_" + randomTableSuffix();
String tableDirectory = "databricks-compatibility-test-" + tableName;

onDelta().executeQuery(format("" +
"CREATE TABLE default.%s (col int) " +
"USING DELTA LOCATION 's3://%s/%s'" +
"TBLPROPERTIES ('delta.appendOnly' = true)",
tableName,
bucketName,
tableDirectory));
try {
onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".col IS 'test column comment'");
onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test table comment'");
onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN new_column INT");

List<?> properties = getOnlyElement(onDelta().executeQuery("SHOW TBLPROPERTIES " + tableName + "(delta.appendOnly)").rows());
assertTrue(Boolean.parseBoolean((String) properties.get(1)));
}
finally {
onTrino().executeQuery("DROP TABLE delta.default." + tableName);
}
}
}